Merge "Add properties to control EVS services" into rvc-dev am: a9962d0ab0 am: aec51a2285 am: 80f46baa6b am: 424be7eb47 am: f0bc0ebea7
Change-Id: I13716a5d92994828fb30678761ff146414ff475d
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..925576d
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "auto-service-experimental-code-presubmit": [
+ {
+ "name": "ExperimentalCarServiceTests"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/car-lib/api/current.txt b/car-lib/api/current.txt
index 4aa0bbb..40e1218 100644
--- a/car-lib/api/current.txt
+++ b/car-lib/api/current.txt
@@ -16,7 +16,6 @@
method public boolean isFeatureEnabled(@NonNull String);
field public static final String APP_FOCUS_SERVICE = "app_focus";
field public static final String AUDIO_SERVICE = "audio";
- field public static final String CAR_CONFIGURATION_SERVICE = "configuration";
field public static final String CAR_EXTRA_BROWSE_SERVICE_FOR_SESSION = "android.media.session.BROWSE_SERVICE";
field public static final String CAR_EXTRA_MEDIA_COMPONENT = "android.car.intent.extra.MEDIA_COMPONENT";
field public static final String CAR_INTENT_ACTION_MEDIA_TEMPLATE = "android.car.intent.action.MEDIA_TEMPLATE";
@@ -615,21 +614,3 @@
}
-package android.car.settings {
-
- @Deprecated public class CarConfigurationManager {
- method @Deprecated public android.car.settings.SpeedBumpConfiguration getSpeedBumpConfiguration();
- }
-
- @Deprecated public final class SpeedBumpConfiguration implements android.os.Parcelable {
- ctor @Deprecated public SpeedBumpConfiguration(double, double, long);
- method @Deprecated public int describeContents();
- method @Deprecated public double getAcquiredPermitsPerSecond();
- method @Deprecated public double getMaxPermitPool();
- method @Deprecated public long getPermitFillDelay();
- method @Deprecated public void writeToParcel(android.os.Parcel, int);
- field @Deprecated public static final android.os.Parcelable.Creator<android.car.settings.SpeedBumpConfiguration> CREATOR;
- }
-
-}
-
diff --git a/car-lib/src/android/car/Car.java b/car-lib/src/android/car/Car.java
index 38674e5..1e36d7b 100644
--- a/car-lib/src/android/car/Car.java
+++ b/car-lib/src/android/car/Car.java
@@ -49,7 +49,6 @@
import android.car.media.CarMediaManager;
import android.car.navigation.CarNavigationStatusManager;
import android.car.occupantawareness.OccupantAwarenessManager;
-import android.car.settings.CarConfigurationManager;
import android.car.storagemonitoring.CarStorageMonitoringManager;
import android.car.test.CarTestManagerBinderWrapper;
import android.car.trust.CarTrustAgentEnrollmentManager;
@@ -292,11 +291,6 @@
public static final String OCCUPANT_AWARENESS_SERVICE = "occupant_awareness";
/**
- * Service name for {@link android.car.settings.CarConfigurationManager}
- */
- public static final String CAR_CONFIGURATION_SERVICE = "configuration";
-
- /**
* Service name for {@link android.car.media.CarMediaManager}
* @hide
*/
@@ -1713,9 +1707,6 @@
case OCCUPANT_AWARENESS_SERVICE:
manager = new OccupantAwarenessManager(this, binder);
break;
- case CAR_CONFIGURATION_SERVICE:
- manager = new CarConfigurationManager(this, binder);
- break;
case CAR_TRUST_AGENT_ENROLLMENT_SERVICE:
manager = new CarTrustAgentEnrollmentManager(this, binder);
break;
diff --git a/car-lib/src/android/car/content/pm/AppBlockingPackageInfo.java b/car-lib/src/android/car/content/pm/AppBlockingPackageInfo.java
index 02610ab..dbabc50 100644
--- a/car-lib/src/android/car/content/pm/AppBlockingPackageInfo.java
+++ b/car-lib/src/android/car/content/pm/AppBlockingPackageInfo.java
@@ -99,7 +99,7 @@
public AppBlockingPackageInfo(Parcel in) {
packageName = in.readString();
flags = in.readInt();
- minRevisionCode= in.readInt();
+ minRevisionCode = in.readInt();
maxRevisionCode = in.readInt();
signatures = in.createTypedArray(Signature.CREATOR);
activities = in.createStringArray();
@@ -121,15 +121,15 @@
dest.writeStringArray(activities);
}
- public static final Parcelable.Creator<AppBlockingPackageInfo> CREATOR
- = new Parcelable.Creator<AppBlockingPackageInfo>() {
- public AppBlockingPackageInfo createFromParcel(Parcel in) {
- return new AppBlockingPackageInfo(in);
- }
+ public static final Parcelable.Creator<AppBlockingPackageInfo> CREATOR =
+ new Parcelable.Creator<AppBlockingPackageInfo>() {
+ public AppBlockingPackageInfo createFromParcel(Parcel in) {
+ return new AppBlockingPackageInfo(in);
+ }
- public AppBlockingPackageInfo[] newArray(int size) {
- return new AppBlockingPackageInfo[size];
- }
+ public AppBlockingPackageInfo[] newArray(int size) {
+ return new AppBlockingPackageInfo[size];
+ }
};
/** @hide */
@@ -194,10 +194,12 @@
return false;
}
if (packageName == null) {
- if (other.packageName != null)
+ if (other.packageName != null) {
return false;
- } else if (!packageName.equals(other.packageName))
+ }
+ } else if (!packageName.equals(other.packageName)) {
return false;
+ }
if (!Arrays.equals(signatures, other.signatures)) {
return false;
}
diff --git a/car-lib/src/android/car/content/pm/CarAppBlockingPolicy.java b/car-lib/src/android/car/content/pm/CarAppBlockingPolicy.java
index 3ada352..3027d02 100644
--- a/car-lib/src/android/car/content/pm/CarAppBlockingPolicy.java
+++ b/car-lib/src/android/car/content/pm/CarAppBlockingPolicy.java
@@ -85,16 +85,19 @@
payloadParcel.recycle();
}
- public static final Parcelable.Creator<CarAppBlockingPolicy> CREATOR
- = new Parcelable.Creator<CarAppBlockingPolicy>() {
- public CarAppBlockingPolicy createFromParcel(Parcel in) {
- return new CarAppBlockingPolicy(in);
- }
+ public static final Parcelable.Creator<CarAppBlockingPolicy> CREATOR =
+ new Parcelable.Creator<CarAppBlockingPolicy>() {
- public CarAppBlockingPolicy[] newArray(int size) {
- return new CarAppBlockingPolicy[size];
- }
- };
+ @Override
+ public CarAppBlockingPolicy createFromParcel(Parcel in) {
+ return new CarAppBlockingPolicy(in);
+ }
+
+ @Override
+ public CarAppBlockingPolicy[] newArray(int size) {
+ return new CarAppBlockingPolicy[size];
+ }
+ };
@Override
public int hashCode() {
diff --git a/car-lib/src/android/car/hardware/hvac/CarHvacManager.java b/car-lib/src/android/car/hardware/hvac/CarHvacManager.java
index f6a2d53..54bda19 100644
--- a/car-lib/src/android/car/hardware/hvac/CarHvacManager.java
+++ b/car-lib/src/android/car/hardware/hvac/CarHvacManager.java
@@ -25,10 +25,14 @@
import android.car.hardware.property.CarPropertyManager;
import android.car.hardware.property.CarPropertyManager.CarPropertyEventCallback;
import android.car.hardware.property.ICarProperty;
+import android.car.hardware.property.PropertyAccessDeniedSecurityException;
+import android.car.hardware.property.PropertyNotAvailableException;
import android.os.IBinder;
import android.util.ArraySet;
import android.util.Log;
+import com.android.internal.annotations.GuardedBy;
+
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.ref.WeakReference;
@@ -45,12 +49,15 @@
@Deprecated
@SystemApi
public final class CarHvacManager extends CarManagerBase {
- private final static boolean DBG = false;
- private final static String TAG = "CarHvacManager";
+ private static final boolean DBG = false;
+ private static final String TAG = "CarHvacManager";
private final CarPropertyManager mCarPropertyMgr;
- private final ArraySet<CarHvacEventCallback> mCallbacks = new ArraySet<>();
private CarPropertyEventListenerToBase mListenerToBase = null;
+ private final Object mLock = new Object();
+
+ @GuardedBy("mLock")
+ private final ArraySet<CarHvacEventCallback> mCallbacks = new ArraySet<>();
/**
* HVAC property IDs for get/set methods
@@ -252,7 +259,7 @@
private static class CarPropertyEventListenerToBase implements CarPropertyEventCallback {
private final WeakReference<CarHvacManager> mManager;
- public CarPropertyEventListenerToBase(CarHvacManager manager) {
+ CarPropertyEventListenerToBase(CarHvacManager manager) {
mManager = new WeakReference<>(manager);
}
@@ -275,7 +282,7 @@
private void handleOnChangeEvent(CarPropertyValue value) {
Collection<CarHvacEventCallback> callbacks;
- synchronized (this) {
+ synchronized (mLock) {
callbacks = new ArraySet<>(mCallbacks);
}
if (!callbacks.isEmpty()) {
@@ -287,7 +294,7 @@
private void handleOnErrorEvent(int propertyId, int zone) {
Collection<CarHvacEventCallback> callbacks;
- synchronized (this) {
+ synchronized (mLock) {
callbacks = new ArraySet<>(mCallbacks);
}
if (!callbacks.isEmpty()) {
@@ -315,16 +322,18 @@
* Implement wrappers for contained CarPropertyManager object
* @param callback
*/
- public synchronized void registerCallback(CarHvacEventCallback callback) {
- if (mCallbacks.isEmpty()) {
- mListenerToBase = new CarPropertyEventListenerToBase(this);
- }
- List<CarPropertyConfig> configs = getPropertyList();
- for (CarPropertyConfig c : configs) {
+ public void registerCallback(CarHvacEventCallback callback) {
+ synchronized (mLock) {
+ if (mCallbacks.isEmpty()) {
+ mListenerToBase = new CarPropertyEventListenerToBase(this);
+ }
+ List<CarPropertyConfig> configs = getPropertyList();
+ for (CarPropertyConfig c : configs) {
// Register each individual propertyId
- mCarPropertyMgr.registerCallback(mListenerToBase, c.getPropertyId(), 0);
+ mCarPropertyMgr.registerCallback(mListenerToBase, c.getPropertyId(), 0);
+ }
+ mCallbacks.add(callback);
}
- mCallbacks.add(callback);
}
/**
@@ -332,21 +341,26 @@
* this listener, all listening will be stopped.
* @param callback
*/
- public synchronized void unregisterCallback(CarHvacEventCallback callback) {
- mCallbacks.remove(callback);
- try {
- List<CarPropertyConfig> configs = getPropertyList();
- for (CarPropertyConfig c : configs) {
- // Register each individual propertyId
- mCarPropertyMgr.unregisterCallback(mListenerToBase, c.getPropertyId());
+ public void unregisterCallback(CarHvacEventCallback callback) {
+ synchronized (mLock) {
+ mCallbacks.remove(callback);
+ try {
+ List<CarPropertyConfig> configs = getPropertyList();
+ for (CarPropertyConfig c : configs) {
+ // Register each individual propertyId
+ mCarPropertyMgr.unregisterCallback(mListenerToBase, c.getPropertyId());
+ }
+ } catch (PropertyAccessDeniedSecurityException
+ | PropertyNotAvailableException
+ | IllegalArgumentException e) {
+ Log.e(TAG, "getPropertyList exception ", e);
}
- } catch (Exception e) {
- Log.e(TAG, "getPropertyList exception ", e);
- }
- if (mCallbacks.isEmpty()) {
- mCarPropertyMgr.unregisterCallback(mListenerToBase);
- mListenerToBase = null;
+
+ if (mCallbacks.isEmpty()) {
+ mCarPropertyMgr.unregisterCallback(mListenerToBase);
+ mListenerToBase = null;
+ }
}
}
@@ -435,7 +449,7 @@
/** @hide */
public void onCarDisconnected() {
// TODO(b/142730482) Fix synchronization to use separate mLock
- synchronized (this) {
+ synchronized (mLock) {
mCallbacks.clear();
}
mCarPropertyMgr.onCarDisconnected();
diff --git a/car-lib/src/android/car/settings/CarConfigurationManager.java b/car-lib/src/android/car/settings/CarConfigurationManager.java
deleted file mode 100644
index 45b8767..0000000
--- a/car-lib/src/android/car/settings/CarConfigurationManager.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.car.settings;
-
-import android.car.Car;
-import android.car.CarManagerBase;
-import android.os.IBinder;
-import android.os.RemoteException;
-
-/**
- * Manager that exposes car configuration values that are stored on the system.
- *
- * @deprecated The {@code CarConfigurationManager} is no longer supported and will be removed.
- */
-@Deprecated
-public class CarConfigurationManager extends CarManagerBase {
- private static final String TAG = "CarConfigurationManager";
-
- private final ICarConfigurationManager mConfigurationService;
-
- /** @hide */
- public CarConfigurationManager(Car car, IBinder service) {
- super(car);
- mConfigurationService = ICarConfigurationManager.Stub.asInterface(service);
- }
-
- /**
- * Returns a configuration for Speed Bump that will determine when it kicks in.
- *
- * @return A {@link SpeedBumpConfiguration} that contains the configuration values.
- */
- public SpeedBumpConfiguration getSpeedBumpConfiguration() {
- try {
- return mConfigurationService.getSpeedBumpConfiguration();
- } catch (RemoteException e) {
- return handleRemoteExceptionFromCarService(e, null);
- }
- }
-
- /** @hide */
- @Override
- public void onCarDisconnected() {
- // Nothing to release.
- }
-}
diff --git a/car-lib/src/android/car/settings/ICarConfigurationManager.aidl b/car-lib/src/android/car/settings/ICarConfigurationManager.aidl
deleted file mode 100644
index ea53998..0000000
--- a/car-lib/src/android/car/settings/ICarConfigurationManager.aidl
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.car.settings;
-
-import android.car.settings.SpeedBumpConfiguration;
-
-/**
- * Binder interface for {@link android.car.settings.CarConfigurationManager}.
- *
- * @hide
- * @deprecated Configuration of speed bump is no longer a supported feature.
- */
-interface ICarConfigurationManager {
- /**
- * Returns the configuration for SpeedBump if it exists. If it does not, then a default
- * configuration will be returned.
- */
- SpeedBumpConfiguration getSpeedBumpConfiguration() = 0;
-}
diff --git a/car-lib/src/android/car/settings/SpeedBumpConfiguration.aidl b/car-lib/src/android/car/settings/SpeedBumpConfiguration.aidl
deleted file mode 100644
index 084fca0..0000000
--- a/car-lib/src/android/car/settings/SpeedBumpConfiguration.aidl
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.car.settings;
-
-parcelable SpeedBumpConfiguration;
diff --git a/car-lib/src/android/car/settings/SpeedBumpConfiguration.java b/car-lib/src/android/car/settings/SpeedBumpConfiguration.java
deleted file mode 100644
index ee090f5..0000000
--- a/car-lib/src/android/car/settings/SpeedBumpConfiguration.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.car.settings;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import java.util.Objects;
-
-/**
- * A configuration struct that holds information for tweaking SpeedBump settings.
- *
- * @see androidx.car.moderator.SpeedBumpView
- * @deprecated Speed bump configuration is no longer a support feature.
- */
-@Deprecated
-public final class SpeedBumpConfiguration implements Parcelable {
- private final double mAcquiredPermitsPerSecond;
- private final double mMaxPermitPool;
- private final long mPermitFillDelay;
-
- public SpeedBumpConfiguration(double permitsPerSecond, double maxPermitPool,
- long permitFillDelay) {
- mAcquiredPermitsPerSecond = permitsPerSecond;
- mMaxPermitPool = maxPermitPool;
- mPermitFillDelay = permitFillDelay;
- }
-
- /**
- * Returns the number of permitted actions that are acquired each second that the user has not
- * interacted with the {@code SpeedBumpView}.
- */
- public double getAcquiredPermitsPerSecond() {
- return mAcquiredPermitsPerSecond;
- }
-
- /**
- * Returns the maximum number of permits that can be acquired when the user is idling.
- */
- public double getMaxPermitPool() {
- return mMaxPermitPool;
- }
-
- /**
- * Returns the delay time before when the permit pool has been depleted and when it begins to
- * refill.
- */
- public long getPermitFillDelay() {
- return mPermitFillDelay;
- }
-
- @Override
- public String toString() {
- return String.format(
- "[acquired_permits_per_second: %f, max_permit_pool: %f, permit_fill_delay: %d]",
- mAcquiredPermitsPerSecond,
- mMaxPermitPool,
- mPermitFillDelay);
- }
-
- @Override
- public boolean equals(Object object) {
- if (object == this) {
- return true;
- }
-
- if (!(object instanceof SpeedBumpConfiguration)) {
- return false;
- }
-
- SpeedBumpConfiguration other = (SpeedBumpConfiguration) object;
- return mAcquiredPermitsPerSecond == other.getAcquiredPermitsPerSecond()
- && mMaxPermitPool == other.getMaxPermitPool()
- && mPermitFillDelay == other.getPermitFillDelay();
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(mAcquiredPermitsPerSecond, mMaxPermitPool, mPermitFillDelay);
- }
-
- @Override
- public void writeToParcel(Parcel desk, int flags) {
- desk.writeDouble(mAcquiredPermitsPerSecond);
- desk.writeDouble(mMaxPermitPool);
- desk.writeLong(mPermitFillDelay);
- }
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- private SpeedBumpConfiguration(Parcel in) {
- mAcquiredPermitsPerSecond = in.readDouble();
- mMaxPermitPool = in.readDouble();
- mPermitFillDelay = in.readLong();
- }
-
- public static final Parcelable.Creator<SpeedBumpConfiguration> CREATOR =
- new Parcelable.Creator<SpeedBumpConfiguration>() {
- public SpeedBumpConfiguration createFromParcel(Parcel in) {
- return new SpeedBumpConfiguration(in);
- }
-
- public SpeedBumpConfiguration[] newArray(int size) {
- return new SpeedBumpConfiguration[size];
- }
- };
-}
diff --git a/car-lib/src/android/car/storagemonitoring/CarStorageMonitoringManager.java b/car-lib/src/android/car/storagemonitoring/CarStorageMonitoringManager.java
index ac59bac..6f993e3 100644
--- a/car-lib/src/android/car/storagemonitoring/CarStorageMonitoringManager.java
+++ b/car-lib/src/android/car/storagemonitoring/CarStorageMonitoringManager.java
@@ -47,9 +47,17 @@
private final SingleMessageHandler<IoStats> mMessageHandler;
private final Set<IoStatsListener> mListeners = new HashSet<>();
+ /**
+ * Implementers will be notified on every new I/O activity calculated stats.
+ */
public interface IoStatsListener {
+
+ /**
+ * Invoked when a new periodic snapshot delta of I/O activities is calculated.
+ */
void onSnapshot(IoStats snapshot);
}
+
private static final class ListenerToService extends IIoStatsListener.Stub {
private final WeakReference<CarStorageMonitoringManager> mManager;
@@ -109,7 +117,7 @@
* It will return either PRE_EOL_INFO_UNKNOWN if the value can't be determined,
* or one of PRE_EOL_INFO_{NORMAL|WARNING|URGENT} depending on the device state.
*/
- @RequiresPermission(value=Car.PERMISSION_STORAGE_MONITORING)
+ @RequiresPermission(value = Car.PERMISSION_STORAGE_MONITORING)
public int getPreEolIndicatorStatus() {
try {
return mService.getPreEolIndicatorStatus();
@@ -127,7 +135,7 @@
*
* If either or both indicators are not available, they will be reported as UNKNOWN.
*/
- @RequiresPermission(value=Car.PERMISSION_STORAGE_MONITORING)
+ @RequiresPermission(value = Car.PERMISSION_STORAGE_MONITORING)
public WearEstimate getWearEstimate() {
try {
return mService.getWearEstimate();
@@ -147,7 +155,7 @@
*
* If no indicators are available, an empty list will be returned.
*/
- @RequiresPermission(value=Car.PERMISSION_STORAGE_MONITORING)
+ @RequiresPermission(value = Car.PERMISSION_STORAGE_MONITORING)
public List<WearEstimateChange> getWearEstimateHistory() {
try {
return mService.getWearEstimateHistory();
@@ -166,7 +174,7 @@
*
* If the information is not available, an empty list will be returned.
*/
- @RequiresPermission(value=Car.PERMISSION_STORAGE_MONITORING)
+ @RequiresPermission(value = Car.PERMISSION_STORAGE_MONITORING)
public List<IoStatsEntry> getBootIoStats() {
try {
return mService.getBootIoStats();
@@ -196,7 +204,7 @@
*
* <p>If the information is not available, SHUTDOWN_COST_INFO_MISSING will be returned.</p>s
*/
- @RequiresPermission(value=Car.PERMISSION_STORAGE_MONITORING)
+ @RequiresPermission(value = Car.PERMISSION_STORAGE_MONITORING)
public long getShutdownDiskWriteAmount() {
try {
return mService.getShutdownDiskWriteAmount();
@@ -213,7 +221,7 @@
*
* If the information is not available, an empty list will be returned.
*/
- @RequiresPermission(value=Car.PERMISSION_STORAGE_MONITORING)
+ @RequiresPermission(value = Car.PERMISSION_STORAGE_MONITORING)
public List<IoStatsEntry> getAggregateIoStats() {
try {
return mService.getAggregateIoStats();
@@ -233,7 +241,7 @@
*
* If the information is not available, an empty list will be returned.
*/
- @RequiresPermission(value=Car.PERMISSION_STORAGE_MONITORING)
+ @RequiresPermission(value = Car.PERMISSION_STORAGE_MONITORING)
public List<IoStats> getIoStatsDeltas() {
try {
return mService.getIoStatsDeltas();
@@ -250,7 +258,7 @@
*
* The timing of availability of the deltas is configurable by the OEM.
*/
- @RequiresPermission(value=Car.PERMISSION_STORAGE_MONITORING)
+ @RequiresPermission(value = Car.PERMISSION_STORAGE_MONITORING)
public void registerListener(IoStatsListener listener) {
try {
if (mListeners.isEmpty()) {
@@ -268,7 +276,7 @@
/**
* This method removes a registered listener of I/O stats deltas.
*/
- @RequiresPermission(value=Car.PERMISSION_STORAGE_MONITORING)
+ @RequiresPermission(value = Car.PERMISSION_STORAGE_MONITORING)
public void unregisterListener(IoStatsListener listener) {
try {
if (!mListeners.remove(listener)) {
diff --git a/car-lib/src/android/car/storagemonitoring/WearEstimate.java b/car-lib/src/android/car/storagemonitoring/WearEstimate.java
index ee6aa31..07ef4c7 100644
--- a/car-lib/src/android/car/storagemonitoring/WearEstimate.java
+++ b/car-lib/src/android/car/storagemonitoring/WearEstimate.java
@@ -47,11 +47,10 @@
public static final WearEstimate UNKNOWN_ESTIMATE = new WearEstimate(UNKNOWN, UNKNOWN);
public static final Parcelable.Creator<WearEstimate> CREATOR =
- new Parcelable.Creator<WearEstimate>() {
- public WearEstimate createFromParcel(Parcel in) {
+ new Parcelable.Creator<WearEstimate>() {
+ public WearEstimate createFromParcel(Parcel in) {
return new WearEstimate(in);
}
-
public WearEstimate[] newArray(int size) {
return new WearEstimate[size];
}
@@ -60,16 +59,16 @@
/**
* Wear estimate data for "type A" storage.
*/
- @IntRange(from=-1, to=100)
+ @IntRange(from = -1, to = 100)
public final int typeA;
/**
* Wear estimate data for "type B" storage.
*/
- @IntRange(from=-1, to=100)
+ @IntRange(from = -1, to = 100)
public final int typeB;
- private static final int validateWearValue(int value) {
+ private static int validateWearValue(int value) {
if (value == UNKNOWN) return value;
if ((value >= 0) && (value <= 100)) return value;
throw new IllegalArgumentException(value + " is not a valid wear estimate");
@@ -137,7 +136,7 @@
@Override
public boolean equals(Object other) {
if (other instanceof WearEstimate) {
- WearEstimate wo = (WearEstimate)other;
+ WearEstimate wo = (WearEstimate) other;
return wo.typeA == typeA && wo.typeB == typeB;
}
return false;
@@ -148,7 +147,7 @@
return Objects.hash(typeA, typeB);
}
- private static final String wearValueToString(int value) {
+ private static String wearValueToString(int value) {
if (value == UNKNOWN) return "unknown";
return value + "%";
}
diff --git a/car-lib/src/android/car/storagemonitoring/WearEstimateChange.java b/car-lib/src/android/car/storagemonitoring/WearEstimateChange.java
index 2d454b4..a2839d5 100644
--- a/car-lib/src/android/car/storagemonitoring/WearEstimateChange.java
+++ b/car-lib/src/android/car/storagemonitoring/WearEstimateChange.java
@@ -15,15 +15,16 @@
*/
package android.car.storagemonitoring;
+import static java.util.Objects.requireNonNull;
+
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
+
import java.time.Instant;
import java.util.Objects;
-import static java.util.Objects.requireNonNull;
-
/**
* Change in wear-out information.
*
@@ -35,15 +36,15 @@
@SystemApi
public final class WearEstimateChange implements Parcelable {
public static final Parcelable.Creator<WearEstimateChange> CREATOR =
- new Parcelable.Creator<WearEstimateChange>() {
- public WearEstimateChange createFromParcel(Parcel in) {
- return new WearEstimateChange(in);
- }
+ new Parcelable.Creator<WearEstimateChange>() {
+ public WearEstimateChange createFromParcel(Parcel in) {
+ return new WearEstimateChange(in);
+ }
- public WearEstimateChange[] newArray(int size) {
+ public WearEstimateChange[] newArray(int size) {
return new WearEstimateChange[size];
}
- };
+ };
/**
* The previous wear estimate.
@@ -110,12 +111,12 @@
@Override
public boolean equals(Object other) {
if (other instanceof WearEstimateChange) {
- WearEstimateChange wo = (WearEstimateChange)other;
- return wo.isAcceptableDegradation == isAcceptableDegradation &&
- wo.uptimeAtChange == uptimeAtChange &&
- wo.dateAtChange.equals(dateAtChange) &&
- wo.oldEstimate.equals(oldEstimate) &&
- wo.newEstimate.equals(newEstimate);
+ WearEstimateChange wo = (WearEstimateChange) other;
+ return wo.isAcceptableDegradation == isAcceptableDegradation
+ && wo.uptimeAtChange == uptimeAtChange
+ && wo.dateAtChange.equals(dateAtChange)
+ && wo.oldEstimate.equals(oldEstimate)
+ && wo.newEstimate.equals(newEstimate);
}
return false;
}
diff --git a/car-maps-placeholder/res/values-hi/strings.xml b/car-maps-placeholder/res/values-hi/strings.xml
index fbb0c4a..f5a252e 100644
--- a/car-maps-placeholder/res/values-hi/strings.xml
+++ b/car-maps-placeholder/res/values-hi/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="6575346965016311017">"मैप"</string>
+ <string name="app_name" msgid="6575346965016311017">"Maps"</string>
<string name="error_text" msgid="5575174711944349180">"कोई मैप ऐप्लिकेशन इंस्टॉल नहीं किया हुआ है. कृपया अपनी कार के निर्माता से संपर्क करें."</string>
</resources>
diff --git a/car-maps-placeholder/res/values-kn/strings.xml b/car-maps-placeholder/res/values-kn/strings.xml
index 4a94e81..fdfd107 100644
--- a/car-maps-placeholder/res/values-kn/strings.xml
+++ b/car-maps-placeholder/res/values-kn/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="6575346965016311017">"ನಕ್ಷೆಗಳು"</string>
+ <string name="app_name" msgid="6575346965016311017">"Maps"</string>
<string name="error_text" msgid="5575174711944349180">"ನಕ್ಷೆಗಳ ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಇನ್ಸ್ಟಾಲ್ ಮಾಡಿಲ್ಲ. ನಿಮ್ಮ ಕಾರಿನ ತಯಾರಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
</resources>
diff --git a/car-maps-placeholder/res/values-ml/strings.xml b/car-maps-placeholder/res/values-ml/strings.xml
index 2581753..a46ff32 100644
--- a/car-maps-placeholder/res/values-ml/strings.xml
+++ b/car-maps-placeholder/res/values-ml/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="6575346965016311017">"മാപ്സ്"</string>
+ <string name="app_name" msgid="6575346965016311017">"Maps"</string>
<string name="error_text" msgid="5575174711944349180">"മാപ്സ് ആപ്പ് ഇൻസ്റ്റാൾ ചെയ്തിട്ടില്ല. നിങ്ങളുടെ കാറിന്റെ നിർമ്മാതാവുമായി ബന്ധപ്പെടുക."</string>
</resources>
diff --git a/car-maps-placeholder/res/values-or/strings.xml b/car-maps-placeholder/res/values-or/strings.xml
index 478cbc0..286fb8a 100644
--- a/car-maps-placeholder/res/values-or/strings.xml
+++ b/car-maps-placeholder/res/values-or/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="6575346965016311017">"ମ୍ୟାପ୍ସ"</string>
+ <string name="app_name" msgid="6575346965016311017">"Maps"</string>
<string name="error_text" msgid="5575174711944349180">"କୌଣସି ମ୍ୟାପ୍ସ ଆପ୍ଲିକେସନ୍ ଇନ୍ଷ୍ଟଲ୍ କରାଯାଇନାହିଁ। ଆପଣଙ୍କ କାର୍ର ଉତ୍ପାଦକଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
</resources>
diff --git a/car-maps-placeholder/res/values-pa/strings.xml b/car-maps-placeholder/res/values-pa/strings.xml
index 1b0ef60..850de49 100644
--- a/car-maps-placeholder/res/values-pa/strings.xml
+++ b/car-maps-placeholder/res/values-pa/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="6575346965016311017">"ਨਕਸ਼ੇ"</string>
+ <string name="app_name" msgid="6575346965016311017">"Maps"</string>
<string name="error_text" msgid="5575174711944349180">"ਕੋਈ ਨਕਸ਼ਾ ਐਪਲੀਕੇਸ਼ਨ ਸਥਾਪਤ ਨਹੀਂ ਕੀਤੀ ਗਈ। ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੀ ਕਾਰ ਦੇ ਨਿਰਮਾਤਾ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"</string>
</resources>
diff --git a/car-maps-placeholder/res/values-ta/strings.xml b/car-maps-placeholder/res/values-ta/strings.xml
index 8d5e354..ed29fee 100644
--- a/car-maps-placeholder/res/values-ta/strings.xml
+++ b/car-maps-placeholder/res/values-ta/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="6575346965016311017">"வரைபடம்"</string>
+ <string name="app_name" msgid="6575346965016311017">"Maps"</string>
<string name="error_text" msgid="5575174711944349180">"வரைபட ஆப்ஸ் எதுவும் நிறுவப்படவில்லை. உங்கள் கார் உற்பத்தியாளரைத் தொடர்புகொள்ளவும்."</string>
</resources>
diff --git a/car-test-lib/src/android/car/testapi/FakeCar.java b/car-test-lib/src/android/car/testapi/FakeCar.java
index 98c79ee..6f71d3d 100644
--- a/car-test-lib/src/android/car/testapi/FakeCar.java
+++ b/car-test-lib/src/android/car/testapi/FakeCar.java
@@ -25,7 +25,6 @@
import android.car.drivingstate.ICarDrivingState;
import android.car.hardware.power.ICarPower;
import android.car.media.ICarAudio;
-import android.car.settings.ICarConfigurationManager;
import android.car.storagemonitoring.ICarStorageMonitoring;
import android.content.Context;
import android.os.IBinder;
@@ -138,7 +137,6 @@
@Mock ICarBluetooth.Stub mCarBluetooth;
@Mock ICarStorageMonitoring.Stub mCarStorageMonitoring;
@Mock ICarDrivingState.Stub mCarDrivingState;
- @Mock ICarConfigurationManager.Stub mCarConfigurationManager;
private final FakeAppFocusService mAppFocus;
private final FakeCarPropertyService mCarProperty;
@@ -210,8 +208,6 @@
return mCarDrivingState;
case Car.CAR_UX_RESTRICTION_SERVICE:
return mCarUxRestrictionService;
- case Car.CAR_CONFIGURATION_SERVICE:
- return mCarConfigurationManager;
default:
Log.w(TAG, "getCarService for unknown service:" + serviceName);
return null;
diff --git a/car-usb-handler/res/values-ky/strings.xml b/car-usb-handler/res/values-ky/strings.xml
index f88d6fe..2dabb58 100644
--- a/car-usb-handler/res/values-ky/strings.xml
+++ b/car-usb-handler/res/values-ky/strings.xml
@@ -19,7 +19,7 @@
<string name="app_name" msgid="6963366455471441257">"USB иштеткичи"</string>
<string name="usb_saved_devices" msgid="2829442070749964872">"Сакталган түзмөктөр"</string>
<string name="usb_pref_delete_title" msgid="3885061814853467483">"USB түзмөгү үчүн иштетилген колдонмону алып салуу"</string>
- <string name="usb_pref_delete_message" msgid="5849493572520646218">"%1$s үчүн демейки колдонмону чын эле жок кылгыңыз келеби?"</string>
+ <string name="usb_pref_delete_message" msgid="5849493572520646218">"%1$s үчүн демейки колдонмону чын эле өчүрөсүзбү?"</string>
<string name="usb_pref_delete_yes" msgid="7803356145103146036">"Ооба"</string>
<string name="usb_pref_delete_cancel" msgid="5999791462730255929">"Жок"</string>
<string name="usb_resolving_handlers" msgid="1943100136172948686">"Колдоого алынган иштеткичтерди алуу"</string>
diff --git a/experimental/service/res/values-af/strings.xml b/experimental/service/res/values-af/strings.xml
index bdec8e5..8b74368 100644
--- a/experimental/service/res/values-af/strings.xml
+++ b/experimental/service/res/values-af/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Bestuurderafleiding"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"lees bestuurder se afleidingsvlak"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Lees bestuurder se afleidingsvlak."</string>
</resources>
diff --git a/experimental/service/res/values-am/strings.xml b/experimental/service/res/values-am/strings.xml
index a0ff5f8..47887d8 100644
--- a/experimental/service/res/values-am/strings.xml
+++ b/experimental/service/res/values-am/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"የነጂ መዘናጋት"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"የነጂ መዘናጋት ደረጃ ያንብቡ"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"የነጂ መዘናጋት ደረጃን ያንብቡ።"</string>
</resources>
diff --git a/experimental/service/res/values-ar/strings.xml b/experimental/service/res/values-ar/strings.xml
index a22a28b..08391f5 100644
--- a/experimental/service/res/values-ar/strings.xml
+++ b/experimental/service/res/values-ar/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"تشتت السائق"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"قراءة مستوى تشتت السائق"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"قراءة مستوى تشتت السائق"</string>
</resources>
diff --git a/experimental/service/res/values-as/strings.xml b/experimental/service/res/values-as/strings.xml
index ebd84c4..a3a1185 100644
--- a/experimental/service/res/values-as/strings.xml
+++ b/experimental/service/res/values-as/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"চালকৰ অন্যমনস্কতা"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"চালকৰ অন্যমনস্কতাৰ স্তৰ পঢ়িব পাৰে"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"চালকৰ অন্যমনস্কতাৰ স্তৰ পঢ়ক।"</string>
</resources>
diff --git a/experimental/service/res/values-az/strings.xml b/experimental/service/res/values-az/strings.xml
index 9551ba1..aa67fdb 100644
--- a/experimental/service/res/values-az/strings.xml
+++ b/experimental/service/res/values-az/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Sürücünün yayınması"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"sürücünün yayınma səviyyəsini oxumaq"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Sürücünün yayınma səviyyəsini oxuyun."</string>
</resources>
diff --git a/experimental/service/res/values-b+sr+Latn/strings.xml b/experimental/service/res/values-b+sr+Latn/strings.xml
index be3cf46..b4957fd 100644
--- a/experimental/service/res/values-b+sr+Latn/strings.xml
+++ b/experimental/service/res/values-b+sr+Latn/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Ometanje vozača"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"čitanje nivoa ometanja vozača"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Očitavaju nivo ometanja vozača."</string>
</resources>
diff --git a/experimental/service/res/values-be/strings.xml b/experimental/service/res/values-be/strings.xml
index 60b007c..f8df9fd 100644
--- a/experimental/service/res/values-be/strings.xml
+++ b/experimental/service/res/values-be/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Рассеянасць вадзіцеля"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"вызначаць узровень рассеянасці вадзіцеля"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Вызначаць узровень рассеянасці вадзіцеля."</string>
</resources>
diff --git a/experimental/service/res/values-bg/strings.xml b/experimental/service/res/values-bg/strings.xml
index 958eb4b..dbfe9a4 100644
--- a/experimental/service/res/values-bg/strings.xml
+++ b/experimental/service/res/values-bg/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Разсейване на шофьора"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"четене на нивото на разсейване на шофьора"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Четене на нивото на разсейване на шофьора."</string>
</resources>
diff --git a/experimental/service/res/values-bn/strings.xml b/experimental/service/res/values-bn/strings.xml
index 30c8e62..a94c53a 100644
--- a/experimental/service/res/values-bn/strings.xml
+++ b/experimental/service/res/values-bn/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"ড্রাইভারের মনোযোগে ব্যাঘাত ঘটা"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"ড্রাইভারের মনোযোগে ব্যাঘাত ঘটার লেভেল সম্পর্কে জানুন"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"ড্রাইভারের মনোযোগে ব্যাঘাত ঘটার লেভেল সম্পর্কে জানুন।"</string>
</resources>
diff --git a/experimental/service/res/values-bs/strings.xml b/experimental/service/res/values-bs/strings.xml
index 966cba9..bb6e2c3 100644
--- a/experimental/service/res/values-bs/strings.xml
+++ b/experimental/service/res/values-bs/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Ometanje vozača"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"očitavanje nivoa ometanja vozača"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Očitavanje nivoa ometanja vozača."</string>
</resources>
diff --git a/experimental/service/res/values-ca/strings.xml b/experimental/service/res/values-ca/strings.xml
index 75a62b7..df98dda 100644
--- a/experimental/service/res/values-ca/strings.xml
+++ b/experimental/service/res/values-ca/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Distracció del conductor"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"consultar el nivell de distracció del conductor"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Consultar el nivell de distracció del conductor."</string>
</resources>
diff --git a/experimental/service/res/values-cs/strings.xml b/experimental/service/res/values-cs/strings.xml
index 39c5880..d2b9e62 100644
--- a/experimental/service/res/values-cs/strings.xml
+++ b/experimental/service/res/values-cs/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Vyrušení pozornosti řidiče"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"čtení míry vyrušení pozornosti řidiče"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Čtení míry vyrušení pozornosti řidiče."</string>
</resources>
diff --git a/experimental/service/res/values-da/strings.xml b/experimental/service/res/values-da/strings.xml
index ef79a77..0de5c2b 100644
--- a/experimental/service/res/values-da/strings.xml
+++ b/experimental/service/res/values-da/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Distrahering af fører"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"aflæs, hvor distraheret føreren er"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Tjek, hvor distraheret føreren er."</string>
</resources>
diff --git a/experimental/service/res/values-de/strings.xml b/experimental/service/res/values-de/strings.xml
index 6773ba2..14953b7 100644
--- a/experimental/service/res/values-de/strings.xml
+++ b/experimental/service/res/values-de/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Ablenkungsgrad des Fahrers"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"Ablenkungsgrad des Fahrers erkennen"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Ablenkungsgrad des Fahrers erkennen."</string>
</resources>
diff --git a/experimental/service/res/values-el/strings.xml b/experimental/service/res/values-el/strings.xml
index e3d9845..a136eb1 100644
--- a/experimental/service/res/values-el/strings.xml
+++ b/experimental/service/res/values-el/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Απόσπαση προσοχής οδηγού"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"ανάγνωση επιπέδου απόσπασης προσοχής οδηγού"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Ανάγνωση επιπέδου απόσπασης προσοχής οδηγού."</string>
</resources>
diff --git a/experimental/service/res/values-en-rAU/strings.xml b/experimental/service/res/values-en-rAU/strings.xml
index f5f5ff0..4162250 100644
--- a/experimental/service/res/values-en-rAU/strings.xml
+++ b/experimental/service/res/values-en-rAU/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Driver distraction"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"read driver’s distraction level"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Read driver distraction level."</string>
</resources>
diff --git a/experimental/service/res/values-en-rCA/strings.xml b/experimental/service/res/values-en-rCA/strings.xml
index f5f5ff0..4162250 100644
--- a/experimental/service/res/values-en-rCA/strings.xml
+++ b/experimental/service/res/values-en-rCA/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Driver distraction"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"read driver’s distraction level"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Read driver distraction level."</string>
</resources>
diff --git a/experimental/service/res/values-en-rGB/strings.xml b/experimental/service/res/values-en-rGB/strings.xml
index f5f5ff0..4162250 100644
--- a/experimental/service/res/values-en-rGB/strings.xml
+++ b/experimental/service/res/values-en-rGB/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Driver distraction"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"read driver’s distraction level"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Read driver distraction level."</string>
</resources>
diff --git a/experimental/service/res/values-en-rIN/strings.xml b/experimental/service/res/values-en-rIN/strings.xml
index f5f5ff0..4162250 100644
--- a/experimental/service/res/values-en-rIN/strings.xml
+++ b/experimental/service/res/values-en-rIN/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Driver distraction"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"read driver’s distraction level"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Read driver distraction level."</string>
</resources>
diff --git a/experimental/service/res/values-en-rXC/strings.xml b/experimental/service/res/values-en-rXC/strings.xml
index 19bc3a8..39ca1ae 100644
--- a/experimental/service/res/values-en-rXC/strings.xml
+++ b/experimental/service/res/values-en-rXC/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Driver Distraction"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"read driver’s distraction level"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Read driver distraction level."</string>
</resources>
diff --git a/experimental/service/res/values-es-rUS/strings.xml b/experimental/service/res/values-es-rUS/strings.xml
index e8fbad5..0e93b4f 100644
--- a/experimental/service/res/values-es-rUS/strings.xml
+++ b/experimental/service/res/values-es-rUS/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Distracción del conductor"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"leer nivel de distracción del conductor"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Leer el nivel de distracción del conductor."</string>
</resources>
diff --git a/experimental/service/res/values-es/strings.xml b/experimental/service/res/values-es/strings.xml
index e8fbad5..826ace2 100644
--- a/experimental/service/res/values-es/strings.xml
+++ b/experimental/service/res/values-es/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Distracción del conductor"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"consultar el nivel de distracción de quien conduce"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Leer el nivel de distracción del conductor."</string>
</resources>
diff --git a/experimental/service/res/values-et/strings.xml b/experimental/service/res/values-et/strings.xml
index a5e67ef..0fa6482 100644
--- a/experimental/service/res/values-et/strings.xml
+++ b/experimental/service/res/values-et/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Juhi häiritus"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"juhi häirituse taseme lugemine"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Juhi häirituse taseme lugemine."</string>
</resources>
diff --git a/experimental/service/res/values-eu/strings.xml b/experimental/service/res/values-eu/strings.xml
index b24ac35..408e4d7 100644
--- a/experimental/service/res/values-eu/strings.xml
+++ b/experimental/service/res/values-eu/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Gidariaren distrakzioa"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"irakurri gidariaren distrakzio-maila"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Irakurri gidariaren distrakzio-maila."</string>
</resources>
diff --git a/experimental/service/res/values-fa/strings.xml b/experimental/service/res/values-fa/strings.xml
index 3931b80..29068bc 100644
--- a/experimental/service/res/values-fa/strings.xml
+++ b/experimental/service/res/values-fa/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"حواسپرتی راننده"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"خواندن سطح حواسپرتی راننده"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"خواندن سطح حواسپرتی راننده."</string>
</resources>
diff --git a/experimental/service/res/values-fi/strings.xml b/experimental/service/res/values-fi/strings.xml
index ab43067..ee5cf5c 100644
--- a/experimental/service/res/values-fi/strings.xml
+++ b/experimental/service/res/values-fi/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Kuljettajan keskittyminen"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"lue kuljettajan keskittymisen taso"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Lue kuljettajan keskittymisen taso."</string>
</resources>
diff --git a/experimental/service/res/values-fr-rCA/strings.xml b/experimental/service/res/values-fr-rCA/strings.xml
index 497534b..f013f3a 100644
--- a/experimental/service/res/values-fr-rCA/strings.xml
+++ b/experimental/service/res/values-fr-rCA/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Distraction du conducteur"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"accéder au niveau de distraction du conducteur"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Accédez au niveau de distraction du conducteur."</string>
</resources>
diff --git a/experimental/service/res/values-fr/strings.xml b/experimental/service/res/values-fr/strings.xml
index eaa7572..42e60a6 100644
--- a/experimental/service/res/values-fr/strings.xml
+++ b/experimental/service/res/values-fr/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Niveau de distraction du conducteur"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"accéder au niveau de distraction du conducteur"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Accéder au niveau de distraction du conducteur."</string>
</resources>
diff --git a/experimental/service/res/values-gl/strings.xml b/experimental/service/res/values-gl/strings.xml
index e84f8b1..7fe78ad 100644
--- a/experimental/service/res/values-gl/strings.xml
+++ b/experimental/service/res/values-gl/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Distracción do condutor"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"ler o nivel de distracción do condutor"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Ler o nivel de distracción do condutor."</string>
</resources>
diff --git a/experimental/service/res/values-gu/strings.xml b/experimental/service/res/values-gu/strings.xml
index d6bd7dd..64f97f2 100644
--- a/experimental/service/res/values-gu/strings.xml
+++ b/experimental/service/res/values-gu/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"ડ્રાઇવરનું ધ્યાન ભટકવું"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"ડ્રાઇવરનું ધ્યાન ભટકવાના સ્તર વિશે જાણો"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"ડ્રાઇવરનું ધ્યાન ભટકવાના સ્તર વિશે જાણો."</string>
</resources>
diff --git a/experimental/service/res/values-hi/strings.xml b/experimental/service/res/values-hi/strings.xml
index b5639da..ee2faf5 100644
--- a/experimental/service/res/values-hi/strings.xml
+++ b/experimental/service/res/values-hi/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"ड्राइवर का ध्यान भटकना"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"ड्राइवर का ध्यान भटकने के लेवल के बारे में जानें"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"ड्राइवर का ध्यान भटकने के लेवल के बारे में जानें."</string>
</resources>
diff --git a/experimental/service/res/values-hr/strings.xml b/experimental/service/res/values-hr/strings.xml
index 2fb84b4..271625b 100644
--- a/experimental/service/res/values-hr/strings.xml
+++ b/experimental/service/res/values-hr/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Ometanje vozača"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"čitaju razinu ometanja vozača"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Čitaju razinu ometanja vozača."</string>
</resources>
diff --git a/experimental/service/res/values-hu/strings.xml b/experimental/service/res/values-hu/strings.xml
index e261861..21ca04c 100644
--- a/experimental/service/res/values-hu/strings.xml
+++ b/experimental/service/res/values-hu/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Sofőr figyelmetlensége"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"sofőr figyelmetlenségi szintjének olvasása"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"A sofőr figyelmetlenségi szintjének olvasása."</string>
</resources>
diff --git a/experimental/service/res/values-hy/strings.xml b/experimental/service/res/values-hy/strings.xml
index 77ac717..407f2dd 100644
--- a/experimental/service/res/values-hy/strings.xml
+++ b/experimental/service/res/values-hy/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Շեղող գործոններ"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"հաշվարկել շեղող գործոնների մակարդակը"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Տեսնել շեղող գործոնների մակարդակը։"</string>
</resources>
diff --git a/experimental/service/res/values-in/strings.xml b/experimental/service/res/values-in/strings.xml
index 06924d1..f1ffbac 100644
--- a/experimental/service/res/values-in/strings.xml
+++ b/experimental/service/res/values-in/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Gangguan bagi Pengemudi"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"baca tingkat gangguan bagi pengemudi"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Baca tingkat gangguan bagi pengemudi."</string>
</resources>
diff --git a/experimental/service/res/values-is/strings.xml b/experimental/service/res/values-is/strings.xml
index 759c6a9..99f6547 100644
--- a/experimental/service/res/values-is/strings.xml
+++ b/experimental/service/res/values-is/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Truflun ökumanns"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"athuga hversu miklum truflunum ökumaður verður fyrir"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Athuga hversu miklum truflunum ökumaður verður fyrir."</string>
</resources>
diff --git a/experimental/service/res/values-it/strings.xml b/experimental/service/res/values-it/strings.xml
index 9436c06..a48bb0f 100644
--- a/experimental/service/res/values-it/strings.xml
+++ b/experimental/service/res/values-it/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Distrazione dell\'autista"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"Lettura del livello di distrazione dell\'autista"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Leggi il livello di distrazione dell\'autista"</string>
</resources>
diff --git a/experimental/service/res/values-iw/strings.xml b/experimental/service/res/values-iw/strings.xml
index d5b8bb4..8e38a45 100644
--- a/experimental/service/res/values-iw/strings.xml
+++ b/experimental/service/res/values-iw/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"הסחת הדעת של הנהג"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"קריאה של רמת הסחת הדעת של הנהג"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"אישור קריאה של רמת הסחת הדעת של הנהג."</string>
</resources>
diff --git a/experimental/service/res/values-ja/strings.xml b/experimental/service/res/values-ja/strings.xml
index 1762317..07dbea4 100644
--- a/experimental/service/res/values-ja/strings.xml
+++ b/experimental/service/res/values-ja/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"ドライバーの注意散漫"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"ドライバーの注意散漫レベルの読み取り"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"ドライバーの注意散漫レベルの読み取り。"</string>
</resources>
diff --git a/experimental/service/res/values-ka/strings.xml b/experimental/service/res/values-ka/strings.xml
index 2317561..3f28b4b 100644
--- a/experimental/service/res/values-ka/strings.xml
+++ b/experimental/service/res/values-ka/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"მძღოლის გაფანტულობა"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"მძღოლის გაფანტულობის დონის წაკითხვა"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"მძღოლის გაფანტულობის დონის წაკითხვა."</string>
</resources>
diff --git a/experimental/service/res/values-kk/strings.xml b/experimental/service/res/values-kk/strings.xml
index eda84f1..0941757 100644
--- a/experimental/service/res/values-kk/strings.xml
+++ b/experimental/service/res/values-kk/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Жүргізушіні алаңдату"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"жүргізушіні алаңдату деңгейін көру"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Жүргізушіні алаңдату деңгейін көру."</string>
</resources>
diff --git a/experimental/service/res/values-km/strings.xml b/experimental/service/res/values-km/strings.xml
index ff5d56c..c25b605 100644
--- a/experimental/service/res/values-km/strings.xml
+++ b/experimental/service/res/values-km/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"ការរំខានរបស់អ្នកបើកបរ"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"អានកម្រិតនៃការរំខានរបស់អ្នកបើកបរ"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"អានកម្រិតនៃការរំខានរបស់អ្នកបើកបរ។"</string>
</resources>
diff --git a/experimental/service/res/values-kn/strings.xml b/experimental/service/res/values-kn/strings.xml
index e70dc1b..c58906b 100644
--- a/experimental/service/res/values-kn/strings.xml
+++ b/experimental/service/res/values-kn/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"ಚಾಲಕನ ವ್ಯಾಕುಲತೆ"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"ಚಾಲಕರ ವ್ಯಾಕುಲತೆಯ ಮಟ್ಟವನ್ನು ಓದಿ"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"ಚಾಲಕನ ವ್ಯಾಕುಲತೆಯ ಮಟ್ಟವನ್ನು ಓದಿ."</string>
</resources>
diff --git a/experimental/service/res/values-ko/strings.xml b/experimental/service/res/values-ko/strings.xml
index 8a239a6..62b78fc 100644
--- a/experimental/service/res/values-ko/strings.xml
+++ b/experimental/service/res/values-ko/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"운전자 주의 분산"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"운전자의 주의 분산 수준을 읽습니다."</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"운전자의 주의 분산 수준을 읽습니다."</string>
</resources>
diff --git a/experimental/service/res/values-ky/strings.xml b/experimental/service/res/values-ky/strings.xml
index c73ad9f..f4f2750 100644
--- a/experimental/service/res/values-ky/strings.xml
+++ b/experimental/service/res/values-ky/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Айдоочуну алаксыткан колдонмолор"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"айдоочуну алаксыткан колдонмолордун деңгээлин окуу"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Айдоочуну алаксыткан колдонмолордун деңгээлин окуу."</string>
</resources>
diff --git a/experimental/service/res/values-lo/strings.xml b/experimental/service/res/values-lo/strings.xml
index c57f2b3..3065fb6 100644
--- a/experimental/service/res/values-lo/strings.xml
+++ b/experimental/service/res/values-lo/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"ການເສຍສະມາທິຂອງຜູ້ຂັບ"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"ລະດັບການເສຍສະມາທິຂອງຜູ້ຂັບ"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"ອ່ານລະດັບການເສຍສະມາທິຂອງຜູ້ຂັບ."</string>
</resources>
diff --git a/experimental/service/res/values-lt/strings.xml b/experimental/service/res/values-lt/strings.xml
index 0dbc6b6..7bbbf97 100644
--- a/experimental/service/res/values-lt/strings.xml
+++ b/experimental/service/res/values-lt/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Vairuotojo dėmesio atitraukimas"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"skaityti vairuotojo dėmesio atitraukimo lygio informaciją"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Skaityti vairuotojo dėmesio atitraukimo lygio informaciją."</string>
</resources>
diff --git a/experimental/service/res/values-lv/strings.xml b/experimental/service/res/values-lv/strings.xml
index 3e7afe4..755614c 100644
--- a/experimental/service/res/values-lv/strings.xml
+++ b/experimental/service/res/values-lv/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Autovadītāja uzmanības novēršanas līmenis"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"lasīt autovadītāja uzmanības novēršanas līmeni"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Lasīt autovadītāja uzmanības novēršanas līmeni."</string>
</resources>
diff --git a/experimental/service/res/values-mk/strings.xml b/experimental/service/res/values-mk/strings.xml
index 1577970..fe75ef8 100644
--- a/experimental/service/res/values-mk/strings.xml
+++ b/experimental/service/res/values-mk/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Одвлекување на вниманието на возачот"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"да го чита нивото на одвлекување на вниманието на возачот"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Го читаат нивото на одвлекување на вниманието на возачот."</string>
</resources>
diff --git a/experimental/service/res/values-ml/strings.xml b/experimental/service/res/values-ml/strings.xml
index 26a6bc5..a1fb16f 100644
--- a/experimental/service/res/values-ml/strings.xml
+++ b/experimental/service/res/values-ml/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"ഡ്രൈവറുടെ ശ്രദ്ധാ വ്യതിചലനം"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"ഡ്രൈവറുടെ ശ്രദ്ധ വ്യതിചലിച്ചതിന്റെ ലെവൽ റീഡ് ചെയ്യുക"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"ഡ്രൈവറുടെ ശ്രദ്ധ വ്യതിചലിച്ചതിന്റെ ലെവൽ റീഡ് ചെയ്യുക."</string>
</resources>
diff --git a/experimental/service/res/values-mn/strings.xml b/experimental/service/res/values-mn/strings.xml
index 93277d4..c4c1c78 100644
--- a/experimental/service/res/values-mn/strings.xml
+++ b/experimental/service/res/values-mn/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Жолоочийн анхаарал сарниулах зүйлс"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"жолоочийн анхаарал сарних түвшнийг унших"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Жолоочийн анхаарал сарниулах зүйлсийн түвшнийг уншина уу."</string>
</resources>
diff --git a/experimental/service/res/values-mr/strings.xml b/experimental/service/res/values-mr/strings.xml
index 6477c68..96328bb 100644
--- a/experimental/service/res/values-mr/strings.xml
+++ b/experimental/service/res/values-mr/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"ड्रायव्हर डिस्ट्रॅक्शन"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"ड्रायव्हर डिस्ट्रॅक्शनची पातळी वाचा"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"ड्रायव्हर डिस्ट्रॅक्शनची पातळी रीड करा."</string>
</resources>
diff --git a/experimental/service/res/values-ms/strings.xml b/experimental/service/res/values-ms/strings.xml
index 005e721..5b7cb61 100644
--- a/experimental/service/res/values-ms/strings.xml
+++ b/experimental/service/res/values-ms/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Gangguan Pemandu"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"baca tahap gangguan pemandu"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Baca tahap gangguan pemandu."</string>
</resources>
diff --git a/experimental/service/res/values-my/strings.xml b/experimental/service/res/values-my/strings.xml
index 6dcec79..7f6ec58 100644
--- a/experimental/service/res/values-my/strings.xml
+++ b/experimental/service/res/values-my/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"ယာဉ်မောင်းသူ အနှောင့်အယှက်ဖြစ်မှု"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"ယာဉ်မောင်းသူ၏ စိတ်အနှောင့်အယှက်ဖြစ်မှု အဆင့်ကို ကြည့်ရန်"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"ယာဉ်မောင်းသူ အနှောင့်အယှက်ဖြစ်မှုအဆင့်ကို ဖတ်ရန်။"</string>
</resources>
diff --git a/experimental/service/res/values-nb/strings.xml b/experimental/service/res/values-nb/strings.xml
index aa7f821..ac03d56 100644
--- a/experimental/service/res/values-nb/strings.xml
+++ b/experimental/service/res/values-nb/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Sjåførens distraksjonsnivå"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"registrer sjåførens distraksjonsnivå"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Registrer sjåførens distraksjonsnivå."</string>
</resources>
diff --git a/experimental/service/res/values-ne/strings.xml b/experimental/service/res/values-ne/strings.xml
index dd3a974..fac2957 100644
--- a/experimental/service/res/values-ne/strings.xml
+++ b/experimental/service/res/values-ne/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"ड्राइभरको ध्यान भङ्ग गराउने कुरा"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"ड्राइभरको ध्यान भङ्ग गराउने कुराको स्तर पढ्नुहोस्"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"ड्राइभरको ध्यान भङ्ग गराउने कुराको स्तर पढ्नुहोस्।"</string>
</resources>
diff --git a/experimental/service/res/values-nl/strings.xml b/experimental/service/res/values-nl/strings.xml
index c72564f..70cb99a 100644
--- a/experimental/service/res/values-nl/strings.xml
+++ b/experimental/service/res/values-nl/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Afleidingsniveau van chauffeur"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"afleidingsniveau van chauffeur lezen"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Afleidingsniveau van chauffeur lezen"</string>
</resources>
diff --git a/experimental/service/res/values-or/strings.xml b/experimental/service/res/values-or/strings.xml
index 22e3577..f896f66 100644
--- a/experimental/service/res/values-or/strings.xml
+++ b/experimental/service/res/values-or/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"ଡ୍ରାଇଭର୍ ଡିସଟ୍ରାକସନ୍"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"ଡ୍ରାଇଭରର ଡିସଟ୍ରାକସନ୍ ସ୍ତର ପଢ଼ନ୍ତୁ"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"ଡ୍ରାଇଭର୍ ଡିସଟ୍ରାକସନ୍ ସ୍ତର ପଢ଼ନ୍ତୁ"</string>
</resources>
diff --git a/experimental/service/res/values-pa/strings.xml b/experimental/service/res/values-pa/strings.xml
index 1774246..01788ed 100644
--- a/experimental/service/res/values-pa/strings.xml
+++ b/experimental/service/res/values-pa/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"ਡਰਾਈਵਰ ਦਾ ਧਿਆਨ ਹਟਣਾ"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"ਡਰਾਈਵਰ ਦੇ ਧਿਆਨ ਹਟਣ ਦੇ ਪੱਧਰ ਬਾਰੇ ਜਾਣੋ"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"ਡਰਾਈਵਰ ਦੇ ਧਿਆਨ ਹਟਣ ਦੇ ਪੱਧਰ ਬਾਰੇ ਜਾਣੋ।"</string>
</resources>
diff --git a/experimental/service/res/values-pl/strings.xml b/experimental/service/res/values-pl/strings.xml
index 7054259..5e4db5d 100644
--- a/experimental/service/res/values-pl/strings.xml
+++ b/experimental/service/res/values-pl/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Rozproszenie uwagi kierowcy"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"odczytywanie informacji o poziomie rozproszenia uwagi kierowcy"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Odczytywanie informacji o poziomie rozproszenia uwagi kierowcy."</string>
</resources>
diff --git a/experimental/service/res/values-pt-rPT/strings.xml b/experimental/service/res/values-pt-rPT/strings.xml
index e8714fc..7c3fb42 100644
--- a/experimental/service/res/values-pt-rPT/strings.xml
+++ b/experimental/service/res/values-pt-rPT/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Distração do condutor"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"avaliar o nível de distração do condutor"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Avaliar o nível de distração do condutor"</string>
</resources>
diff --git a/experimental/service/res/values-pt/strings.xml b/experimental/service/res/values-pt/strings.xml
index 024c7ad..c697875 100644
--- a/experimental/service/res/values-pt/strings.xml
+++ b/experimental/service/res/values-pt/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Distração do motorista"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"ler o nível de distração do motorista"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Ler o nível de distração do motorista."</string>
</resources>
diff --git a/experimental/service/res/values-ro/strings.xml b/experimental/service/res/values-ro/strings.xml
index 3e96fb5..7b6f4be 100644
--- a/experimental/service/res/values-ro/strings.xml
+++ b/experimental/service/res/values-ro/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Distragerea șoferului"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"poate citi nivelul de distragere al șoferului"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Poate citi nivelul de distragere al șoferului."</string>
</resources>
diff --git a/experimental/service/res/values-ru/strings.xml b/experimental/service/res/values-ru/strings.xml
index 883430d..c2176d6 100644
--- a/experimental/service/res/values-ru/strings.xml
+++ b/experimental/service/res/values-ru/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Отвлекающие факторы"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"считывание уровня отвлекающих факторов"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Считывание уровня отвлекающих факторов."</string>
</resources>
diff --git a/experimental/service/res/values-si/strings.xml b/experimental/service/res/values-si/strings.xml
index 24dde2e..0a793ea 100644
--- a/experimental/service/res/values-si/strings.xml
+++ b/experimental/service/res/values-si/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"රියදුරු වික්ෂිප්ත වීම"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"රියදුරු වික්ෂිප්ත මට්ටම කියවන්න"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"රියදුරු වික්ෂිප්ත මට්ටම කියවන්න."</string>
</resources>
diff --git a/experimental/service/res/values-sk/strings.xml b/experimental/service/res/values-sk/strings.xml
index fc57d39..567acf0 100644
--- a/experimental/service/res/values-sk/strings.xml
+++ b/experimental/service/res/values-sk/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Vyrušenie pozornosti vodiča"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"čítanie miery vyrušenia pozornosti vodiča"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Čítanie miery vyrušenia pozornosti vodiča."</string>
</resources>
diff --git a/experimental/service/res/values-sl/strings.xml b/experimental/service/res/values-sl/strings.xml
index 96174f8..e8243ff 100644
--- a/experimental/service/res/values-sl/strings.xml
+++ b/experimental/service/res/values-sl/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Nepozornost voznika"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"branje stopnje nepozornosti voznika"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Branje stopnje nepozornosti voznika."</string>
</resources>
diff --git a/experimental/service/res/values-sq/strings.xml b/experimental/service/res/values-sq/strings.xml
index ecbc905..6ec188b 100644
--- a/experimental/service/res/values-sq/strings.xml
+++ b/experimental/service/res/values-sq/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Shpërqendrimi i drejtuesit të makinës"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"të lexojnë nivelin e shpërqendrimit të drejtuesit të makinës"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Lexo nivelin e shpërqendrimit të drejtuesit të makinës."</string>
</resources>
diff --git a/experimental/service/res/values-sr/strings.xml b/experimental/service/res/values-sr/strings.xml
index 86ab2f7..a1db45b 100644
--- a/experimental/service/res/values-sr/strings.xml
+++ b/experimental/service/res/values-sr/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Ометање возача"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"читање нивоа ометања возача"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Очитавају ниво ометања возача."</string>
</resources>
diff --git a/experimental/service/res/values-sv/strings.xml b/experimental/service/res/values-sv/strings.xml
index 0404356..c7f35a6 100644
--- a/experimental/service/res/values-sv/strings.xml
+++ b/experimental/service/res/values-sv/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Förardistraktion"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"läsa graden av förardistraktion"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Läsa graden av förardistraktion."</string>
</resources>
diff --git a/experimental/service/res/values-sw/strings.xml b/experimental/service/res/values-sw/strings.xml
index eb1839e..7ef4c6f 100644
--- a/experimental/service/res/values-sw/strings.xml
+++ b/experimental/service/res/values-sw/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Usumbufu kwa Dereva"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"kusoma kiwango cha usumbufu kwa dereva"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Soma kiwango cha usumbufu kwa dereva."</string>
</resources>
diff --git a/experimental/service/res/values-ta/strings.xml b/experimental/service/res/values-ta/strings.xml
index 5109d48..b3f6833 100644
--- a/experimental/service/res/values-ta/strings.xml
+++ b/experimental/service/res/values-ta/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"ஓட்டுநரின் கவனச்சிதறல்"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"ஓட்டுநரின் கவனச்சிதறல் நிலையைக் கண்டறி"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"ஓட்டுநரின் கவனச்சிதறல் நிலையைக் கண்டறி."</string>
</resources>
diff --git a/experimental/service/res/values-te/strings.xml b/experimental/service/res/values-te/strings.xml
index c7576de..ca50681 100644
--- a/experimental/service/res/values-te/strings.xml
+++ b/experimental/service/res/values-te/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"డ్రైవర్ పరధ్యానం"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"డ్రైవర్ పరధ్యాన స్థాయిని చదువు"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"డ్రైవర్ పరధ్యాన స్థాయిని చదువు."</string>
</resources>
diff --git a/experimental/service/res/values-th/strings.xml b/experimental/service/res/values-th/strings.xml
index 4459040..3a2c851 100644
--- a/experimental/service/res/values-th/strings.xml
+++ b/experimental/service/res/values-th/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"การเสียสมาธิของผู้ขับ"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"อ่านระดับการเสียสมาธิของผู้ขับ"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"อ่านระดับการเสียสมาธิของผู้ขับ"</string>
</resources>
diff --git a/experimental/service/res/values-tl/strings.xml b/experimental/service/res/values-tl/strings.xml
index 0c77534..19052c8 100644
--- a/experimental/service/res/values-tl/strings.xml
+++ b/experimental/service/res/values-tl/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Gambala sa Nagmamaneho"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"basahin ang antas ng gambala sa nagmamaneho"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Basahin ang antas ng gambala sa nagmamaneho."</string>
</resources>
diff --git a/experimental/service/res/values-tr/strings.xml b/experimental/service/res/values-tr/strings.xml
index 5f8ef5d..cccb1a4 100644
--- a/experimental/service/res/values-tr/strings.xml
+++ b/experimental/service/res/values-tr/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Sürücünün Dikkatinin Dağılması"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"sürücünün dikkatinin dağılma seviyesini oku"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Sürücünün dikkatinin dağılma seviyesini oku."</string>
</resources>
diff --git a/experimental/service/res/values-uk/strings.xml b/experimental/service/res/values-uk/strings.xml
index 9f2fc5f..54c0bd4 100644
--- a/experimental/service/res/values-uk/strings.xml
+++ b/experimental/service/res/values-uk/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Відволікання водія"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"переглядати рівень відволікання водія"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Переглядати рівень відволікання водія."</string>
</resources>
diff --git a/experimental/service/res/values-ur/strings.xml b/experimental/service/res/values-ur/strings.xml
index 82805cc..871fb80 100644
--- a/experimental/service/res/values-ur/strings.xml
+++ b/experimental/service/res/values-ur/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"ڈرائیور کا ذہنی انتشار"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"ڈرائیور کے ذہنی انتشار کا لیول پڑھیں"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"ڈرائیور کے ذہنی انتشار کا لیول پڑھیں۔"</string>
</resources>
diff --git a/experimental/service/res/values-uz/strings.xml b/experimental/service/res/values-uz/strings.xml
index 4a92473..3e30601 100644
--- a/experimental/service/res/values-uz/strings.xml
+++ b/experimental/service/res/values-uz/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Haydovchi diqqatini olish"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"haydovchi diqqatini olish darajasi haqida batafsil"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Haydovchi diqqatini olish darajasi haqida batafsil."</string>
</resources>
diff --git a/experimental/service/res/values-vi/strings.xml b/experimental/service/res/values-vi/strings.xml
index 2ee4c33..1af7c52 100644
--- a/experimental/service/res/values-vi/strings.xml
+++ b/experimental/service/res/values-vi/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Mức mất tập trung của người lái xe"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"đọc thông tin về mức mất tập trung của người lái xe"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Đọc thông tin về mức mất tập trung của người lái xe."</string>
</resources>
diff --git a/experimental/service/res/values-zh-rCN/strings.xml b/experimental/service/res/values-zh-rCN/strings.xml
index 66fbb35..cfecc42 100644
--- a/experimental/service/res/values-zh-rCN/strings.xml
+++ b/experimental/service/res/values-zh-rCN/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"驾驶员分散注意力"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"读取驾驶员分散注意力等级"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"读取驾驶员分散注意力等级。"</string>
</resources>
diff --git a/experimental/service/res/values-zh-rHK/strings.xml b/experimental/service/res/values-zh-rHK/strings.xml
index 3974389..2aa6176 100644
--- a/experimental/service/res/values-zh-rHK/strings.xml
+++ b/experimental/service/res/values-zh-rHK/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"司機分心程度"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"讀取司機分心程度"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"讀取司機分心程度。"</string>
</resources>
diff --git a/experimental/service/res/values-zh-rTW/strings.xml b/experimental/service/res/values-zh-rTW/strings.xml
index ac74c8a..86512f5 100644
--- a/experimental/service/res/values-zh-rTW/strings.xml
+++ b/experimental/service/res/values-zh-rTW/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"駕駛人分心等級"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"讀取駕駛人的分心等級"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"讀取駕駛人分心等級。"</string>
</resources>
diff --git a/experimental/service/res/values-zu/strings.xml b/experimental/service/res/values-zu/strings.xml
index 0489163..6d1c25a 100644
--- a/experimental/service/res/values-zu/strings.xml
+++ b/experimental/service/res/values-zu/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4864958399001183048">"Ukuphazamiseka komshayeli"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"funda ileveli yokuphazamisa yomshayeli"</string>
<string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Funda ileveli yokuphazamisa yomshayeli."</string>
</resources>
diff --git a/experimental/tests/experimentalcarservice_unit_test/Android.bp b/experimental/tests/experimentalcarservice_unit_test/Android.bp
index 891a151..13fa524 100644
--- a/experimental/tests/experimentalcarservice_unit_test/Android.bp
+++ b/experimental/tests/experimentalcarservice_unit_test/Android.bp
@@ -45,4 +45,6 @@
],
instrumentation_for: "ExperimentalCarService",
+
+ test_suites: ["device-tests"]
}
diff --git a/service/res/layout/activity_blocking.xml b/service/res/layout/activity_blocking.xml
index f79406d..911c658 100644
--- a/service/res/layout/activity_blocking.xml
+++ b/service/res/layout/activity_blocking.xml
@@ -12,58 +12,67 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/activity_blocking_activity_background"
- android:gravity="center"
- android:orientation="vertical">
+ android:layout_height="match_parent">
- <ImageView
- android:id="@+id/ux_restricted_icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/common_margin"
- android:src="@drawable/car_ic_ux_restricted_48dp" />
+ <android.opengl.GLSurfaceView
+ android:id="@+id/blurred_surface_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
- <TextView
- android:id="@+id/blocking_text"
- android:layout_width="@dimen/blocking_text_width"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:text="@string/activity_blocked_text"
- android:textAppearance="@style/ActivityBlockingActivityText" />
+ <LinearLayout
+ android:id="@+id/activity_blocking_content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/activity_blocking_activity_background"
+ android:gravity="center"
+ android:orientation="vertical">
- <LinearLayout
- android:id="@+id/action_button_container"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="48dp"
- android:layout_gravity="center"
- android:gravity="center_horizontal"
- android:orientation="horizontal">
- <Button
- android:id="@+id/exit_button"
- style="@style/ButtonStyle" />
+ <ImageView
+ android:id="@+id/ux_restricted_icon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/common_margin"
+ android:src="@drawable/car_ic_ux_restricted_48dp" />
- <Button
- android:id="@+id/toggle_debug_info"
- style="@style/ButtonStyle"
- android:text="@string/debug_button_text"
- android:visibility="gone"
- android:layout_marginStart="@dimen/action_button_padding_horizontal"/>
+ <TextView
+ android:id="@+id/blocking_text"
+ android:layout_width="@dimen/blocking_text_width"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:text="@string/activity_blocked_text"
+ android:textAppearance="@style/ActivityBlockingActivityText" />
- </LinearLayout>
+ <LinearLayout
+ android:id="@+id/action_button_container"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="48dp"
+ android:layout_gravity="center"
+ android:gravity="center_horizontal"
+ android:orientation="horizontal">
+ <Button
+ android:id="@+id/exit_button"
+ style="@style/ButtonStyle" />
- <TextView
- android:id="@+id/debug_info"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="@style/ActivityBlockingActivityText"
- android:visibility="gone" />
+ <Button
+ android:id="@+id/toggle_debug_info"
+ style="@style/ButtonStyle"
+ android:text="@string/debug_button_text"
+ android:visibility="gone"
+ android:layout_marginStart="@dimen/action_button_padding_horizontal"/>
-</LinearLayout>
+ </LinearLayout>
+ <TextView
+ android:id="@+id/debug_info"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/ActivityBlockingActivityText"
+ android:visibility="gone" />
+
+ </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/service/res/raw/horizontal_blur_fragment_shader.glsl b/service/res/raw/horizontal_blur_fragment_shader.glsl
new file mode 100644
index 0000000..b0b935f
--- /dev/null
+++ b/service/res/raw/horizontal_blur_fragment_shader.glsl
@@ -0,0 +1,36 @@
+#extension GL_OES_EGL_image_external : require
+precision mediump float;
+
+uniform vec3 uResolution;
+uniform samplerExternalOES sTexture;
+uniform float uRadius;
+varying vec2 vTextureCoord;
+
+float computeWeight(float x) {
+ return -((x * x) / (uRadius * uRadius)) + 1.0;
+}
+
+/**
+* This shader sets the colour of each fragment to be the weighted average of the uRadius fragments
+* horizontally adjacent to it to produce a blur effect along the x-axis of the texture
+*
+* The weights come from the following curve: f(x) = 1 - (x^2)/(r^2)
+* where r is the radius of the blur
+*/
+void main() {
+ vec4 sampledColor = vec4(0.0);
+ vec4 weightedColor = vec4(0.0);
+
+ float divisor = 0.0;
+ float weight = 0.0;
+
+ for (float x = -uRadius; x <= uRadius; x++)
+ {
+ sampledColor = texture2D(sTexture, vTextureCoord + vec2(x / uResolution.x, 0.0));
+ weight = computeWeight(x);
+ weightedColor += sampledColor * weight;
+ divisor += weight;
+ }
+
+ gl_FragColor = vec4(weightedColor.r / divisor, weightedColor.g / divisor, weightedColor.b / divisor, 1.0);
+}
diff --git a/service/res/raw/vertex_shader.glsl b/service/res/raw/vertex_shader.glsl
new file mode 100644
index 0000000..69e7c2e
--- /dev/null
+++ b/service/res/raw/vertex_shader.glsl
@@ -0,0 +1,15 @@
+uniform mat4 uMVPMatrix;
+uniform mat4 uTexMatrix;
+attribute vec4 aPosition;
+attribute vec4 aTextureCoord;
+varying vec2 vTextureCoord;
+
+/**
+* This vertex shader maps the projection matrix to the
+* position of the frame and then forwards
+* the coordinates of the texture to a vertex shader
+*/
+void main() {
+ gl_Position = uMVPMatrix * aPosition;
+ vTextureCoord = (uTexMatrix * aTextureCoord).xy;
+}
diff --git a/service/res/raw/vertical_blur_fragment_shader.glsl b/service/res/raw/vertical_blur_fragment_shader.glsl
new file mode 100644
index 0000000..abe6436
--- /dev/null
+++ b/service/res/raw/vertical_blur_fragment_shader.glsl
@@ -0,0 +1,36 @@
+#extension GL_OES_EGL_image_external : require
+precision mediump float;
+
+uniform vec3 uResolution;
+uniform sampler2D sTexture;
+uniform float uRadius;
+varying vec2 vTextureCoord;
+
+float computeWeight(float x) {
+ return -((x * x) / (uRadius * uRadius)) + 1.0;
+}
+
+/**
+* This shader sets the colour of each fragment to be the weighted average of the uRadius fragments
+* vertically adjacent to it to produce a blur effect along the y-axis of the texture
+*
+* The weights come from the following curve: f(x) = 1 - (x^2)/(r^2)
+* where r is the radius of the blur
+*/
+void main() {
+ vec4 sampledColor = vec4(0.0);
+ vec4 weightedColor = vec4(0.0);
+
+ float divisor = 0.0;
+ float weight = 0.0;
+
+ for (float y = -uRadius; y <= uRadius; y++)
+ {
+ sampledColor = texture2D(sTexture, vTextureCoord + vec2(0.0, y / uResolution.y));
+ weight = computeWeight(y);
+ weightedColor += sampledColor * weight;
+ divisor += weight;
+ }
+
+ gl_FragColor = vec4(weightedColor.r / divisor, weightedColor.g / divisor, weightedColor.b / divisor, 1.0);
+}
diff --git a/service/res/values-af/strings.xml b/service/res/values-af/strings.xml
index b4a103f..1fe0408 100644
--- a/service/res/values-af/strings.xml
+++ b/service/res/values-af/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Hanteer invoergebeurtenisse"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN-bus het misluk"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-bus reageer nie. Ontprop hoofeenheidkas, prop dit weer in, en herbegin die motor"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Vir jou veiligheid is dié aktiwiteit nie beskikbaar terwyl jy bestuur nie.\nWag totdat jy geparkeer het om voort te gaan."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Jy kan nie hierdie kenmerk gebruik terwyl jy bestuur nie"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Kies <xliff:g id="EXIT_BUTTON">%s</xliff:g> om oor te begin met veilige programkenmerke."</string>
<string name="exit_button" msgid="5829638404777671253">"Terug"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Maak program toe"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Terug"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"lees diagnostiese data"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Lees diagnostiese data van die motor af."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"vee diagnostiese data uit"</string>
diff --git a/service/res/values-am/strings.xml b/service/res/values-am/strings.xml
index 2f03c34..975ee8a 100644
--- a/service/res/values-am/strings.xml
+++ b/service/res/values-am/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"የግቤት ክስተቶችን ያስተናግዱ"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN አውቶብስ አልተሳካም"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN አውቶብስ ምላሽ አይሰጥም። የጭንቅላት አሃድ መያዣ ሳጥኑን ይሰኩ እና ይንቀሉ በመቀጠል መኪናውን ዳግም ያስጀምሩ"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"ለእርስዎ ደህንነት ሲባል፣ ይህ እንቅስቃሴ እርስዎ በሚነዱበት ጊዜ አይገኝም። \nለመቀጠል እንዲችሉ፣ መኪናዎ እስከሚቆም ድረስ ይጠብቁ።"</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"እየነዱ ሳለ ይህን ባህሪ መጠቀም አይችሉም"</string>
<string name="exit_button_message" msgid="8554690915924055685">"ከደህንነት አስተማማኝ የሆኑ የመተግበሪያ ባህሪያት ጋር መልሶ ለመጀመር፣ <xliff:g id="EXIT_BUTTON">%s</xliff:g>ን ይምረጡ።"</string>
<string name="exit_button" msgid="5829638404777671253">"ተመለስ"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"መተግበሪያን ዝጋ"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"ተመለስ"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"የምርመራ ውሂብን አንብብ"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"ከመኪናው ላይ የምርመራ ውሂብን ያንብቡ።"</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"የምርመራ ውሂብን አጽዳ"</string>
diff --git a/service/res/values-ar/strings.xml b/service/res/values-ar/strings.xml
index 0026cb5..97fce26 100644
--- a/service/res/values-ar/strings.xml
+++ b/service/res/values-ar/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"التعامل مع أحداث الإدخال"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"حدث خطأ في موصّل CAN"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"لا استجابة من موصّل CAN. يمكنك فصل صندوق وحدة الرأس وإعادة تشغيل السيارة."</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"حرصًا على سلامتك، لا يتوفّر هذا النشاط أثناء القيادة.\nللمتابعة، يمكنك الانتظار حتى تتوقّف السيارة."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"لا يمكنك استخدام هذه الميزة أثناء القيادة."</string>
<string name="exit_button_message" msgid="8554690915924055685">"للبدء من جديد باستخدام ميزات تطبيق آمنة، اختَر <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"رجوع"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"إغلاق التطبيق"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"رجوع"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"قراءة البيانات التشخيصية"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"يمكنك قراءة البيانات التشخيصية من السيارة."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"محو البيانات التشخيصية"</string>
diff --git a/service/res/values-as/strings.xml b/service/res/values-as/strings.xml
index 7a29acb..d83abe2 100644
--- a/service/res/values-as/strings.xml
+++ b/service/res/values-as/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ইনপুট ইভেণ্ট নিয়ন্ত্ৰণ কৰিব"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN বাছ বিফল হৈছে"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN বাছে সঁহাৰি দিয়া নাই। হে’ড ইউনিট বাকচটো আঁতৰাই পুনৰ লগাওক"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"আপোনাৰ নিৰাপত্তাৰ বাবে এই কাৰ্যকলাপটো গাড়ী চলাই থকা সময়ত কৰিব নোৱাৰি।\nগাড়ীখন পাৰ্ক কৰি কামটো কৰক।"</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"আপুনি গাড়ী চলাই থকাৰ সময়ত এই সুবিধাটো ব্যৱহাৰ কৰিব নোৱাৰে"</string>
<string name="exit_button_message" msgid="8554690915924055685">"সুৰক্ষিত এপ্ সুবিধাসহ আকৌ আৰম্ভ কৰিবলৈ <xliff:g id="EXIT_BUTTON">%s</xliff:g> বাছনি কৰক।"</string>
<string name="exit_button" msgid="5829638404777671253">"উভতি যাওক"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"এপ্টো বন্ধ কৰক"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"উভতি যাওক"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"ডায়গন’ষ্টিক ডেটা পঢ়িব"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"গাড়ীৰ ডায়গ’ষ্টিক তথ্য পঢ়িব।"</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"ডায়গন’ষ্টিক ডেটা মচিব"</string>
diff --git a/service/res/values-az/strings.xml b/service/res/values-az/strings.xml
index d812aba..85244a2 100644
--- a/service/res/values-az/strings.xml
+++ b/service/res/values-az/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Daxiletmələri idarə etmək"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN idarəetmə mexanizmi uğursuz oldu"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN mexanizmi cavab vermir. Əsas cihaz panelini ayırın və yenidən qoşun, sonra avtomobili yenidən işə salın"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Təhlükəsizliyiniz üçün bu əməliyyat sürüş zamanı əlçatan deyil.\nDavam etmək üçün park edənədək gözləyin."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Avtomobil sürərkən bu funksiyanı istifadə edə bilməzsiniz"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Təhlükəsiz tətbiq xüsusiyyətləri ilə başlamaq üçün <xliff:g id="EXIT_BUTTON">%s</xliff:g> seçin."</string>
<string name="exit_button" msgid="5829638404777671253">"Geri"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Tətbiqi qapadın"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Geri"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"diaqnoztika məlumatlarını oxumaq"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Avtomobilin diaqnoztika məlumatlarını oxumaq."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"diaqnoztika məlumatlarını silmək"</string>
diff --git a/service/res/values-b+sr+Latn/strings.xml b/service/res/values-b+sr+Latn/strings.xml
index 4abf472..1b46bec 100644
--- a/service/res/values-b+sr+Latn/strings.xml
+++ b/service/res/values-b+sr+Latn/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Upravlja događajima unosa"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Greška CAN magistrale"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN magistrala ne reaguje. Isključite i ponovo uključite glavnu jedinicu i ponovo pokrenite automobil"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Ova aktivnost nije dostupna dok vozite radi vaše bezbednosti.\nDa biste nastavili, prvo se parkirajte."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Ne možete da koristite ovu funkciju dok vozite"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Da biste ponovo počeli sa bezbednim funkcijama aplikacije, izaberite <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Nazad"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Zatvori aplikaciju"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Nazad"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"čitanje dijagnostičkih podataka"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Čitanje dijagnostičkih podataka iz automobila."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"brisanje dijagnostičkih podataka"</string>
diff --git a/service/res/values-be/strings.xml b/service/res/values-be/strings.xml
index 117f40e..6a35823 100644
--- a/service/res/values-be/strings.xml
+++ b/service/res/values-be/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Магчымасць апрацоўваць падзеі ўводу"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN-шына парушана"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-шына не адказвае. Перападключыце канектар, а затым выключыце запальванне і паўторна завядзіце аўтамабіль"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Дзеля вашай бяспекі гэта дзеянне недаступнае, калі вы за рулём.\nСпачатку прыпаркуйцеся."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Гэта функцыя недаступная для карыстання, калі аўтамабіль рухаецца"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Каб перазапусціць праграму ў бяспечным рэжыме, націсніце кнопку \"<xliff:g id="EXIT_BUTTON">%s</xliff:g>\"."</string>
<string name="exit_button" msgid="5829638404777671253">"Назад"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Закрыць праграму"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Назад"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"атрымліваць даныя дыягностыкі"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Счытванне дыягнастычных даных аўтамабіля"</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"ачысціць даныя дыягностыкі"</string>
diff --git a/service/res/values-bg/strings.xml b/service/res/values-bg/strings.xml
index 1c5b0ef..63e50e6 100644
--- a/service/res/values-bg/strings.xml
+++ b/service/res/values-bg/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Обработване на входящи събития"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Грешка в CAN шината"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN шината не реагира. Изключете и включете отново захранването на основното устройство и рестартирайте автомобила"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"От съображения за безопасност тази функция не е достъпна при шофиране.\nЗа да продължите, трябва първо да паркирате."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Не можете да използвате тази функция по време на шофиране"</string>
<string name="exit_button_message" msgid="8554690915924055685">"За да рестартирате приложението и безопасните му функции, изберете „<xliff:g id="EXIT_BUTTON">%s</xliff:g>“."</string>
<string name="exit_button" msgid="5829638404777671253">"Назад"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Затваряне"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Назад"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"четене на диагностични данни"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Четене на диагностични данни от автомобила."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"изчистване на диагностичните данни"</string>
diff --git a/service/res/values-bn/strings.xml b/service/res/values-bn/strings.xml
index afa6761..2e6dc9f 100644
--- a/service/res/values-bn/strings.xml
+++ b/service/res/values-bn/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ইনপুট ইভেন্ট হ্যান্ডেল করা"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN বাস কাজ করছে না"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN বাস কাজ করছে না। হেডইউনিট বক্স খুলে নিয়ে আবার লাগান ও গাড়ি রিস্টার্ট করুন"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"আপনার সুরক্ষার জন্য, ড্রাইভ করার সময় এটি করা যাবে না।\nচালিয়ে যেতে, গাড়ি পার্ক করা পর্যন্ত অপেক্ষা করুন।"</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"ড্রাইভ করার সময় আপনি এই ফিচারটি ব্যবহার করতে পারবেন না"</string>
<string name="exit_button_message" msgid="8554690915924055685">"অ্যাপের সুরক্ষিত ফিচারগুলি নিয়ে আবার শুরু করতে, <xliff:g id="EXIT_BUTTON">%s</xliff:g> বেছে নিন।"</string>
<string name="exit_button" msgid="5829638404777671253">"আবার চালু করুন"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"অ্যাপ বন্ধ করুন"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"ফিরুন"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"ডায়াগনস্টিক ডেটা দেখা"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"গাড়ির ডায়াগনস্টিক সংক্রান্ত ডেটা দেখা।"</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"ডায়াগনস্টিকস ডেটা সরানো"</string>
diff --git a/service/res/values-bs/strings.xml b/service/res/values-bs/strings.xml
index 46e6224..70e79eb 100644
--- a/service/res/values-bs/strings.xml
+++ b/service/res/values-bs/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Rukovati događajima unosa"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Greška CAN busa"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus ne reagira. Isključite i ponovo uključite glavnu jedinicu i ponovo pokrenite automobil"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Radi vaše sigurnosti, ova aktivnost nije dostupna tokom vožnje.\nDa nastavite, sačekajte da se zaustavite."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Nije moguće koristiti ovu funkciju tokom vožnje"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Da počnete ponovo s funkcijama sigurne aplikacije, odaberite <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Nazad"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Zatvori aplikaciju"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Nazad"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"očitati dijagnostičke podatke"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Očitati dijagnostičke podatke automobila."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"brisati dijagnostičke podatke"</string>
diff --git a/service/res/values-ca/strings.xml b/service/res/values-ca/strings.xml
index 7eb9205..c3a438f 100644
--- a/service/res/values-ca/strings.xml
+++ b/service/res/values-ca/strings.xml
@@ -24,8 +24,8 @@
<string name="car_permission_desc_energy" msgid="3392963810053235407">"Accedir a la informació sobre l\'energia del cotxe"</string>
<string name="car_permission_label_adjust_range_remaining" msgid="839033553999920138">"ajustar l\'autonomia restant del cotxe"</string>
<string name="car_permission_desc_adjust_range_remaining" msgid="2369321650437370673">"Ajustar el valor de l\'autonomia restant del cotxe."</string>
- <string name="car_permission_label_hvac" msgid="1499454192558727843">"accedeix al sistema HVAC del cotxe"</string>
- <string name="car_permission_desc_hvac" msgid="3754229695589774195">"Accedir al sistema HVAC del cotxe"</string>
+ <string name="car_permission_label_hvac" msgid="1499454192558727843">"accedir al sistema de calefacció, ventilació i aire condicionat del cotxe"</string>
+ <string name="car_permission_desc_hvac" msgid="3754229695589774195">"Accedir al sistema de calefacció, ventilació i aire condicionat del cotxe"</string>
<string name="car_permission_label_mileage" msgid="4661317074631150551">"accedeix a la informació sobre el quilometratge del cotxe"</string>
<string name="car_permission_desc_mileage" msgid="7179735693278681090">"Accedir a la informació sobre el quilometratge del cotxe"</string>
<string name="car_permission_label_speed" msgid="1149027717860529745">"llegeix la velocitat del cotxe"</string>
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Gestionar els esdeveniments d\'entrada"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Ha fallat el bus CAN"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"El bus CAN no respon. Desendolla i torna a endollar el capçal i torna a engegar el cotxe."</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Per motius de seguretat, aquesta activitat no està disponible mentre condueixes.\nPer continuar, has d\'estar aparcat."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"No pots fer servir aquesta funció mentre condueixes"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Per tornar a començar amb unes funcions d\'aplicació segures, selecciona <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Enrere"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Tanca l\'aplicació"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Enrere"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"llegeix les dades de diagnòstic"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Llegeix les dades de diagnòstic del cotxe."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"esborra les dades de diagnòstic"</string>
@@ -133,8 +135,8 @@
<string name="car_permission_desc_car_power" msgid="9202079903668652864">"Accedeix a l\'estat de la potència del cotxe."</string>
<string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Registra un dispositiu de confiança"</string>
<string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Permet el registre de dispositius de confiança"</string>
- <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Controla el mode de prova del cotxe"</string>
- <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Controla el mode de prova del cotxe"</string>
+ <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Controla el mode de proves del cotxe"</string>
+ <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Controla el mode de proves del cotxe"</string>
<string name="car_permission_label_control_car_features" msgid="3905791560378888286">"Activa o desactiva les funcions del cotxe"</string>
<string name="car_permission_desc_control_car_features" msgid="7646711104530599901">"Activa o desactiva les funcions del cotxe."</string>
<string name="car_permission_label_use_car_watchdog" msgid="6973938293170413475">"utilitza el temporitzador de vigilància del cotxe"</string>
diff --git a/service/res/values-cs/strings.xml b/service/res/values-cs/strings.xml
index cfaa375..a535ec1 100644
--- a/service/res/values-cs/strings.xml
+++ b/service/res/values-cs/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Zpracování vstupních událostí"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Sběrnice CAN selhala"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Sběrnice CAN neodpovídá. Odpojte a opět zapojte autorádio a znovu nastartujte auto"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Tato aktivita není při řízení z bezpečnostních důvodů dostupná.\nPokračovat můžete, až zaparkujete."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Tuto funkci nelze používat při řízení"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Chcete-li začít znovu s bezpečnými funkcemi aplikace, vyberte <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Zpět"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Zavřít aplikaci"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Zpět"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"čtení diagnostických dat"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Čtení diagnostických dat z auta."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"vymazat diagnostická data"</string>
diff --git a/service/res/values-da/strings.xml b/service/res/values-da/strings.xml
index b2c075f..946be5c 100644
--- a/service/res/values-da/strings.xml
+++ b/service/res/values-da/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Håndter input"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN-bus (Controller Area Network) mislykkedes"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-bus (Controller Area Network) svarer ikke. Afbryd forbindelsen til bilens hovedenhed, tilslut den igen, og genstart bilen"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Af hensyn til din sikkerhed kan du ikke få adgang til denne aktivitet, mens du kører.\nParkér, før du kan fortsætte."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Du kan ikke bruge denne funktion, mens du kører"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Vælg <xliff:g id="EXIT_BUTTON">%s</xliff:g> for at starte forfra med sikre appfunktioner."</string>
<string name="exit_button" msgid="5829638404777671253">"Tilbage"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Luk app"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Tilbage"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"tjekke diagnosticeringsdata"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Tjek diagnosticeringsdata fra bilen."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"rydde diagnosticeringsdata"</string>
diff --git a/service/res/values-de/strings.xml b/service/res/values-de/strings.xml
index b472961..13a4850 100644
--- a/service/res/values-de/strings.xml
+++ b/service/res/values-de/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Eingabe-Ereignisse verwalten"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN-Bus ausgefallen"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-Bus reagiert nicht. Trenne die Haupteinheit vom Stromnetz, schließe sie wieder an und starte das Auto."</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Aus Sicherheitsgründen ist diese Aktivität während der Fahrt nicht verfügbar.\nWarte, bis das Fahrzeug geparkt ist."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Du kannst diese Funktion nicht während der Fahrt nutzen"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Wähle <xliff:g id="EXIT_BUTTON">%s</xliff:g>, um die App mit sicheren Funktionen neu zu starten."</string>
<string name="exit_button" msgid="5829638404777671253">"Zurück"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"App schließen"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Zurück"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"Diagnosedaten zu lesen"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Diagnosedaten des Autos lesen."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"Diagnosedaten zu löschen"</string>
diff --git a/service/res/values-el/strings.xml b/service/res/values-el/strings.xml
index 7b75754..227f8a8 100644
--- a/service/res/values-el/strings.xml
+++ b/service/res/values-el/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Χειρισμός συμβάντων εισόδου"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Αποτυχία διαύλου CAN"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Ο δίαυλος CAN δεν αποκρίνεται. Αποσυνδέστε και συνδέστε ξανά το πλαίσιο μονάδας κεφαλής και έπειτα επανεκκινήστε το αυτοκίνητο"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Για λόγους ασφαλείας, η δραστηρ. δεν είναι διαθέσιμη όταν οδηγείτε.\nΓια να συνεχίσετε, περιμένετε μέχρι να σταθμεύσετε."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Δεν μπορείτε να χρησιμοποιείτε αυτήν τη λειτουργία όταν οδηγείτε."</string>
<string name="exit_button_message" msgid="8554690915924055685">"Για να ξεκινήσετε από την αρχή με ασφαλείς λειτουργίες εφαρμογής, επιλέξτε <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Πίσω"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Κλείσιμο εφαρμογής"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Πίσω"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"παρακολούθηση δεδομένων διαγνωστικών στοιχείων"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Παρακολούθηση δεδομένων διαγνωστικών στοιχείων από το αυτοκίνητο."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"διαγραφή δεδομένων διαγνωστικών στοιχείων"</string>
diff --git a/service/res/values-en-rAU/strings.xml b/service/res/values-en-rAU/strings.xml
index 1d723ed..f28ee08 100644
--- a/service/res/values-en-rAU/strings.xml
+++ b/service/res/values-en-rAU/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Handle input events"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN bus failed"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus does not respond. Unplug and plug back in head unit box and restart the car"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"For your safety, this activity isn’t available while driving.\nTo continue, wait until you’ve parked."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"You can’t use this feature while driving"</string>
<string name="exit_button_message" msgid="8554690915924055685">"To start again with safe app features, select <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Back"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Close app"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Back"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"read diagnostic data"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Read diagnostic data from the car."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"clear diagnostic data"</string>
diff --git a/service/res/values-en-rCA/strings.xml b/service/res/values-en-rCA/strings.xml
index 1d723ed..f28ee08 100644
--- a/service/res/values-en-rCA/strings.xml
+++ b/service/res/values-en-rCA/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Handle input events"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN bus failed"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus does not respond. Unplug and plug back in head unit box and restart the car"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"For your safety, this activity isn’t available while driving.\nTo continue, wait until you’ve parked."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"You can’t use this feature while driving"</string>
<string name="exit_button_message" msgid="8554690915924055685">"To start again with safe app features, select <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Back"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Close app"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Back"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"read diagnostic data"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Read diagnostic data from the car."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"clear diagnostic data"</string>
diff --git a/service/res/values-en-rGB/strings.xml b/service/res/values-en-rGB/strings.xml
index 1d723ed..f28ee08 100644
--- a/service/res/values-en-rGB/strings.xml
+++ b/service/res/values-en-rGB/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Handle input events"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN bus failed"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus does not respond. Unplug and plug back in head unit box and restart the car"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"For your safety, this activity isn’t available while driving.\nTo continue, wait until you’ve parked."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"You can’t use this feature while driving"</string>
<string name="exit_button_message" msgid="8554690915924055685">"To start again with safe app features, select <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Back"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Close app"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Back"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"read diagnostic data"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Read diagnostic data from the car."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"clear diagnostic data"</string>
diff --git a/service/res/values-en-rIN/strings.xml b/service/res/values-en-rIN/strings.xml
index 1d723ed..f28ee08 100644
--- a/service/res/values-en-rIN/strings.xml
+++ b/service/res/values-en-rIN/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Handle input events"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN bus failed"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus does not respond. Unplug and plug back in head unit box and restart the car"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"For your safety, this activity isn’t available while driving.\nTo continue, wait until you’ve parked."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"You can’t use this feature while driving"</string>
<string name="exit_button_message" msgid="8554690915924055685">"To start again with safe app features, select <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Back"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Close app"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Back"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"read diagnostic data"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Read diagnostic data from the car."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"clear diagnostic data"</string>
diff --git a/service/res/values-en-rXC/strings.xml b/service/res/values-en-rXC/strings.xml
index 61d5782..d7f4383 100644
--- a/service/res/values-en-rXC/strings.xml
+++ b/service/res/values-en-rXC/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Handle input events"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN bus failed"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus does not respond. Unplug and plug back headunit box and restart the car"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"For your safety, this activity isn’t available while driving.\nTo continue, wait until you’re parked."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"You can’t use this feature while driving"</string>
<string name="exit_button_message" msgid="8554690915924055685">"To start over with safe app features, select <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Back"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Close app"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Back"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"read diagnostic data"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Read diagnostic data from the car."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"clear diagnostic data"</string>
diff --git a/service/res/values-es-rUS/strings.xml b/service/res/values-es-rUS/strings.xml
index b2ccbc4..bd044a9 100644
--- a/service/res/values-es-rUS/strings.xml
+++ b/service/res/values-es-rUS/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Controlar eventos de entrada"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Error de bus CAN"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus no responde. Desconecta y vuelve a conectar la caja de la unidad central y enciende nuevamente el auto"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Por razones de seguridad, esta actividad no está disponible al conducir.\nPara continuar espera hasta que estaciones."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"No puedes usar esta función mientras conduces"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Para volver a comenzar con funciones de app seguras, selecciona <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Atrás"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Cerrar app"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Atrás"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"leer datos de diagnóstico"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Leer datos de diagnóstico del vehículo."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"borrar datos de diagnóstico"</string>
diff --git a/service/res/values-es/strings.xml b/service/res/values-es/strings.xml
index d1e35f7..7141245 100644
--- a/service/res/values-es/strings.xml
+++ b/service/res/values-es/strings.xml
@@ -16,8 +16,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label" msgid="741004755205554376">"acceder a la información del coche"</string>
- <string name="car_permission_desc" msgid="162499818870052725">"Acceder a la información del coche."</string>
+ <string name="car_permission_label" msgid="741004755205554376">"acceder a los datos del coche"</string>
+ <string name="car_permission_desc" msgid="162499818870052725">"Acceder a los datos del coche."</string>
<string name="car_permission_label_camera" msgid="3725702064841827180">"acceder a la cámara del coche"</string>
<string name="car_permission_desc_camera" msgid="917024932164501426">"Acceder a las cámaras del coche."</string>
<string name="car_permission_label_energy" msgid="7409144323527821558">"acceder a la información sobre el nivel de energía del coche"</string>
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Gestionar eventos de entrada"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Fallo de bus CAN"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"El bus CAN no responde. Desconecta el cabezal, conéctalo de nuevo y reinicia el coche"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Por tu seguridad, esta actividad no está disponible mientras conduces.\nPuedes continuar cuando hayas aparcado."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"No puedes utilizar esta función mientras conduces"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Para volver a empezar con funciones de aplicaciones seguras, selecciona <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Atrás"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Cerrar aplicación"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Atrás"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"consultar datos de diagnóstico"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Consultar los datos de diagnóstico del coche."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"borrar los datos de diagnóstico"</string>
diff --git a/service/res/values-et/strings.xml b/service/res/values-et/strings.xml
index 9d55afa..2d49acc 100644
--- a/service/res/values-et/strings.xml
+++ b/service/res/values-et/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Sisestussündmuste töötlemine"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN-siin ebaõnnestus"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-siin ei reageeri. Eemaldage autoraadio üksus ja pange see tagasi ning taaskäivitage auto"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Teie turvalisuse tõttu ei ole see toiming sõitmise ajal saadaval.\nJätkamiseks oodake, kuni olete parkinud."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Te ei saa seda funktsiooni sõidu ajal kasutada"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Uuesti alustamiseks turvaliste rakenduste funktsioonidega valige <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Tagasi"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Sule rakendus"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Tagasi"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"diagnostikaandmete lugemine"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Auto diagnostikaandmete lugemine."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"diagnostikaandmete kustutamine"</string>
diff --git a/service/res/values-eu/strings.xml b/service/res/values-eu/strings.xml
index 9074592..b73dcd4 100644
--- a/service/res/values-eu/strings.xml
+++ b/service/res/values-eu/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Kudeatu sarrerako gertaerak"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN autobusak huts egin du"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus-ak ez du erantzuten. Desentxufatu eta entxufatu berriro gailu nagusia eta berrabiarazi autoa."</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Zure segurtasuna bermatzeko, eginbide hau ezin da erabili gidatu bitartean.\nAurrera egiteko, itxaron autoa aparkatu arte."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Ezin duzu erabili eginbide hori gidatu bitartean"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Berriro hasi nahi baduzu aplikazioaren eginbide seguruekin, hautatu <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Atzera"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Itxi aplikazioa"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Atzera"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"irakurri diagnostiko-datuak"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Irakurri autoaren diagnostiko-datuak."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"garbitu diagnostiko-datuak"</string>
diff --git a/service/res/values-fa/strings.xml b/service/res/values-fa/strings.xml
index 7f95337..a464827 100644
--- a/service/res/values-fa/strings.xml
+++ b/service/res/values-fa/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"مدیریت رویدادهای ورودی"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"گذرگاه CAN ناموفق بود"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"گذرگاه CAN پاسخ نمیدهد. محفظه ضبطوپخش را جدا و سپس وصل کنید و خودرو را دوباره روشن کنید"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"بنا به دلایل ایمنی، این فعالیت درحین رانندگی دردسترس نیست.\n برای ادامه، تا زمان توقف خودرو صبر کنید."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"هنگام رانندگی نمیتوانید از این ویژگی استفاده کنید"</string>
<string name="exit_button_message" msgid="8554690915924055685">"برای شروع مجدد با ویژگیهای برنامه امن، <xliff:g id="EXIT_BUTTON">%s</xliff:g> را انتخاب کنید."</string>
<string name="exit_button" msgid="5829638404777671253">"برگشت"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"بستن برنامه"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"برگشت"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"خواندن دادههای عیبیابی"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"دادههای عیبیابی خودرو را بخوانید."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"پاک کردن دادههای عیبیابی"</string>
diff --git a/service/res/values-fi/strings.xml b/service/res/values-fi/strings.xml
index 4ab264a..7241b37 100644
--- a/service/res/values-fi/strings.xml
+++ b/service/res/values-fi/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"käsitellä syötteitä"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN-väylä hylättiin"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-väylä ei vastaa. Irrota pääyksikkö ja liitä se takaisin. Käynnistä auto sitten uudelleen."</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Turvallisuussyistä toiminto ei ole käytettävissä ajon aikana.\nVoit jatkaa, kun olet pysäköinyt auton."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Et voi käyttää ominaisuutta ajon aikana"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Jos haluat aloittaa alusta turvallisilla sovellusominaisuuksilla, valitse <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Takaisin"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Sulje sovellus"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Takaisin"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"nähdä diagnostiikkadataa"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"lukea auton diagnostiikkadataa"</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"poistaa diagnostiikkatiedot"</string>
diff --git a/service/res/values-fr-rCA/strings.xml b/service/res/values-fr-rCA/strings.xml
index de9fa03..bfccdd7 100644
--- a/service/res/values-fr-rCA/strings.xml
+++ b/service/res/values-fr-rCA/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label" msgid="741004755205554376">"accéder aux renseignements relatifs à la voiture"</string>
+ <string name="car_permission_label" msgid="741004755205554376">"Accéder aux renseignements relatifs à la voiture"</string>
<string name="car_permission_desc" msgid="162499818870052725">"Accéder aux renseignements relatifs à la voiture."</string>
<string name="car_permission_label_camera" msgid="3725702064841827180">"accéder à la caméra de la voiture"</string>
<string name="car_permission_desc_camera" msgid="917024932164501426">"Accéder aux caméras de la voiture."</string>
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Gérer les événements d\'entrée"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Défaillance du bus de données CAN"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Le bus de données CAN ne répond pas. Débranchez et rebranchez le boîtier de l\'unité centrale, puis redémarrez la voiture"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Pour votre sécurité, cette activité est bloquée lorsque vous conduisez.\nVous devez être stationné pour continuer."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Vous ne pouvez pas utiliser cette fonctionnalité en conduisant"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Pour recommencer avec des fonctionnalités d\'application sécurisées, sélectionnez <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Retour"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Fermer l\'application"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Retour"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"lire des données de diagnostic"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Lire des données de diagnostic à partir de la voiture."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"effacer les données de diagnostic"</string>
diff --git a/service/res/values-fr/strings.xml b/service/res/values-fr/strings.xml
index 5d68a8f..8e9f409 100644
--- a/service/res/values-fr/strings.xml
+++ b/service/res/values-fr/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Gérer les événements d\'entrée"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Échec du bus de données CAN"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Le bus de données CAN ne répond pas. Débranchez et rebranchez le boîtier de l\'unité principale, puis redémarrez la voiture"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Pour votre sécurité, cette activité n\'est pas disponible pendant la conduite.\nPour continuer, attendez d\'être garé."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Vous ne pouvez pas utiliser cette fonctionnalité en conduisant"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Pour recommencer avec des fonctionnalités d\'application sécurisées, sélectionnez <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Retour"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Fermer l\'application"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Retour"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"Lire les données de diagnostic"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Lire les données de diagnostic de la voiture."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"Effacer les données de diagnostic"</string>
diff --git a/service/res/values-gl/strings.xml b/service/res/values-gl/strings.xml
index a089221..1a52870 100644
--- a/service/res/values-gl/strings.xml
+++ b/service/res/values-gl/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Controlar os eventos de entrada"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Produciuse un erro no bus CAN"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"O bus CAN non responde. Desconecta a caixa da unidade principal, conéctaa de novo e reinicia o coche"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Pola túa seguranza, esta actividade non está dispoñible mentres conduces.\nPodes continuar cando aparques."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Non podes utilizar esta función mentres conduces"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Para comezar de novo coas funcións de aplicacións seguras, selecciona o botón <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Atrás"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Pechar aplicación"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Atrás"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"ler datos de diagnóstico"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Ler datos de diagnóstico do coche."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"borrar datos de diagnóstico"</string>
diff --git a/service/res/values-gu/strings.xml b/service/res/values-gu/strings.xml
index 468d41d..22207af 100644
--- a/service/res/values-gu/strings.xml
+++ b/service/res/values-gu/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ઇનપુટ ઇવેન્ટ્સને હૅન્ડલ કરો"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN બસ નિષ્ફળ રહી"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN બસ પ્રતિસાદ આપતી નથી. હેડયુનિટ બોક્સને અનપ્લગ કરી ફરી પ્લગ કરો અને કારને ફરી શરૂ કરો"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"તમારી સલામતી માટે કાર ચલાવતી વખતે આ પ્રવૃત્તિ ઉપલબ્ધ નથી.\nચાલુ રાખવા માટે કાર પાર્ક થવા સુધી રાહ જુઓ."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"ડ્રાઇવ કરતી વખતે તમે આ સુવિધાનો ઉપયોગ કરી શકતા નથી"</string>
<string name="exit_button_message" msgid="8554690915924055685">"સુરક્ષિત ઍપ્લિકેશન સુવિધાઓ સાથે ફરી શરૂ કરવા, <xliff:g id="EXIT_BUTTON">%s</xliff:g> પસંદ કરો."</string>
<string name="exit_button" msgid="5829638404777671253">"પાછળ"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"ઍપ બંધ કરો"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"પાછળ"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"નિદાનનો ડેટા વાંચો"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"કારમાંથી નિદાનનો ડેટા વાંચો."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"નિદાનનો ડેટા સાફ કરો"</string>
diff --git a/service/res/values-hi/strings.xml b/service/res/values-hi/strings.xml
index bd67d31..bf0cabf 100644
--- a/service/res/values-hi/strings.xml
+++ b/service/res/values-hi/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"इनपुट से जुड़े इवेंट प्रबंधित कर सकता है"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"\'CAN बस\' काम नहीं कर पा रहा है"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"\'CAN बस\' जवाब नहीं दे रहा है. हेडयूनिट बॉक्स का प्लग निकालकर वापस लगाएं और कार को रीस्टार्ट करें"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"आपकी सुरक्षा के लिए, गाड़ी चलाते समय यह गतिविधि मौजूद नहीं रहती है.\nजारी रखने के लिए गाड़ी पार्क करनी होगी."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"आप गाड़ी चलाते समय इस सुविधा का इस्तेमाल नहीं कर सकते"</string>
<string name="exit_button_message" msgid="8554690915924055685">"सुरक्षित ऐप्लिकेशन सुविधाएं फिर से शुरू करने के लिए, <xliff:g id="EXIT_BUTTON">%s</xliff:g> चुनें."</string>
<string name="exit_button" msgid="5829638404777671253">"वापस शुरू करें"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"ऐप्लिकेशन बंद करें"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"वापस जाएं"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"गड़बड़ी की पहचान का डेटा देख सकता है"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"कार की \'गड़बड़ी की पहचान का डेटा\' देख सकता है."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"गड़बड़ी की पहचान का डेटा मिटा सकता है"</string>
diff --git a/service/res/values-hr/strings.xml b/service/res/values-hr/strings.xml
index 011c217..ed3ce45 100644
--- a/service/res/values-hr/strings.xml
+++ b/service/res/values-hr/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"rukovati događajima unosa"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Pogreška CAN busa"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus ne odgovara. Iskopčajte i ponovo ukopčajte glavnu jedinicu i ponovo pokrenite automobil"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Radi vaše sigurnosti ta aktivnost nije dostupna tijekom vožnje.\nDa biste nastavili, pričekajte dok se ne zaustavite."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Tu značajku ne možete upotrebljavati tijekom vožnje"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Da biste započeli ponovo sa sigurnim značajkama aplikacije, odaberite <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Natrag"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Zatvori aplikaciju"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Natrag"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"čitati dijagnostičke podatke"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"čitati dijagnostičke podatke automobila"</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"izbrisati dijagnostičke podatke"</string>
diff --git a/service/res/values-hu/strings.xml b/service/res/values-hu/strings.xml
index 6326bd9..b75ac0a 100644
--- a/service/res/values-hu/strings.xml
+++ b/service/res/values-hu/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Kezelheti a beviteli eseményeket"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"A CAN-busz hibát észlelt"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"A CAN-busz nem válaszol. Csatlakoztassa újra a fejegységet, és indítsa újra az autót."</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Az Ön biztonsága érdekében ez a tevékenység nem végezhető vezetés közben.\nLeparkolás után folytathatja a tevékenységet."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Vezetés közben nem használhatja ezt a funkciót"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Ha biztonságos alkalmazásfunkciókkal szeretné újrakezdeni, válassza a következő gombot: <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Vissza"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Alkalmazás bezárása"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Vissza"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"olvashatja a diagnosztikai adatokat"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Olvashatja az autó diagnosztikai adatait."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"törölheti a diagnosztikai adatokat"</string>
diff --git a/service/res/values-hy/strings.xml b/service/res/values-hy/strings.xml
index ae977ac..6a19435 100644
--- a/service/res/values-hy/strings.xml
+++ b/service/res/values-hy/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Մշակել ներածման իրադարձությունները"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN անվադողի սխալ"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN անվադողը չի պատասխանում: Անջատեք և նորից միացրեք միակցիչը, ապա անջատեք վառոցքը և վերագործարկեք մեքենան:"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Անվտանգության նկատառումներով այս գործողությունը հասանելի չէ վարելու ռեժիմում:\nՇարունակելու համար կայանեք մեքենան:"</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Դուք չեք կարող օգտագործել այս գործառույթը մեքենա վարելիս"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Հավելվածն անվտանգ ռեժիմում վերագործարկելու համար սեղմեք<xliff:g id="EXIT_BUTTON">%s</xliff:g> կոճակը:"</string>
<string name="exit_button" msgid="5829638404777671253">"Հետ"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Փակել հավելվածը"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Հետ"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"կարդալ ախտորոշման մասին տվյալները"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Կարդալ մեքենայի ախտորոշման տվյալները։"</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"մաքրել ախտորոշման տվյալները"</string>
diff --git a/service/res/values-in/strings.xml b/service/res/values-in/strings.xml
index 32b2650..32fc872 100644
--- a/service/res/values-in/strings.xml
+++ b/service/res/values-in/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Menangani aktivitas masukan"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN bus gagal"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus tidak merespons. Cabut dan colokkan kembali boks headunit, lalu nyalakan ulang mobil"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Demi keamanan Anda, aktivitas ini tidak tersedia saat Anda mengemudi.\nUntuk melanjutkan, tunggu hingga mobil terparkir."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Anda tidak dapat menggunakan fitur ini saat mengemudi"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Untuk mulai dari awal dengan fitur apl yang aman, pilih <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Kembali"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Tutup aplikasi"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Kembali"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"membaca data diagnostik"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Membaca data diagnostik dari mobil."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"menghapus data diagnostik"</string>
diff --git a/service/res/values-is/strings.xml b/service/res/values-is/strings.xml
index 56a18dc..301152c 100644
--- a/service/res/values-is/strings.xml
+++ b/service/res/values-is/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Stjórna inntakstilvikum"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Bilun í CAN-gagnabraut"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-gagnabraut svarar ekki. Taktu stjórneiningarboxið úr sambandi, settu það aftur í samband og gangsettu bílinn aftur."</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Af öryggisástæðum er þessi aðgerð ekki í boði við akstur.\nLeggðu ökutækinu áður en þú heldur áfram."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Þú getur ekki notað þennan eiginleika við akstur"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Til að byrja aftur að setja upp örugga forritseiginleika skaltu velja <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Til baka"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Loka forriti"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Til baka"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"lesa greiningargögn"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Lesa greiningargögn úr bílnum."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"hreinsa greiningargögn"</string>
diff --git a/service/res/values-it/strings.xml b/service/res/values-it/strings.xml
index 4b807c0..af17f31 100644
--- a/service/res/values-it/strings.xml
+++ b/service/res/values-it/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Consente di gestire gli eventi di input."</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Comunicazione tramite bus CAN non riuscita"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Il bus CAN non risponde. Scollega e ricollega l\'unità principale e riaccendi il motore."</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Per motivi di sicurezza, questa attività non è disponibile durante la guida.\nPotrai continuare quando avrai parcheggiato."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Non è possibile usare questa funzionalità durante la guida"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Seleziona <xliff:g id="EXIT_BUTTON">%s</xliff:g> per ricominciare con le funzionalità sicure dell\'app."</string>
<string name="exit_button" msgid="5829638404777671253">"Indietro"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Chiudi app"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Indietro"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"Lettura dei dati diagnostici"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Consente di leggere i dati diagnostici dell\'automobile."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"Cancellazione dei dati diagnostici"</string>
diff --git a/service/res/values-iw/strings.xml b/service/res/values-iw/strings.xml
index 7315e75..b3a5977 100644
--- a/service/res/values-iw/strings.xml
+++ b/service/res/values-iw/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ניהול אירועי קלט"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"פרוטוקול CAN bus נכשל"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"פרוטוקול CAN bus לא מגיב. יש לנתק ולחבר שוב את מערכת הסטריאו ולהתניע מחדש את הרכב"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"מטעמי בטיחות, פעילות זו אינה זמינה בזמן נהיגה.\nכדי להמשיך, צריך להמתין עד לחניית הרכב."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"לא ניתן להשתמש בתכונה הזו בזמן נהיגה"</string>
<string name="exit_button_message" msgid="8554690915924055685">"כדי להפעיל מחדש את האפליקציה במצב בטוח, יש ללחוץ על <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"הקודם"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"סגירת האפליקציה"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"חזרה"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"קריאת נתוני אבחון"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"קריאת נתוני אבחון מהרכב."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"מחיקת נתוני האבחון"</string>
diff --git a/service/res/values-ja/strings.xml b/service/res/values-ja/strings.xml
index 8dfb2d9..281643b 100644
--- a/service/res/values-ja/strings.xml
+++ b/service/res/values-ja/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"入力イベントを処理します"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN バスでエラーが発生しました"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN バスが応答しません。ヘッドユニット ボックスのプラグを抜いて接続し直し、車を再始動してください"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"安全上の理由により、運転中はこのアクティビティをご利用いただけません。\n続行するには駐車してください。"</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"運転中はこの機能を利用できません"</string>
<string name="exit_button_message" msgid="8554690915924055685">"アプリをセーフモードで再起動するには、<xliff:g id="EXIT_BUTTON">%s</xliff:g> を選択します。"</string>
<string name="exit_button" msgid="5829638404777671253">"戻る"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"アプリを閉じる"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"戻る"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"診断データの読み取り"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"車から診断データを読み取ります。"</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"診断データの消去"</string>
diff --git a/service/res/values-ka/strings.xml b/service/res/values-ka/strings.xml
index 98995a5..b05b5da 100644
--- a/service/res/values-ka/strings.xml
+++ b/service/res/values-ka/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"შეტანის მოვლენების დამუშავება"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"წარმოიშვა CAN-სალტის შეცდომა"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-სალტე არ რეაგირებს. გამოაერთეთ და ხელახლა მიაერთეთ საინფორმაციო-გასართობი მოწყობილობა, შემდეგ კი ხელახლა დაქოქეთ მანქანა"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"ეს აქტივობა მიუწვდომელია მანქანის მართვისას, უსაფრთხოების მოსაზრებებიდან გამომდინარე.\nგთხოვთ, ჯერ გააჩეროთ მანქანა."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"მანქანის მართვისას ამ ფუნქციას ვერ გამოიყენებთ"</string>
<string name="exit_button_message" msgid="8554690915924055685">"აპის უსაფრთხო რეჟიმში გასაშვებად აირჩიეთ „<xliff:g id="EXIT_BUTTON">%s</xliff:g>“."</string>
<string name="exit_button" msgid="5829638404777671253">"უკან"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"აპის დახურვა"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"უკან"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"დიაგნოსტიკური მონაცემების წაკითხვა"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"დიაგნოსტიკური მონაცემების წაკითხვა მანქანიდან."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"დიაგნოსტიკური მონაცემების გასუფთავება"</string>
diff --git a/service/res/values-kk/strings.xml b/service/res/values-kk/strings.xml
index 077f44e..05dbe12 100644
--- a/service/res/values-kk/strings.xml
+++ b/service/res/values-kk/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Деректерді енгізу оқиғаларын басқаруға болады"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN шинасы істен шықты"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN шинасы жауап бермейді. Негізгі модульді ажыратып, қайта жалғаңыз және көлікті қайта оталдырыңыз"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Көлік жүргізгенде, қауіпсіздік мақсатында бұл әрекетті орындау мүмкін емес.\nЖалғастыру үшін көлікті тұраққа қойыңыз."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Бұл функцияны көлік жүргізген кезде пайдалана алмайсыз."</string>
<string name="exit_button_message" msgid="8554690915924055685">"Қолданбаны қауіпсіз күйде қайта іске қосу үшін <xliff:g id="EXIT_BUTTON">%s</xliff:g> түймесін басыңыз."</string>
<string name="exit_button" msgid="5829638404777671253">"Артқа"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Қолданбаны жабу"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Артқа"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"диагностикалық деректерді көру"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Көліктің диагностикалық деректерін көру."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"диагностикалық деректерді өшіру"</string>
diff --git a/service/res/values-km/strings.xml b/service/res/values-km/strings.xml
index 896ff3c..7a3083a 100644
--- a/service/res/values-km/strings.xml
+++ b/service/res/values-km/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"គ្រប់គ្រងព្រឹត្តិការណ៍បញ្ចូល"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"មិនអាចដំណើរការ CAN bus បានទេ"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus មិនឆ្លើយតបទេ។ សូមផ្ដាច់ រួចភ្ជាប់ប្រអប់ឧបករណ៍ចាក់តន្ត្រីម្តងទៀត បន្ទាប់មកបញ្ឆេះរថយន្តឡើងវិញ"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"ដើម្បីសុវត្ថិភាពរបស់អ្នក សកម្មភាពនេះមិនអាចប្រើបានទេ ពេលកំពុងបើកបរ។\nដើម្បីបន្ត សូមរង់ចាំរហូតទាល់តែអ្នកចតរថយន្តរួច។"</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"អ្នកមិនអាចប្រើមុខងារនេះបានទេ ខណៈពេលកំពុងបើកបរ"</string>
<string name="exit_button_message" msgid="8554690915924055685">"ដើម្បីចាប់ផ្តើមឡើងវិញដោយប្រើមុខងារកម្មវិធីដែលមានសុវត្ថិភាព សូមជ្រើសរើស <xliff:g id="EXIT_BUTTON">%s</xliff:g> ។"</string>
<string name="exit_button" msgid="5829638404777671253">"ថយក្រោយ"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"បិទកម្មវិធី"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"ថយក្រោយ"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"អានទិន្នន័យវិភាគ"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"អានអំពីទិន្នន័យវិភាគពីរថយន្ត។"</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"សម្អាតទិន្នន័យវិភាគ"</string>
diff --git a/service/res/values-kn/strings.xml b/service/res/values-kn/strings.xml
index 81b2f32..a261ea8 100644
--- a/service/res/values-kn/strings.xml
+++ b/service/res/values-kn/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ಊಡಿಕೆ ಘಟನೆಗಳನ್ನು ನಿಯಂತ್ರಿಸಿ"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"ಸಿಎಎನ್ ಬಸ್ ಕೆಟ್ಟಿದೆ"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN ಬಸ್ ಸ್ಪಂದಿಸುತ್ತಿಲ್ಲ. ಹೆಡ್ ಯುನಿಟ್ ಪೆಟ್ಟಿಗೆಯನ್ನು ಅನ್ಪ್ಲಗ್ ಮಾಡಿ ಮತ್ತೆ ಪ್ಲಗ್ ಮಾಡಿ ಕಾರನ್ನು ಪುನರಾರಂಭಿಸಿ"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"ನಿಮ್ಮ ಸುರಕ್ಷೆಗಾಗಿ, ಈ ಚಟುವಟಿಕೆಯು ವಾಹನ ಚಲಾಯಿಸುತ್ತಿರುವಾಗ ಲಭ್ಯವಿಲ್ಲ. ಮುಂದುವರೆಯಲು \n ಮಾಡಿ, ನೀವು ಪಾರ್ಕ್ ಮಾಡುವ ತನಕ ಕಾಯಿರಿ."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"ಡ್ರೈವ್ ಮಾಡುವಾಗ ನೀವು ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಬಳಸಲಾಗುವುದಿಲ್ಲ"</string>
<string name="exit_button_message" msgid="8554690915924055685">"ಆಪ್ನ ಸುರಕ್ಷೆ ಗುಣಲಕ್ಷಣಗಳನ್ನು ಒಳಗೊಂಡು ಮತ್ತೆ ಪ್ರಾರಂಭಿಸಲು, <xliff:g id="EXIT_BUTTON">%s</xliff:g> ಆಯ್ಕೆ ಮಾಡಿ."</string>
<string name="exit_button" msgid="5829638404777671253">"ಹಿಂದಕ್ಕೆ"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"ಆ್ಯಪ್ ಮುಚ್ಚಿರಿ"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"ಹಿಂದೆ"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"ಡಯಾಗ್ನೋಸ್ಟಿಕ್ ಡೇಟಾವನ್ನು ಓದಿ"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"ಕಾರಿನಲ್ಲಿರುವ ಅದರ ಡಯಾಗ್ನೋಸ್ಟಿಕ್ ಡೇಟಾವನ್ನು ಓದಿ."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"ಡಯಾಗ್ನೋಸ್ಟಿಕ್ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಿ"</string>
diff --git a/service/res/values-ko/strings.xml b/service/res/values-ko/strings.xml
index f334829..e9de7ee 100644
--- a/service/res/values-ko/strings.xml
+++ b/service/res/values-ko/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"입력 이벤트 처리"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN 버스 실패"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN 버스가 응답하지 않습니다. 헤드유닛 박스를 분리한 후 다시 연결한 다음 시동을 다시 걸어 보세요."</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"안전을 위해 운전 중에는 이용할 수 없는 활동입니다.\n계속하려면 먼저 주차하세요."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"운전 중에는 이 기능을 사용하실 수 없습니다."</string>
<string name="exit_button_message" msgid="8554690915924055685">"안전한 앱 기능으로 다시 시작하려면 <xliff:g id="EXIT_BUTTON">%s</xliff:g>을(를) 선택하세요."</string>
<string name="exit_button" msgid="5829638404777671253">"뒤로"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"앱 닫기"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"뒤로"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"진단 데이터 읽기"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"차량의 진단 데이터를 읽습니다."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"진단 데이터 삭제"</string>
diff --git a/service/res/values-ky/strings.xml b/service/res/values-ky/strings.xml
index f0ec715..98313b0 100644
--- a/service/res/values-ky/strings.xml
+++ b/service/res/values-ky/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Киргизүү аракеттерин башкаруу"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN иштебей калды"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN жооп бербей жатат. Башкы шайман блогун сууруп, кайра сайгандан кийин унааны кайра жүргүзүңүз"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Коопсуздугуңузду коргоо максатында, бул иш-аракетти унаа айдап баратканда аткарууга болбойт.\nТоктоп туруп, улантыңыз."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Бул функцияны унаа айдап баратканда колдоно албайсыз"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Колдонмонун коопсуз функцияларын иштетүү үчүн <xliff:g id="EXIT_BUTTON">%s</xliff:g> баскычын басыңыз."</string>
<string name="exit_button" msgid="5829638404777671253">"Артка"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Колдонмону жабуу"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Артка"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"мүчүлүштүктөрдү аныктоо дайындарын окуу"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Унаадагы мүчүлүштүктөрдү аныктоо дайындарын окуу."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"мүчүлүштүктөрдү аныктоо дайындарын тазалоо"</string>
diff --git a/service/res/values-lo/strings.xml b/service/res/values-lo/strings.xml
index e7ebb33..8af6807 100644
--- a/service/res/values-lo/strings.xml
+++ b/service/res/values-lo/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ຈັດການເຫດການປ້ອນຂໍ້ມູນ"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN bus ບໍ່ສຳເລັດ"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus ບໍ່ຕອບສະໜອງ. ຖອດປລັກກ່ອງເຄື່ອງຫຼິ້ນວິທະຍຸ (Headunit) ແລ້ວສຽບເຂົ້າຄືນໃໝ່ ແລະ ຣິສະຕາດລົດ"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"ເພື່ອຄວາມປອດໄພຂອງທ່ານ, ກິດຈະກຳນີ້ບໍ່ມີໃຫ້ນໍາໃຊ້ໃນຂະນະທີ່ທ່ານກຳລັງຂັບລົດຢູ່. \nເພື່ອສືບຕໍ່, ກະລຸນາລໍຖ້າຈົນກວ່າວ່າທ່ານຈອດລົດ."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"ທ່ານບໍ່ສາມາດໃຊ້ຄຸນສົມບັດນີ້ໃນຂະນະທີ່ຂັບລົດໄດ້"</string>
<string name="exit_button_message" msgid="8554690915924055685">"ເພື່ອເລີ່ມຕົ້ນຄືນໃໝ່ດ້ວຍຄຸນສົມບັດແອັບທີ່ປອດໄພ, ກະລຸນາເລືອກ <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"ກັບຄືນ"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"ປິດແອັບ"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"ກັບຄືນ"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"ອ່ານຂໍ້ມູນການວິເຄາະ"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"ອ່ານຂໍ້ມູນການວິເຄາະຈາກລົດ."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"ລຶບລ້າງຂໍ້ມູນການວິເຄາະ"</string>
diff --git a/service/res/values-lt/strings.xml b/service/res/values-lt/strings.xml
index 7dac0d2..98d7435 100644
--- a/service/res/values-lt/strings.xml
+++ b/service/res/values-lt/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Apdoroti įvesties įvykius."</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN BUS klaida"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN BUS nereaguoja. Atjunkite ir vėl prijunkite pagrindinio įtaiso dėžutę."</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Siekiant užtikrinti jūsų saugą, ši veikla nepasiekiama vairuojant.\nJei norite tęsti, palaukite, kol sustosite."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Negalite naudoti šios funkcijos vairuodami"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Jei norite pradėti iš naujo naudodami saugias programos funkcijas, pasirinkite <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Atgal"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Uždaryti programą"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Atgal"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"nuskaityti diagnostikos duomenis"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Nuskaityti automobilio diagnostikos duomenis."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"išvalyti diagnostikos duomenis"</string>
diff --git a/service/res/values-lv/strings.xml b/service/res/values-lv/strings.xml
index e3a8330..fa1430d 100644
--- a/service/res/values-lv/strings.xml
+++ b/service/res/values-lv/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Apstrādāt ievades notikumus."</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Radās atteice datu maģistrālē"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Datu maģistrāle nereaģē. Atvienojiet un atkal pievienojiet stereosistēmas paneļa kabeli un atkārtoti iedarbiniet automašīnu"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Drošības apsvērumu dēļ šī darbība nav pieejama braukšanas laikā.\nTurpiniet, kad automašīna būs novietota stāvēšanai."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Jūs nevarat izmantot šo funkciju braukšanas laikā."</string>
<string name="exit_button_message" msgid="8554690915924055685">"Lai atsāktu darbu ar drošām lietotnes funkcijām, atlasiet pogu <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Atpakaļ"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Aizvērt lietotni"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Atpakaļ"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"nolasīt diagnostikas datus"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Nolasīt diagnostikas datus no automašīnas."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"notīrīt diagnostikas datus"</string>
diff --git a/service/res/values-mk/strings.xml b/service/res/values-mk/strings.xml
index 63d0282..94078d1 100644
--- a/service/res/values-mk/strings.xml
+++ b/service/res/values-mk/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Ракува со влезните настани"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN-магистралата не успеа"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-магистралата не реагира. Откачете ја и повторно прикачете ја кутијата на главната единица и рестартирајте го автомобилот"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"За ваша безбедност, оваа активност не е достапна додека возите.\nЗа да продолжите, почекајте да се паркирате."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Не може да ја користите функцијава додека возите"</string>
<string name="exit_button_message" msgid="8554690915924055685">"За да започнете одново со безбедносните фунции на апликацијата, изберете <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Назад"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Затвори апликација"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Назад"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"ги чита дијагностичките податоци"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Чита дијагностички податоци од автомобилот."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"чисти дијагностички податоци"</string>
diff --git a/service/res/values-ml/strings.xml b/service/res/values-ml/strings.xml
index 5646ef2..b70e2df 100644
--- a/service/res/values-ml/strings.xml
+++ b/service/res/values-ml/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ഇൻപുട്ട് ഇവന്റുകൾ കൈകാര്യം ചെയ്യുക"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN ബസ് പരാജയപ്പെട്ടു"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN ബസ് പ്രതികരിക്കുന്നില്ല. ഹെഡ്യൂണിറ്റ് ബോക്സ്, അൺപ്ലഗ് ചെയ്ത്, വീണ്ടും പ്ലഗ് ചെയ്ത്, കാർ റീസ്റ്റാർട്ട് ചെയ്യുക"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"നിങ്ങളുടെ സുരക്ഷയ്ക്ക്, ഡ്രൈവ് ചെയ്യുമ്പോൾ ഈ ആക്റ്റിവിറ്റി ലഭ്യമല്ല.\nതുടരാൻ, നിങ്ങൾ പാർക്ക് ചെയ്യുന്നതുവരെ കാത്തിരിക്കുക."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"ഡ്രെെവ് ചെയ്യുമ്പോൾ നിങ്ങൾ ഈ ഫീച്ചർ ഉപയോഗിക്കരുത്"</string>
<string name="exit_button_message" msgid="8554690915924055685">"സുരക്ഷിതമായ ആപ്പ് ഫീച്ചറുകൾ ഉപയോഗിച്ച് പുനരാരംഭിക്കാൻ, <xliff:g id="EXIT_BUTTON">%s</xliff:g> തിരഞ്ഞെടുക്കുക."</string>
<string name="exit_button" msgid="5829638404777671253">"മടങ്ങുക"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"ആപ്പ് അടയ്ക്കുക"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"മടങ്ങുക"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"പ്രശ്നനിർണ്ണയ ഡാറ്റ വായിക്കുക"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"കാറിൽ നിന്നുള്ള പ്രശ്നനിർണ്ണയ ഡാറ്റ വായിക്കുക."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"പ്രശ്നനിർണ്ണയ ഡാറ്റ മായ്ക്കുക"</string>
diff --git a/service/res/values-mn/strings.xml b/service/res/values-mn/strings.xml
index 8028cab..f0e6b24 100644
--- a/service/res/values-mn/strings.xml
+++ b/service/res/values-mn/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Оролтын арга хэмжээг боловсруулах"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN bus амжилтгүй болсон"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus хариу өгөхгүй байна. Хөгжим тоглуулагчийн хайрцгийг салгаад, дахин залгаж, машиныг дахин эхлүүлнэ үү"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Таны аюулгүй байдлын үүднээс жолоодох явцад энэ үйл ажиллагааг хийх боломжгүй.\nМашинаа зогсоолд байршуулаад үргэлжлүүлнэ үү."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Та энэ онцлогийг жолоо барьж байхдаа ашиглах боломжгүй"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Аппын аюулгүй онцлогуудтайгаар дахин эхлүүлэхийн тулд <xliff:g id="EXIT_BUTTON">%s</xliff:g>-г сонгоно уу."</string>
<string name="exit_button" msgid="5829638404777671253">"Буцах"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Аппыг хаах"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Буцах"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"оношилгооны өгөгдлийг унших"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Машины оношилгооны өгөгдлийг унших."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"оношилгооны өгөгдлийг устгах"</string>
diff --git a/service/res/values-mr/strings.xml b/service/res/values-mr/strings.xml
index f929253..8c0c633 100644
--- a/service/res/values-mr/strings.xml
+++ b/service/res/values-mr/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"इनपुट इव्हेंट हाताळा"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN बस अयशस्वी"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN बस प्रतिसाद देत नाही. हेडयुनिट बॉक्स अनप्लग करून पुन्हा प्लग करा आणि कार रीस्टार्ट करा"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"तुमच्या सुरक्षेसाठी, ड्रायव्हिंग करत असताना ही अॅक्टिव्हिटी उपलब्ध नाही.\nसुरू ठेवण्यासाठी, पार्क करेपर्यंत वाट पहा."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"तुम्ही ड्राइव्ह करताना हे वैशिष्ट्य वापरू शकत नाही"</string>
<string name="exit_button_message" msgid="8554690915924055685">"सुरक्षित अॅप वैशिष्ट्यांसोबत पुन्हा सुरुवात करण्यासाठी, <xliff:g id="EXIT_BUTTON">%s</xliff:g> निवडा."</string>
<string name="exit_button" msgid="5829638404777671253">"मागे जा"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"अॅप बंद करा"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"मागे जा"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"निदान डेटा वाचा"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"कारचा निदान डेटा वाचा."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"निदान डेटा साफ करा"</string>
diff --git a/service/res/values-ms/strings.xml b/service/res/values-ms/strings.xml
index 473e42b..11279c0 100644
--- a/service/res/values-ms/strings.xml
+++ b/service/res/values-ms/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Kendalikan peristiwa input"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Bas CAN gagal"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Bas CAN tidak bertindak balas. Cabut dan palamkan kembali kotak unit stereo dan mulakan semula kereta"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Untuk keselamatan anda, aktiviti ini tidak tersedia semasa memandu.\nUntuk meneruskan, tunggu kereta diberhentikan."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Anda tidak boleh menggunakan ciri ini semasa memandu"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Untuk bermula semula dengan ciri apl selamat, pilih <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Kembali"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Tutup apl"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Kembali"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"baca data diagnostik"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Baca data diagnostik daripada kereta."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"kosongkan data diagnostik"</string>
diff --git a/service/res/values-my/strings.xml b/service/res/values-my/strings.xml
index d781575..36a0bb7 100644
--- a/service/res/values-my/strings.xml
+++ b/service/res/values-my/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"အချက်အလက်ထည့်သွင်းခြင်း အစီအစဉ်များကို စီမံပါမည်"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"\"CAN bus\" စနစ် အသုံးပြုမှု မအောင်မြင်ပါ"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus စနစ်က တုန့်ပြန်မှုမရှိပါ။ စက်အထိုင်ဘောက်စ်ကို ပလတ်ဖြုတ်ပြီး ပြန်တပ်ကာ ကားကို ပြန်လည်စတင်ပါ"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"သင့် လုံခြုံမှုအတွက် ဤလုပ်ဆောင်ချက်ကို ကားမောင်းနေစဉ် အသုံးမပြုနိုင်ပါ။\nဆက်လက်လုပ်ဆောင်ရန် ကားရပ်နားသည်အထိစောင့်ပါ။"</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"ကားမောင်းနေစဉ် ဤဝန်ဆောင်မှုကို သုံး၍မရပါ"</string>
<string name="exit_button_message" msgid="8554690915924055685">"စိတ်ချရသော အက်ပ်လုပ်ဆောင်ချက်များနှင့်အတူ အစမှပြန်စရန် <xliff:g id="EXIT_BUTTON">%s</xliff:g> ကို ရွေးချယ်ပါ။"</string>
<string name="exit_button" msgid="5829638404777671253">"နောက်သို့"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"အက်ပ်ကိုပိတ်ရန်"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"နောက်သို့"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"အမှားရှာပြင်ခြင်းဒေတာများကို ကြည့်ပါမည်"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"ကားအတွင်း အမှားရှာပြင်ခြင်းဒေတာကို ကြည့်ပါမည်။"</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"အမှားရှာပြင်ခြင်းဒေတာများကို ရှင်းလင်းပါမည်"</string>
diff --git a/service/res/values-nb/strings.xml b/service/res/values-nb/strings.xml
index 7957d0f..74cdb7f 100644
--- a/service/res/values-nb/strings.xml
+++ b/service/res/values-nb/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Behandling av inndatahendelser"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN-bus mislyktes"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-bus svarer ikke. Koble bilens hovedenhet ut og inn igjen, og start bilen på nytt"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Av sikkerhetshensyn er denne aktiviteten utilgjengelig når du kjører.\nDu kan ikke fortsette før du stopper bilen."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Du kan ikke bruke denne funksjonen når du kjører"</string>
<string name="exit_button_message" msgid="8554690915924055685">"For å starte på nytt med sikre appfunksjoner, velg <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Tilbake"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Lukk appen"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Tilbake"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"lese diagnostikkdata"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Les diagnostikkdata fra bilen."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"slette diagnostikkdata"</string>
diff --git a/service/res/values-ne/strings.xml b/service/res/values-ne/strings.xml
index 57bec9b..f4e2f4a 100644
--- a/service/res/values-ne/strings.xml
+++ b/service/res/values-ne/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"इनपुट गरिएका कार्यक्रमहरू व्यवस्थापन गर्ने"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN bus असफल भयो"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus ले प्रतिक्रिया जनाएन। हेडयुनिट बाकसलाई प्लगबाट निकालेर फेरि प्लगमा घुसाउनुहोस् र कार पुनःसुरु गर्नुहोस्"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"तपाईंको सुरक्षाका लागि, तपाईंले सवारी साधन चलाइरहेका बेलामा यो क्रियाकलाप उपलब्ध हुँदैन।\nजारी राख्न, पार्क नगरुन्जेल पर्खनुहोस्।"</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"तपाईं सवारी साधन चलाइरहेका बेला यो सुविधा प्रयोग गर्न सक्नुहुन्न"</string>
<string name="exit_button_message" msgid="8554690915924055685">"अनुप्रयोगका सुरक्षित सुविधाहरूको प्रयोग गरी फेरि सुरु गर्न <xliff:g id="EXIT_BUTTON">%s</xliff:g> चयन गर्नुहोस्।"</string>
<string name="exit_button" msgid="5829638404777671253">"पछाडि"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"अनुप्रयोग बन्द गर्नुहोस्"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"पछाडि"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"निदानसम्बन्धी डेटा पढ्ने"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"कारको निदानसम्बन्धी डेटा पढ्ने।"</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"निदानसम्बन्धी डेटा हटाउने"</string>
diff --git a/service/res/values-night/colors.xml b/service/res/values-night/colors.xml
index 6f30b68..108de11 100644
--- a/service/res/values-night/colors.xml
+++ b/service/res/values-night/colors.xml
@@ -18,8 +18,7 @@
-->
<resources>
<!-- Semi-transparent background color of blocking activity. -->
- <!-- In Call background scrim: black -->
- <color name="activity_blocking_activity_background">@android:color/black</color>
+ <color name="activity_blocking_activity_background">#c7000000</color>
<!-- Color of text in blocking activity. -->
<color name="blocking_text">#fff5f5f5</color>
diff --git a/service/res/values-nl/strings.xml b/service/res/values-nl/strings.xml
index 5d084df..bb53a1b 100644
--- a/service/res/values-nl/strings.xml
+++ b/service/res/values-nl/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label" msgid="741004755205554376">"toegang tot gegevens van auto"</string>
+ <string name="car_permission_label" msgid="741004755205554376">"Toegang tot gegevens van auto"</string>
<string name="car_permission_desc" msgid="162499818870052725">"toegang krijgen tot je autogegevens."</string>
<string name="car_permission_label_camera" msgid="3725702064841827180">"toegang tot camera van auto"</string>
<string name="car_permission_desc_camera" msgid="917024932164501426">"Toegang tot de camera(\'s) van je auto."</string>
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Invoergebeurtenissen verwerken"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN-bus is mislukt"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-bus reageert niet. Koppel de hoofdeenheid los en sluit deze vervolgens weer aan. Start de auto daarna opnieuw."</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Voor jouw veiligheid is deze activiteit niet beschikbaar als je aan het rijden bent.\nJe moet parkeren om door te gaan."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Je kunt deze functie niet gebruiken tijdens het rijden"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Selecteer <xliff:g id="EXIT_BUTTON">%s</xliff:g> om opnieuw te beginnen met de veilige app-functies."</string>
<string name="exit_button" msgid="5829638404777671253">"Vorige"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"App sluiten"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Terug"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"diagnostische gegevens lezen"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Diagnostische gegevens van auto lezen."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"diagnostische gegevens wissen"</string>
diff --git a/service/res/values-or/strings.xml b/service/res/values-or/strings.xml
index a671892..0b73cd0 100644
--- a/service/res/values-or/strings.xml
+++ b/service/res/values-or/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ଇନ୍ପୁଟ୍ ଇଭେଣ୍ଟଗୁଡ଼ିକ ପରିଚାଳନା କରିପାରେ"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN ବସ୍ ବିଫଳ ହେଲା"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN ବସ୍ ପ୍ରତିକ୍ରିୟା ଦେଉନାହିଁ। ହେଡୟୁନିଟ୍ ବାକ୍ସର ପ୍ଲଗ୍ କାଢ଼ି ପୁଣି ଲଗାନ୍ତୁ ଏବଂ କାର୍କୁ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"ଆପଣଙ୍କ ସୁରକ୍ଷା ପାଇଁ, ଡ୍ରାଇଭିଂ କରିବା ସମୟରେ ଏହି ଗତିବିଧି ଉପଲବ୍ଧ ନାହିଁ।\nଜାରି ରଖିବା ପାଇଁ, ପାର୍କ କରିବା ପର୍ଯ୍ୟନ୍ତ ଅପେକ୍ଷା କରନ୍ତୁ।"</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"ଆପଣ ଡ୍ରାଇଭ୍ କରିବା ସମୟରେ ଏହି ଫିଚର୍ ବ୍ୟବହାର କରିପାରିବେ ନାହିଁ"</string>
<string name="exit_button_message" msgid="8554690915924055685">"ସୁରକ୍ଷିତ ଆପ୍ ବୈଶିଷ୍ଟ୍ୟଗୁଡ଼ିକୁ ନେଇ ପୁଣି ଆରମ୍ଭ କରିବା ପାଇଁ, <xliff:g id="EXIT_BUTTON">%s</xliff:g> ଚୟନ କରନ୍ତୁ।"</string>
<string name="exit_button" msgid="5829638404777671253">"ପଛକୁ ଫେରନ୍ତୁ"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"ଆପ୍ ବନ୍ଦ କରନ୍ତୁ"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"ପଛକୁ ଫେରନ୍ତୁ"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"ଡାଏଗ୍ନୋଷ୍ଟିକ୍ ଡାଟାକୁ ପଢ଼ିବ"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"କାର୍ ମଧ୍ୟରୁ ଡାଏଗ୍ନୋଷ୍ଟିକ୍ ଡାଟାକୁ ପଢ଼ିବ।"</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"ଡାଏଗ୍ନୋଷ୍ଟିକ୍ ଡାଟା ଖାଲି କରନ୍ତୁ"</string>
diff --git a/service/res/values-pa/strings.xml b/service/res/values-pa/strings.xml
index f4dee5d..56f311c 100644
--- a/service/res/values-pa/strings.xml
+++ b/service/res/values-pa/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ਇਨਪੁੱਟ ਇਵੈਂਟਾਂ ਦੀ ਸੰਭਾਲ"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN ਬੱਸ ਅਸਫਲ ਰਹੀ"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN ਬੱਸ ਕੰਮ ਨਹੀਂ ਕਰਦੀ। ਹੈੱਡ ਯੂਨਿਟ ਬਾਕਸ ਨੂੰ ਅਨਪਲੱਗ ਕਰੋ ਅਤੇ ਦੁਬਾਰਾ ਪਲੱਗ ਲਗਾ ਕੇ ਕਾਰ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰੋ"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"ਤੁਹਾਡੀ ਸੁਰੱਖਿਆ ਲਈ, ਗੱਡੀ ਚਲਾਉਣ ਵੇਲੇ ਇਹ ਸਰਗਰਮੀ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।\nਜਾਰੀ ਰੱਖਣ ਲਈ, ਗੱਡੀ ਰੋਕਣ ਤੱਕ ਉਡੀਕ ਕਰੋ।"</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"ਤੁਸੀਂ ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਗੱਡੀ ਚਲਾਉਂਦੇ ਸਮੇਂ ਨਹੀਂ ਵਰਤ ਸਕਦੇ"</string>
<string name="exit_button_message" msgid="8554690915924055685">"ਸੁਰੱਖਿਅਤ ਐਪ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨਾਲ ਮੁੜ ਤੋਂ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, <xliff:g id="EXIT_BUTTON">%s</xliff:g> ਚੁਣੋ।"</string>
<string name="exit_button" msgid="5829638404777671253">"ਪਿੱਛੇ"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"ਐਪ ਬੰਦ ਕਰੋ"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"ਪਿੱਛੇ"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"ਤਸ਼ਖੀਸੀ ਡਾਟੇ ਨੂੰ ਪੜ੍ਹਨਾ"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"ਕਾਰ ਦਾ ਤਸ਼ਖੀਸੀ ਡਾਟਾ ਪੜ੍ਹਨਾ।"</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"ਤਸ਼ਖੀਸੀ ਡਾਟਾ ਕਲੀਅਰ ਕਰਨਾ"</string>
diff --git a/service/res/values-pl/strings.xml b/service/res/values-pl/strings.xml
index 0c21c9b..f9ed848 100644
--- a/service/res/values-pl/strings.xml
+++ b/service/res/values-pl/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Obsługa zdarzeń wprowadzania danych"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Błąd magistrali CAN"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Magistrala CAN nie odpowiada. Odłącz i jeszcze raz podłącz moduł główny i ponownie uruchom samochód."</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Dla Twojego bezpieczeństwa ta funkcja jest wyłączona podczas jazdy.\nAby jej użyć, zaparkuj samochód."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Podczas jazdy nie można korzystać z tej funkcji"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Aby jeszcze raz przejść do funkcji bezpieczeństwa w aplikacji, wybierz <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Wstecz"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Zamknij aplikację"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Wstecz"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"odczytywanie danych diagnostycznych"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Odczytywanie danych diagnostycznych samochodu."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"czyszczenie danych diagnostycznych"</string>
diff --git a/service/res/values-pt-rPT/strings.xml b/service/res/values-pt-rPT/strings.xml
index 43f9521..49a93a8 100644
--- a/service/res/values-pt-rPT/strings.xml
+++ b/service/res/values-pt-rPT/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Processe eventos de entrada."</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Falha no CAN bus."</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"O CAN bus não responde. Desligue e volte a ligar a caixa da unidade principal e reinicie o automóvel."</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Para sua segurança, esta atividade não está disponível enquanto estiver a conduzir.\nPode continuar após estacionar."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Não pode utilizar esta funcionalidade enquanto conduz."</string>
<string name="exit_button_message" msgid="8554690915924055685">"Para começar de novo com funcionalidades de aplicações seguras, selecione <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Anterior"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Fechar app"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Anterior"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"ler os dados de diagnóstico"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Ler os dados de diagnóstico do automóvel."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"limpar os dados de diagnóstico"</string>
diff --git a/service/res/values-pt/strings.xml b/service/res/values-pt/strings.xml
index fa23098..5b05346 100644
--- a/service/res/values-pt/strings.xml
+++ b/service/res/values-pt/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Gerenciar eventos de entrada"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Falha no barramento CAN"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"O barramento CAN parou de responder. Desconecte e conecte novamente a caixa da unidade principal, depois ligue o carro"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Para sua segurança, essa atividade não está disponível enquanto você dirige.\nPara continuar, aguarde até estacionar."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Não é possível usar esse recurso enquanto você dirige"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Para reiniciar o app com recursos de segurança, selecione <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Voltar"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Fechar app"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Voltar"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"ler dados de diagnóstico"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Ler dados de diagnóstico do carro."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"limpar dados de diagnóstico"</string>
diff --git a/service/res/values-ro/strings.xml b/service/res/values-ro/strings.xml
index 0b52ec8..b5d9fd0 100644
--- a/service/res/values-ro/strings.xml
+++ b/service/res/values-ro/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Gestionează evenimentele de intrare"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Magistrala CAN nu a reușit"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Magistrala CAN nu răspunde. Deconectați și reconectați unitatea radio, apoi reporniți mașina"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Pentru siguranța dvs., activitatea nu este disponibilă în timp ce conduceți.\nCa să continuați, așteptați să parcați."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Nu puteți folosi această funcție în timp ce conduceți"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Pentru a începe din nou cu funcțiile pentru aplicații sigure, selectați <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Înapoi"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Închideți aplicația"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Înapoi"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"Citește datele de diagnosticare"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Citește datele de diagnosticare de la mașină."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"Șterge datele de diagnosticare"</string>
diff --git a/service/res/values-ru/strings.xml b/service/res/values-ru/strings.xml
index 913be79..9bb786f 100644
--- a/service/res/values-ru/strings.xml
+++ b/service/res/values-ru/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Возможность обрабатывать события ввода"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Произошла ошибка шины CAN."</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Шина CAN не отвечает. Переподключите коннектор, а затем выключите зажигание и заведите машину снова."</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Во время вождения это действие недоступно.\nСначала вам нужно припарковаться."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Эту функцию нельзя использовать во время вождения."</string>
<string name="exit_button_message" msgid="8554690915924055685">"Чтобы перезапустить приложение в безопасном режиме, нажмите кнопку \"<xliff:g id="EXIT_BUTTON">%s</xliff:g>\"."</string>
<string name="exit_button" msgid="5829638404777671253">"Назад"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Закрыть приложение"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Назад"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"чтение диагностических данных"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Чтение диагностических данных автомобиля."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"удаление диагностических данных"</string>
diff --git a/service/res/values-si/strings.xml b/service/res/values-si/strings.xml
index a762579..5492418 100644
--- a/service/res/values-si/strings.xml
+++ b/service/res/values-si/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ආදාන සිදුවීම් පරිහරණ කරන්න"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN බස් අසාර්ථකයි"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN බස් ප්රතිචාර නොදක්වයි. හෙඩ්යුනිට් පෙට්ටිය පේනු ඉවත් කර ආපසු පේනුගත කර, මෝටර් රථය යළි අරඹන්න"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"ඔබේ ආරක්ෂාව සඳහා, ඔබ රිය පදවන විට මෙම ක්රියාකාරකම නොලැබේ.\nඉදිරියට යාමට, ඔබ ගාල් කරන තෙක් රැඳී සිටින්න."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"රිය පදවන අතරේ ඔබට මෙම විශේෂාංගය භාවිතා කළ නොහැක"</string>
<string name="exit_button_message" msgid="8554690915924055685">"ආරක්ෂිත යෙදුම් විශේෂාංග සමඟ පටන් ගැනීමට, <xliff:g id="EXIT_BUTTON">%s</xliff:g> තෝරන්න."</string>
<string name="exit_button" msgid="5829638404777671253">"ආපසු"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"යෙදුම වසන්න"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"ආපසු"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"දෝෂනිර්ණ දත්ත කියවන්න"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"මෝටර් රථයෙන් දෝෂනිර්ණ දත්ත කියවන්න."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"දෝෂනිර්ණ දත්ත හිස් කරන්න"</string>
diff --git a/service/res/values-sk/strings.xml b/service/res/values-sk/strings.xml
index 20a14b6..723ca51 100644
--- a/service/res/values-sk/strings.xml
+++ b/service/res/values-sk/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Spravovať udalosti vstupu"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Zbernica CAN zlyhala"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Zbernica CAN nereaguje. Odpojte autorádio a znova ho pripojte. Potom auto znova naštartujte."</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Z bezpečnostných dôvodov nie je táto aktivita k dispozícii počas jazdy.\nAk chcete pokračovať, počkajte, kým budete parkovať."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Túto funkciu nie je možné používať za jazdy"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Ak chcete začať odznova s bezpečnými funkciami aplikácie, vyberte tlačidlo <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Späť"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Zavrieť aplikáciu"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Späť"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"čítať diagnostické údaje"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Čítanie diagnostických údajov z auta."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"vymazať diagnostické údaje"</string>
diff --git a/service/res/values-sl/strings.xml b/service/res/values-sl/strings.xml
index f9c8e09..3d1f10d 100644
--- a/service/res/values-sl/strings.xml
+++ b/service/res/values-sl/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Obravnava dogodkov vnosa"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Napaka vodila CAN"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Vodilo CAN se ne odziva. Odklopite in znova priklopite ohišje avtomobilskega vmesnika ter znova zaženite avtomobil"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Zaradi varnosti ta dejavnost med vožnjo ni na voljo.\nČe želite nadaljevati, počakajte, da bo vozilo parkirano."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Te funkcije med vožnjo ne morete uporabljati"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Če želite začeti znova z varnimi funkcijami aplikacij, izberite <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Nazaj"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Zapri aplikacijo"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Nazaj"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"branje diagnostičnih podatkov"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Branje diagnostičnih podatkov avtomobila."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"brisanje diagnostičnih podatkov"</string>
diff --git a/service/res/values-sq/strings.xml b/service/res/values-sq/strings.xml
index 4229c94..368dc71 100644
--- a/service/res/values-sq/strings.xml
+++ b/service/res/values-sq/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Menaxho ngjarjet e hyrjes"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Kanali i komunikimit CAN dështoi"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Kanali i komunikimit CAN nuk përgjigjet. Shkëput dhe lidh përsëri kutinë e njësisë kryesore dhe rindiz makinës"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Për sigurinë tënde, ky aktivitet nuk ofrohet kur je duke drejtuar makinën.\nPër të vazhduar, prit deri sa të parkosh."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Nuk mund ta përdorësh këtë veçori gjatë drejtimit të makinës"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Për të filluar nga e para me funksionet e sigurta të aplikacionit, zgjidh <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Prapa"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Mbyll aplikacionin"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Pas"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"lexo të dhënat diagnostikuese"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Lexo të dhënat diagnostikuese nga makina."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"pastro të dhënat diagnostikuese"</string>
diff --git a/service/res/values-sr/strings.xml b/service/res/values-sr/strings.xml
index cdefd5b..41217f8 100644
--- a/service/res/values-sr/strings.xml
+++ b/service/res/values-sr/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Управља догађајима уноса"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Грешка CAN магистрале"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN магистрала не реагује. Искључите и поново укључите главну јединицу и поново покрените аутомобил"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Ова активност није доступна док возите ради ваше безбедности.\nДа бисте наставили, прво се паркирајте."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Не можете да користите ову функцију док возите"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Да бисте поново почели са безбедним функцијама апликације, изаберите <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Назад"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Затвори апликацију"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Назад"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"читање дијагностичких података"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Читање дијагностичких података из аутомобила."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"брисање дијагностичких података"</string>
diff --git a/service/res/values-sv/strings.xml b/service/res/values-sv/strings.xml
index cb45be3..761d932 100644
--- a/service/res/values-sv/strings.xml
+++ b/service/res/values-sv/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Hantera indatahändelser"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Fel i CAN-bussen"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-bussen svarar inte. Koppla från huvudenheten och koppla in den igen. Starta sedan om bilen"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Av säkerhetsskäl är den här aktiviteten inte tillgänglig under körning.\nDu kan fortsätta med detta när du har parkerat."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Du kan inte använda funktionen medan du kör"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Välj <xliff:g id="EXIT_BUTTON">%s</xliff:g> om du vill starta om appen med säkra funktioner."</string>
<string name="exit_button" msgid="5829638404777671253">"Tillbaka"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Stäng appen"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Tillbaka"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"läsa diagnostikdata"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Läsa diagnostisk data om bilen."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"rensa diagnostikdata"</string>
diff --git a/service/res/values-sw/strings.xml b/service/res/values-sw/strings.xml
index 8f390bb..c435f1f 100644
--- a/service/res/values-sw/strings.xml
+++ b/service/res/values-sw/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Kudhibiti matukio ya kuweka data"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Imeshindwa kuleta maelezo ya kebo CAN"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Kebo ya CAN haifanyi kazi. Ondoa kisha urudishe tena kisanduku cha sehemu kuu na uzime kisha uwashe gari"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Kwa usalama wako, shughuli haipatikani wakati unaendesha gari. \nIli uendelee, subiri hadi utakapoegesha gari."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Huwezi kutumia kipengele hiki wakati unaendesha gari"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Ili uanzishe tena ukitumia vipengele salama vya programu, chagua <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Rudi Nyuma"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Funga programu"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Nyuma"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"kusoma data ya uchunguzi"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Kusoma data ya uchunguzi kwenye gari."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"kufuta data ya uchunguzi wa gari"</string>
diff --git a/service/res/values-ta/strings.xml b/service/res/values-ta/strings.xml
index 85837ac..1f725d3 100644
--- a/service/res/values-ta/strings.xml
+++ b/service/res/values-ta/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"உற்பத்தியாளர் வழங்கும் சேவைகளைக் கையாளுதல்"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN bus அமைப்பு தோல்வியடைந்தது"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus அமைப்பு இயங்கவில்லை. ஹெட்யூனிட் பாக்ஸைப் பிளக்கில் இருந்து அகற்றிச் செருகியபின் காரை மீண்டும் தொடங்கவும்"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"உங்கள் பாதுகாப்பை முன்னிட்டு இந்தச் செயல்பாடு, வாகனம் ஓட்டும்போது இயங்காது.\nதொடர வாகனத்தை நிறுத்தும்வரை காத்திருக்கவும்."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"வாகனம் ஓட்டும்போது இந்த அம்சத்தைப் பயன்படுத்த முடியாது"</string>
<string name="exit_button_message" msgid="8554690915924055685">"ஆப்ஸைப் பாதுகாப்பான அம்சங்களுடன் மீண்டும் தொடங்க <xliff:g id="EXIT_BUTTON">%s</xliff:g>ஐத் தேர்ந்தெடுக்கவும்."</string>
<string name="exit_button" msgid="5829638404777671253">"பின்செல்"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"ஆப்ஸை மூடுக"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"முந்தையது"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"ஆய்வுத் தரவை அறிய வேண்டும்"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"கார் தொடர்பான ஆய்வுத் தரவை அறிய வேண்டும்."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"ஆய்வுத் தரவை அழிக்க வேண்டும்"</string>
diff --git a/service/res/values-te/strings.xml b/service/res/values-te/strings.xml
index d7872c4..9fa7286 100644
--- a/service/res/values-te/strings.xml
+++ b/service/res/values-te/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ఇన్పుట్ ఈవెంట్లను హ్యాండిల్ చేయండి"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN బస్సు విఫలమైంది"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN బస్సు స్పందించలేదు. హెడ్ యూనిట్ బాక్స్ని ప్లగ్ మరియు అన్ప్లగ్ చేసి కారుని పునఃప్రారంభించుము"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"మీ భద్రత విషయమై, ఈ కార్యాచరణ మీరు డ్రైవింగ్లో ఉన్నప్పుడు అందుబాటులో లేదు.\n కొనసాగించడానికి, మీరు పార్క్ చేయబడేవరకు వేచి ఉండండి."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"డ్రైవింగ్లో ఉండగా మీరు ఈ ఫీచర్ని ఉపయోగించలేరు"</string>
<string name="exit_button_message" msgid="8554690915924055685">"సురక్షిత యాప్ లక్షణాలతో ప్రారంభించడానికి, <xliff:g id="EXIT_BUTTON">%s</xliff:g>ని ఎంచుకోండి."</string>
<string name="exit_button" msgid="5829638404777671253">"వెనుకకు"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"యాప్ను మూసివేయండి"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"వెనుకకు"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"సమస్య విశ్లేషణ డేటాను తెలుసుకోగలవు"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"కారు నుండి విశ్లేషణ డేటాను తెలుసుకోగలవు."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"సమస్య విశ్లేషణ డేటాను క్లియర్ చేయగలవు"</string>
diff --git a/service/res/values-th/strings.xml b/service/res/values-th/strings.xml
index e0c3bdf..5ba0c7a 100644
--- a/service/res/values-th/strings.xml
+++ b/service/res/values-th/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"จัดการเหตุการณ์การป้อนข้อมูล"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN Bus ล้มเหลว"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN Bus ไม่ตอบสนอง ถอดปลั๊กกล่องเครื่องเล่นวิทยุ (Headunit) แล้วเสียบกลับเข้าไป สตาร์ทรถอีกครั้ง"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"เพื่อความปลอดภัย กิจกรรมนี้จะไม่เปิดให้ใช้งานขณะขับรถ\nคุณต้องจอดรถให้เรียบร้อยก่อน จึงจะดำเนินการต่อได้"</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"คุณใช้ฟีเจอร์นี้ขณะขับรถไม่ได้"</string>
<string name="exit_button_message" msgid="8554690915924055685">"เลือก <xliff:g id="EXIT_BUTTON">%s</xliff:g> เพื่อเริ่มต้นใหม่โดยใช้ฟีเจอร์แอปที่ปลอดภัย"</string>
<string name="exit_button" msgid="5829638404777671253">"กลับ"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"ปิดแอป"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"กลับ"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"อ่านข้อมูลการวินิจฉัย"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"อ่านข้อมูลการวินิจฉัยจากรถ"</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"ล้างข้อมูลการวินิจฉัย"</string>
diff --git a/service/res/values-tl/strings.xml b/service/res/values-tl/strings.xml
index 8b9ca7e..b1c21cc 100644
--- a/service/res/values-tl/strings.xml
+++ b/service/res/values-tl/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Pangasiwaan ang mga event ng input"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Hindi gumana ang CAN bus"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Hindi tumugon ang CAN bus. Hugutin at muling isaksak ang headunit box at i-restart ang sasakyan"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Para sa seguridad, hindi available ang aktibidad habang nagmamaneho.\nPara magpatuloy, maghintay hanggang sa makaparada."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Hindi mo puwedeng gamitin ang feature na ito habang nagmamaneho"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Para magsimula sa mga ligtas na feature ng app, piliin ang <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Bumalik"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Isara ang app"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Bumalik"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"basahin ang data ng mga diagnostic"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Basahin ang data ng mga diagnostic mula sa sasakyan."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"i-clear ang data ng mga diagnostic"</string>
diff --git a/service/res/values-tr/strings.xml b/service/res/values-tr/strings.xml
index 6062d11..6d1b66f 100644
--- a/service/res/values-tr/strings.xml
+++ b/service/res/values-tr/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Giriş olaylarını işleme"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN veri yolu başarısız"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN veri yolu yanıt vermiyor. Ana birim kutusunu söküp tekrar takın ve aracı yeniden çalıştırın"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Güvenliğiniz için bu etkinlik sürüş sırasında gerçekleştirilemez.\nDevam etmek için park edene dek bekleyin."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Sürüş sırasında bu özelliği kullanamazsınız"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Güvenli uygulama özellikleriyle baştan başlamak için <xliff:g id="EXIT_BUTTON">%s</xliff:g> düğmesini seçin."</string>
<string name="exit_button" msgid="5829638404777671253">"Geri"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Uygulamayı kapat"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Geri"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"teşhis verilerini okuma"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Araçtan teşhis verilerini okuma."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"teşhis verilerini temizleme"</string>
diff --git a/service/res/values-uk/strings.xml b/service/res/values-uk/strings.xml
index 235494c..48c01c6 100644
--- a/service/res/values-uk/strings.xml
+++ b/service/res/values-uk/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Обробка вхідних подій"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Помилка CAN-шини"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-шина не відповідає. Від’єднайте та знову під’єднайте головний пристрій аудіосистеми й заведіть автомобіль ще раз"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Задля вашої безпеки ці дії недоступні під час поїздки.\nЩоб продовжити, зупиніть автомобіль."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Ця функція недоступна під час руху"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Щоб почати знову з безпечними функціями додатка, натисніть кнопку \"<xliff:g id="EXIT_BUTTON">%s</xliff:g>\"."</string>
<string name="exit_button" msgid="5829638404777671253">"Назад"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Закрити додаток"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Назад"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"перегляд даних діагностики"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Перегляд даних діагностики автомобіля."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"очищення даних діагностики"</string>
diff --git a/service/res/values-ur/strings.xml b/service/res/values-ur/strings.xml
index 0025f4a..e348a0d 100644
--- a/service/res/values-ur/strings.xml
+++ b/service/res/values-ur/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ایونٹس کے ان پٹ کو ہینڈل کریں"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"کین بس ناکام ہو گئی"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"کین بس جواب نہیں دیتی ہے۔ ہیڈیونٹ باکس کو ان پلگ کر کے دوبارہ پلگ کریں اور کار کو دوبارہ شروع کریں"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"آپ کی حفاظت کے لیے یہ سرگرمی آپ کے کار چلانے کے دوران دستیاب نہیں ہے۔\n جاری رکھنے کے لیے کار کے پارک ہونے تک انتظار کریں۔"</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"ڈرائیونگ کے دوران آپ یہ خصوصیت استعمال نہیں کر سکتے ہیں"</string>
<string name="exit_button_message" msgid="8554690915924055685">"محفوظ اپپ کی خصوصیات کے ساتھ شروع کرنے کے لیے <xliff:g id="EXIT_BUTTON">%s</xliff:g> پر کلک کریں۔"</string>
<string name="exit_button" msgid="5829638404777671253">"پیچھے"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"ایپ بند کریں"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"پیچھے"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"تشخیصی ڈیٹا پڑھیں"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"کار کے تشخیصی ڈیٹا کے بارے میں پڑھیں۔"</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"تشخیصی ڈیٹا صاف کریں"</string>
diff --git a/service/res/values-uz/strings.xml b/service/res/values-uz/strings.xml
index 9186a3e..de3b88d 100644
--- a/service/res/values-uz/strings.xml
+++ b/service/res/values-uz/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Matn kiritish hodisalari bilan ishlash imkoniyati"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN shinalarida xatolik yuz berdi"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN javob bermayapti. Konnektorni chiqaring va qayta ulang, keyin avtomobilni oʻt oldiring"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Avtomobil haydayotganingizda bu harakatni amalga oshira olmaysiz.\nUni bajarish uchun avtomobilni toʻxtating."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Avtomobilda harakatlanayotganda bu funksiyadan foydalanish imkonsiz"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Ilovani xavfsiz rejimda ishga tushirish uchun <xliff:g id="EXIT_BUTTON">%s</xliff:g> tugmasini bosing."</string>
<string name="exit_button" msgid="5829638404777671253">"Orqaga"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Ilovani yopish"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Orqaga"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"diagnostika axborotini ochish"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Avtomobildan diagnostika axborotini olish."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"diagnostika axborotini tozalash"</string>
diff --git a/service/res/values-vi/strings.xml b/service/res/values-vi/strings.xml
index 6af0b35..2b94b9f 100644
--- a/service/res/values-vi/strings.xml
+++ b/service/res/values-vi/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Xử lý sự kiện nhập"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Đường dẫn chính CAN không hoạt động"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Đường dẫn chính CAN không phản hồi. Rút rồi cắm lại hộp bộ đầu và khởi động lại ô tô"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Vì lý do an toàn, bạn không sử dụng được hoạt động này trong khi lái xe.\nHãy đợi cho tới khi bạn đỗ xe để tiếp tục."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Bạn không thể dùng tính năng này khi đang lái xe"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Để bắt đầu lại với các tính năng an toàn của ứng dụng, hãy chọn <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Quay lại"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Tắt ứng dụng"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Quay lại"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"đọc dữ liệu chẩn đoán"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Đọc dữ liệu chẩn đoán từ ô tô."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"xóa dữ liệu chẩn đoán"</string>
diff --git a/service/res/values-zh-rCN/strings.xml b/service/res/values-zh-rCN/strings.xml
index f9de733..fa91952 100644
--- a/service/res/values-zh-rCN/strings.xml
+++ b/service/res/values-zh-rCN/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"处理输入事件"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"CAN 总线故障"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN 总线没有响应。请将主机盒插头拔下并插回，然后重新启动汽车"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"为了确保您的安全，您无法在开车时执行这项活动。\n要继续，请先停车。"</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"您不能在驾车时使用此功能"</string>
<string name="exit_button_message" msgid="8554690915924055685">"要重新开始使用安全的应用功能，请选择<xliff:g id="EXIT_BUTTON">%s</xliff:g>。"</string>
<string name="exit_button" msgid="5829638404777671253">"返回"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"关闭应用"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"返回"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"读取诊断数据"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"读取汽车的诊断数据。"</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"清除诊断数据"</string>
diff --git a/service/res/values-zh-rHK/strings.xml b/service/res/values-zh-rHK/strings.xml
index 45ddc60..6eb7a72 100644
--- a/service/res/values-zh-rHK/strings.xml
+++ b/service/res/values-zh-rHK/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"處理輸入活動"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"控制器區域網路操作失敗"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"控制器區域網路未有回覆。請拔除並重新插上汽車音響主機，然後重新啟動汽車"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"基於安全理由，駕駛時無法執行此操作。\n如要繼續，請留待泊車後操作。"</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"您無法在駕駛時使用此功能"</string>
<string name="exit_button_message" msgid="8554690915924055685">"如要以安全應用程式功能重新啟動，請選擇 <xliff:g id="EXIT_BUTTON">%s</xliff:g>。"</string>
<string name="exit_button" msgid="5829638404777671253">"返回"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"關閉應用程式"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"返回"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"讀取診斷資料"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"讀取來自汽車的診斷資料。"</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"清除診斷資料"</string>
diff --git a/service/res/values-zh-rTW/strings.xml b/service/res/values-zh-rTW/strings.xml
index fc57e09..d091c29 100644
--- a/service/res/values-zh-rTW/strings.xml
+++ b/service/res/values-zh-rTW/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"處理輸入事件"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"控制器區域網路發生問題"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"控制器區域網路無回應。請將主機盒插頭拔下並插回，然後重新啟動車輛"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"為了你的安全，開車期間不得進行這個活動。\n如要繼續，請先停車。"</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"開車時無法使用這項功能"</string>
<string name="exit_button_message" msgid="8554690915924055685">"如要使用安全應用程式功能重新啟動，請選取「離開」按鈕 <xliff:g id="EXIT_BUTTON">%s</xliff:g>。"</string>
<string name="exit_button" msgid="5829638404777671253">"返回"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"關閉應用程式"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"返回"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"讀取診斷資料"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"讀取車輛的診斷資料。"</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"清除診斷資料"</string>
diff --git a/service/res/values-zu/strings.xml b/service/res/values-zu/strings.xml
index cd06d2f..091a12e 100644
--- a/service/res/values-zu/strings.xml
+++ b/service/res/values-zu/strings.xml
@@ -72,9 +72,11 @@
<string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Phatha imicimbi yokungena"</string>
<string name="car_can_bus_failure" msgid="2334035748788283914">"Ibhasi ye-CAN yehlulekile"</string>
<string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Ibhasi ye-CAN ayiphenduli. Nqamula futhi uxhume ibhokisi le-headunit ukuze uqalise kabusha imoto"</string>
- <string name="activity_blocked_text" msgid="5342114426610711378">"Ngokuphepha kwakho, lo msebenzi awutholakali uma ushayela.\nUkuze uqhubeke, linda uze umiswe."</string>
+ <string name="activity_blocked_text" msgid="8088902789540147995">"Awukwazi ukusebenzisa lesi sici ngenkathi ushayela"</string>
<string name="exit_button_message" msgid="8554690915924055685">"Ukuze uqalise futhi ngezici zohlelo lokusebenza, khetha <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
<string name="exit_button" msgid="5829638404777671253">"Emuva"</string>
+ <string name="exit_button_close_application" msgid="8824289547809332460">"Vala uhlelo lokusebenza"</string>
+ <string name="exit_button_go_back" msgid="3469083862100560326">"Emuva"</string>
<string name="car_permission_label_diag_read" msgid="7248894224877702604">"funda idatha yokuxilonga"</string>
<string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Ukufunda idatha yokuxilonga kusuka emotweni."</string>
<string name="car_permission_label_diag_clear" msgid="4783070510879698157">"sula idatha yokuxilonga"</string>
diff --git a/service/src/com/android/car/CarConfigurationService.java b/service/src/com/android/car/CarConfigurationService.java
deleted file mode 100644
index fe763d2..0000000
--- a/service/src/com/android/car/CarConfigurationService.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.car;
-
-import android.annotation.Nullable;
-import android.annotation.RawRes;
-import android.car.settings.ICarConfigurationManager;
-import android.car.settings.SpeedBumpConfiguration;
-import android.content.Context;
-import android.util.Log;
-
-import com.android.internal.annotations.VisibleForTesting;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.PrintWriter;
-
-/**
- * A service that will look at a default JSON configuration file on the system and parses out its
- * results.
- *
- * <p>This service will look for the JSON file that is mapped to {@code R.raw.car_config}. If this
- * value does not exist or is malformed, then this service will not fail; instead, it returns
- * default values for various configurations.
- */
-public class CarConfigurationService extends ICarConfigurationManager.Stub
- implements CarServiceBase {
- private static final String TAG = "CarConfigurationService";
-
- // Keys for accessing data in the parsed JSON related to SpeedBump.
- @VisibleForTesting
- static final String SPEED_BUMP_CONFIG_KEY = "SpeedBump";
- @VisibleForTesting
- static final String SPEED_BUMP_ACQUIRED_PERMITS_PER_SECOND_KEY =
- "acquiredPermitsPerSecond";
- @VisibleForTesting
- static final String SPEED_BUMP_MAX_PERMIT_POOL_KEY = "maxPermitPool";
- @VisibleForTesting
- static final String SPEED_BUMP_PERMIT_FILL_DELAY_KEY = "permitFillDelay";
-
- // Default values for speed bump configuration.
- @VisibleForTesting
- static final double DEFAULT_SPEED_BUMP_ACQUIRED_PERMITS_PER_SECOND = 0.5d;
- @VisibleForTesting
- static final double DEFAULT_SPEED_BUMP_MAX_PERMIT_POOL = 5d;
- @VisibleForTesting
- static final long DEFAULT_SPEED_BUMP_PERMIT_FILL_DELAY = 600L;
-
- private final Context mContext;
- private final JsonReader mJsonReader;
-
- @VisibleForTesting
- @Nullable
- JSONObject mConfigFile;
-
- @Nullable
- private SpeedBumpConfiguration mSpeedBumpConfiguration;
-
- /**
- * An interface that abstracts away the parsing of a JSON file. This interface allows the
- * JSON file to be mocked away for testing.
- */
- @VisibleForTesting
- interface JsonReader {
- /**
- * Returns the contents of the JSON file that is pointed to by the given {@code resId} as
- * a string.
- *
- * @param context The current Context.
- * @param resId The resource id of the JSON file.
- * @return A string representation of the file or {@code null} if an error occurred.
- */
- @Nullable
- String jsonFileToString(Context context, @RawRes int resId);
- }
-
- CarConfigurationService(Context context, JsonReader reader) {
- mContext = context;
- mJsonReader = reader;
- }
-
- /**
- * Returns the configuration values for speed bump that is found in the configuration JSON on
- * the system. If there was an error reading this JSON or the JSON did not contain
- * speed bump configuration, then default values will be returned. This method does not return
- * {@code null}.
- */
- @Override
- public SpeedBumpConfiguration getSpeedBumpConfiguration() {
- if (mSpeedBumpConfiguration == null) {
- return getDefaultSpeedBumpConfiguration();
- }
- return mSpeedBumpConfiguration;
- }
-
- @Override
- public synchronized void init() {
- String jsonString = mJsonReader.jsonFileToString(mContext, R.raw.car_config);
- if (jsonString != null) {
- try {
- mConfigFile = new JSONObject(jsonString);
- } catch (JSONException e) {
- Log.e(TAG, "Error reading JSON file", e);
- }
- }
-
- mSpeedBumpConfiguration = createSpeedBumpConfiguration();
- }
-
- @Override
- public synchronized void release() {
- mConfigFile = null;
- mSpeedBumpConfiguration = null;
- }
-
- @Override
- public void dump(PrintWriter writer) {
- writer.println("*CarConfigurationService*");
- writer.println("Config value initialized: " + (mConfigFile != null));
- if (mConfigFile != null) {
- try {
- writer.println("Config: " + mConfigFile.toString(/* indentSpaces= */ 2));
- } catch (JSONException e) {
- Log.e(TAG, "Error printing JSON config", e);
- writer.println("Config: " + mConfigFile);
- }
- }
-
- writer.println("SpeedBumpConfig initialized: " + (mSpeedBumpConfiguration != null));
- if (mSpeedBumpConfiguration != null) {
- writer.println("SpeedBumpConfig: " + mSpeedBumpConfiguration);
- }
- }
-
- /**
- * Reads the configuration for speed bump off of the parsed JSON stored in {@link #mConfigFile}.
- * If {@code mConfigFile} is {@code null} or a configuration does not exist for speed bump,
- * then return the default configuration created by {@link #getDefaultSpeedBumpConfiguration()}.
- */
- private SpeedBumpConfiguration createSpeedBumpConfiguration() {
- if (mConfigFile == null) {
- return getDefaultSpeedBumpConfiguration();
- }
-
- try {
- JSONObject speedBumpJson = mConfigFile.getJSONObject(SPEED_BUMP_CONFIG_KEY);
-
- if (speedBumpJson != null) {
- return new SpeedBumpConfiguration(
- speedBumpJson.getDouble(SPEED_BUMP_ACQUIRED_PERMITS_PER_SECOND_KEY),
- speedBumpJson.getDouble(SPEED_BUMP_MAX_PERMIT_POOL_KEY),
- speedBumpJson.getLong(SPEED_BUMP_PERMIT_FILL_DELAY_KEY));
- }
- } catch (JSONException e) {
- Log.e(TAG, "Error parsing SpeedBumpConfiguration; returning default values", e);
- }
-
- // If an error is encountered or the JSON does not contain an entry for speed bump
- // configuration, then return default values.
- return getDefaultSpeedBumpConfiguration();
- }
-
- private SpeedBumpConfiguration getDefaultSpeedBumpConfiguration() {
- return new SpeedBumpConfiguration(
- DEFAULT_SPEED_BUMP_ACQUIRED_PERMITS_PER_SECOND,
- DEFAULT_SPEED_BUMP_MAX_PERMIT_POOL,
- DEFAULT_SPEED_BUMP_PERMIT_FILL_DELAY);
- }
-}
diff --git a/service/src/com/android/car/CarFeatureController.java b/service/src/com/android/car/CarFeatureController.java
index 0bcc426..e728873 100644
--- a/service/src/com/android/car/CarFeatureController.java
+++ b/service/src/com/android/car/CarFeatureController.java
@@ -64,7 +64,6 @@
Car.AUDIO_SERVICE,
Car.BLUETOOTH_SERVICE,
Car.CAR_BUGREPORT_SERVICE,
- Car.CAR_CONFIGURATION_SERVICE,
Car.CAR_DRIVING_STATE_SERVICE,
Car.CAR_INPUT_SERVICE,
Car.CAR_MEDIA_SERVICE,
diff --git a/service/src/com/android/car/ICarImpl.java b/service/src/com/android/car/ICarImpl.java
index d819631..3392961 100644
--- a/service/src/com/android/car/ICarImpl.java
+++ b/service/src/com/android/car/ICarImpl.java
@@ -122,7 +122,6 @@
private final PerUserCarServiceHelper mPerUserCarServiceHelper;
private final CarDiagnosticService mCarDiagnosticService;
private final CarStorageMonitoringService mCarStorageMonitoringService;
- private final CarConfigurationService mCarConfigurationService;
private final CarTrustedDeviceService mCarTrustedDeviceService;
private final CarMediaService mCarMediaService;
private final CarUserManagerHelper mUserManagerHelper;
@@ -254,8 +253,6 @@
} else {
mCarStorageMonitoringService = null;
}
- mCarConfigurationService =
- new CarConfigurationService(serviceContext, new JsonReaderImpl());
mCarLocationService = new CarLocationService(serviceContext);
mCarTrustedDeviceService = new CarTrustedDeviceService(serviceContext);
mCarMediaService = new CarMediaService(serviceContext, mCarUserService);
@@ -310,7 +307,6 @@
allServices.add(mCarProjectionService);
addServiceIfNonNull(allServices, mCarDiagnosticService);
addServiceIfNonNull(allServices, mCarStorageMonitoringService);
- allServices.add(mCarConfigurationService);
addServiceIfNonNull(allServices, mVmsBrokerService);
allServices.add(mCarTrustedDeviceService);
allServices.add(mCarMediaService);
@@ -526,8 +522,6 @@
return mCarUXRestrictionsService;
case Car.OCCUPANT_AWARENESS_SERVICE:
return mOccupantAwarenessService;
- case Car.CAR_CONFIGURATION_SERVICE:
- return mCarConfigurationService;
case Car.CAR_TRUST_AGENT_ENROLLMENT_SERVICE:
assertTrustAgentEnrollmentPermission(mContext);
return mCarTrustedDeviceService.getCarTrustAgentEnrollmentService();
diff --git a/service/src/com/android/car/JsonReaderImpl.java b/service/src/com/android/car/JsonReaderImpl.java
deleted file mode 100644
index 2ab7c32..0000000
--- a/service/src/com/android/car/JsonReaderImpl.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.car;
-
-import android.annotation.Nullable;
-import android.annotation.RawRes;
-import android.content.Context;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-
-/**
- * An implementation of {@link com.android.car.CarConfigurationService.JsonReader} that will
- * parse a JSON file on the system that is mapped to {@code R.raw.car_config}.
- */
-public class JsonReaderImpl implements CarConfigurationService.JsonReader {
- private static final int BUF_SIZE = 0x1000; // 2K chars (4K bytes)
- private static final String JSON_FILE_ENCODING = "UTF-8";
-
- /**
- * Takes a resource file that is considered to be a JSON file and parses it into a String that
- * is returned.
- *
- * @param resId The resource id pointing to the json file.
- * @return A {@code String} representing the file contents, or {@code null} if
- */
- @Override
- @Nullable
- public String jsonFileToString(Context context, @RawRes int resId) {
- InputStream is = context.getResources().openRawResource(resId);
-
- // Note: this "try" will close the Reader, thus closing the associated InputStreamReader
- // and InputStream.
- try (Reader reader = new BufferedReader(new InputStreamReader(is, JSON_FILE_ENCODING))) {
- char[] buffer = new char[BUF_SIZE];
- StringBuilder stringBuilder = new StringBuilder();
-
- int bufferedContent;
- while ((bufferedContent = reader.read(buffer)) != -1) {
- stringBuilder.append(buffer, /* offset= */ 0, bufferedContent);
- }
-
- return stringBuilder.toString();
- } catch (IOException e) {
- return null;
- }
- }
-}
diff --git a/service/src/com/android/car/pm/ActivityBlockingActivity.java b/service/src/com/android/car/pm/ActivityBlockingActivity.java
index db50f85..293b278 100644
--- a/service/src/com/android/car/pm/ActivityBlockingActivity.java
+++ b/service/src/com/android/car/pm/ActivityBlockingActivity.java
@@ -28,19 +28,30 @@
import android.car.drivingstate.CarUxRestrictions;
import android.car.drivingstate.CarUxRestrictionsManager;
import android.content.ComponentName;
+import android.content.Context;
import android.content.Intent;
+import android.graphics.Insets;
+import android.graphics.PixelFormat;
+import android.graphics.Rect;
+import android.hardware.display.DisplayManager;
+import android.opengl.GLSurfaceView;
import android.os.Build;
import android.os.Bundle;
import android.os.RemoteException;
import android.text.TextUtils;
import android.util.Log;
+import android.util.Size;
+import android.view.Display;
+import android.view.DisplayInfo;
import android.view.View;
import android.view.ViewTreeObserver;
+import android.view.WindowInsets;
import android.widget.Button;
import android.widget.TextView;
import com.android.car.CarLog;
import com.android.car.R;
+import com.android.car.pm.blurredbackground.BlurredSurfaceRenderer;
import java.util.List;
@@ -49,9 +60,15 @@
* Additional information on blocked Activity should be passed as intent extras.
*/
public class ActivityBlockingActivity extends Activity {
+ private static final int EGL_CONTEXT_VERSION = 3;
+ private static final int EGL_CONFIG_SIZE = 8;
private static final int INVALID_TASK_ID = -1;
private final Object mLock = new Object();
+ private GLSurfaceView mGLSurfaceView;
+ private BlurredSurfaceRenderer mSurfaceRenderer;
+ private boolean mIsGLSurfaceSetup = false;
+
private Car mCar;
private CarUxRestrictionsManager mUxRManager;
private CarPackageManager mCarPackageManager;
@@ -107,6 +124,16 @@
handleUxRChange(mUxRManager.getCurrentCarUxRestrictions());
mUxRManager.registerListener(ActivityBlockingActivity.this::handleUxRChange);
});
+
+ setupGLSurface();
+ }
+
+ @Override
+ protected void onStart() {
+ super.onStart();
+ if (mIsGLSurfaceSetup) {
+ mGLSurfaceView.onResume();
+ }
}
@Override
@@ -141,6 +168,77 @@
}
}
+ @Override
+ protected void onStop() {
+ super.onStop();
+
+ if (mIsGLSurfaceSetup) {
+ // We queue this event so that it runs on the Rendering thread
+ mGLSurfaceView.queueEvent(() -> mSurfaceRenderer.onPause());
+
+ mGLSurfaceView.onPause();
+ }
+
+ // Finish when blocking activity goes invisible to avoid it accidentally re-surfaces with
+ // stale string regarding blocked activity.
+ finish();
+ }
+
+ private void setupGLSurface() {
+ DisplayManager displayManager = (DisplayManager) getApplicationContext().getSystemService(
+ Context.DISPLAY_SERVICE);
+ DisplayInfo displayInfo = new DisplayInfo();
+
+ int displayId = getDisplayId();
+ displayManager.getDisplay(displayId).getDisplayInfo(displayInfo);
+
+ Rect windowRect = getAppWindowRect();
+
+ // We currently don't support blur for secondary display
+ // (because it is hard to take a screenshot of a secondary display)
+ // So for secondary displays, the GLSurfaceView will not appear blurred
+ boolean shouldRenderBlurred = getDisplayId() == Display.DEFAULT_DISPLAY;
+
+ mSurfaceRenderer = new BlurredSurfaceRenderer(this, windowRect, shouldRenderBlurred);
+
+ mGLSurfaceView = findViewById(R.id.blurred_surface_view);
+ mGLSurfaceView.setEGLContextClientVersion(EGL_CONTEXT_VERSION);
+
+ // Sets up the surface so that we can make it translucent if needed
+ mGLSurfaceView.getHolder().setFormat(PixelFormat.TRANSLUCENT);
+ mGLSurfaceView.setEGLConfigChooser(EGL_CONFIG_SIZE, EGL_CONFIG_SIZE, EGL_CONFIG_SIZE,
+ EGL_CONFIG_SIZE, EGL_CONFIG_SIZE, EGL_CONFIG_SIZE);
+
+ mGLSurfaceView.setRenderer(mSurfaceRenderer);
+
+ // We only want to render the screen once
+ mGLSurfaceView.setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
+
+ mIsGLSurfaceSetup = true;
+ }
+
+ /**
+ * Computes a Rect that represents the portion of the screen that
+ * contains the activity that is being blocked.
+ *
+ * @return Rect that represents the application window
+ */
+ private Rect getAppWindowRect() {
+ Insets systemBarInsets = getWindowManager()
+ .getCurrentWindowMetrics()
+ .getWindowInsets()
+ .getInsets(WindowInsets.Type.systemBars());
+
+ Size displaySize = getWindowManager().getCurrentWindowMetrics().getSize();
+
+ int leftX = systemBarInsets.left;
+ int rightX = displaySize.getWidth() - systemBarInsets.right;
+ int topY = systemBarInsets.top;
+ int bottomY = displaySize.getHeight() - systemBarInsets.bottom;
+
+ return new Rect(leftX, topY, rightX, bottomY);
+ }
+
private void displayExitButton() {
String exitButtonText = getExitButtonText();
@@ -277,14 +375,6 @@
}
@Override
- protected void onStop() {
- super.onStop();
- // Finish when blocking activity goes invisible to avoid it accidentally re-surfaces with
- // stale string regarding blocked activity.
- finish();
- }
-
- @Override
protected void onDestroy() {
super.onDestroy();
mCar.disconnect();
diff --git a/service/src/com/android/car/pm/blurredbackground/BlurTextureProgram.java b/service/src/com/android/car/pm/blurredbackground/BlurTextureProgram.java
new file mode 100644
index 0000000..bb41af2
--- /dev/null
+++ b/service/src/com/android/car/pm/blurredbackground/BlurTextureProgram.java
@@ -0,0 +1,337 @@
+/*
+ * 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.car.pm.blurredbackground;
+
+import android.graphics.Rect;
+import android.opengl.GLES11Ext;
+import android.opengl.GLES30;
+
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+
+/**
+ * A class containing the OpenGL programs used to render a blurred texture
+ */
+public class BlurTextureProgram {
+
+ private static final float[] FRAME_COORDS = {
+ -1.0f, -1.0f, // 0 bottom left
+ 1.0f, -1.0f, // 1 bottom right
+ -1.0f, 1.0f, // 2 top left
+ 1.0f, 1.0f, // 3 top right
+ };
+ private static final float[] TEXTURE_COORDS = {
+ 0.0f, 0.0f, // 0 bottom left
+ 1.0f, 0.0f, // 1 bottom right
+ 0.0f, 1.0f, // 2 top left
+ 1.0f, 1.0f // 3 top right
+ };
+
+ private static final float[] INVERTED_TEXTURE_COORDS = {
+ 0.0f, 1.0f, // 0 bottom left
+ 1.0f, 1.0f, // 1 bottom right
+ 0.0f, 0.0f, // 2 top left
+ 1.0f, 0.0f // 3 top right
+ };
+
+ private static final int SIZEOF_FLOAT = 4;
+ private static final int NUM_COORDS_PER_VERTEX = 2;
+ private static final float BLUR_RADIUS = 40.0f;
+
+ private final String mVertexShader;
+ private final String mHorizontalBlurShader;
+ private final String mVerticalBlurShader;
+
+ private final int mHorizontalBlurProgram;
+ private final int mVerticalBlurProgram;
+
+ private final int mWidth;
+ private final int mHeight;
+
+ private final int mScreenshotTextureId;
+ private final IntBuffer mScreenshotTextureBuffer;
+ private final float[] mTexMatrix;
+ private final FloatBuffer mResolutionBuffer;
+
+ private final FloatBuffer mVertexBuffer = GLHelper.createFloatBuffer(FRAME_COORDS);
+ private final FloatBuffer mTexBuffer = GLHelper.createFloatBuffer(TEXTURE_COORDS);
+ private final FloatBuffer mInvertedTexBuffer = GLHelper.createFloatBuffer(
+ INVERTED_TEXTURE_COORDS);
+
+ // Locations of the uniforms and attributes for the horizontal program
+ private final int mUHorizontalMVPMatrixLoc;
+ private final int mUHorizontalTexMatrixLoc;
+ private final int mUHorizontalResolutionLoc;
+ private final int mUHorizontalRadiusLoc;
+ private final int mAHorizontalPositionLoc;
+ private final int mAHorizontalTextureCoordLoc;
+
+ // Locations of the uniforms and attributes for the vertical program
+ private final int mUVerticalMVPMatrixLoc;
+ private final int mUVerticalTexMatrixLoc;
+ private final int mUVerticalResolutionLoc;
+ private final int mUVerticalRadiusLoc;
+ private final int mAVerticalPositionLoc;
+ private final int mAVerticalTextureCoordLoc;
+
+ private final IntBuffer mFrameBuffer = IntBuffer.allocate(1);
+ private final IntBuffer mFirstPassTextureBuffer = IntBuffer.allocate(1);
+
+ private int mFrameBufferId;
+ private int mFirstPassTextureId;
+
+ /**
+ * Constructor for the BlurTextureProgram
+ *
+ * @param screenshotTextureBuffer IntBuffer
+ * @param texMatrix Float array used to scale the screenshot texture
+ * @param vertexShader String containing the horizontal blur shader
+ * @param horizontalBlurShader String containing the fragment shader for horizontal blur
+ * @param verticalBlurShader String containing the fragment shader for vertical blur
+ * @param windowRect Rect representing the location of the window being covered
+ */
+ BlurTextureProgram(
+ IntBuffer screenshotTextureBuffer,
+ float[] texMatrix,
+ String vertexShader,
+ String horizontalBlurShader,
+ String verticalBlurShader,
+ Rect windowRect
+ ) {
+ mVertexShader = vertexShader;
+ mHorizontalBlurShader = horizontalBlurShader;
+ mVerticalBlurShader = verticalBlurShader;
+
+ mScreenshotTextureBuffer = screenshotTextureBuffer;
+ mScreenshotTextureId = screenshotTextureBuffer.get(0);
+ mTexMatrix = texMatrix;
+
+ mHorizontalBlurProgram = GLHelper.createProgram(mVertexShader, mHorizontalBlurShader);
+ mVerticalBlurProgram = GLHelper.createProgram(mVertexShader, mVerticalBlurShader);
+
+ mWidth = windowRect.width();
+ mHeight = windowRect.height();
+
+ mResolutionBuffer = FloatBuffer.wrap(new float[]{(float) mWidth, (float) mHeight, 1.0f});
+
+ // Initialize the uniform and attribute locations for the horizontal blur program
+ mUHorizontalMVPMatrixLoc = GLES30.glGetUniformLocation(mHorizontalBlurProgram,
+ "uMVPMatrix");
+ mUHorizontalTexMatrixLoc = GLES30.glGetUniformLocation(mHorizontalBlurProgram,
+ "uTexMatrix");
+ mUHorizontalResolutionLoc = GLES30.glGetUniformLocation(mHorizontalBlurProgram,
+ "uResolution");
+ mUHorizontalRadiusLoc = GLES30.glGetUniformLocation(mHorizontalBlurProgram, "uRadius");
+
+ mAHorizontalPositionLoc = GLES30.glGetAttribLocation(mHorizontalBlurProgram, "aPosition");
+ mAHorizontalTextureCoordLoc = GLES30.glGetAttribLocation(mHorizontalBlurProgram,
+ "aTextureCoord");
+
+ // Initialize the uniform and attribute locations for the vertical blur program
+ mUVerticalMVPMatrixLoc = GLES30.glGetUniformLocation(mVerticalBlurProgram, "uMVPMatrix");
+ mUVerticalTexMatrixLoc = GLES30.glGetUniformLocation(mVerticalBlurProgram, "uTexMatrix");
+ mUVerticalResolutionLoc = GLES30.glGetUniformLocation(mVerticalBlurProgram, "uResolution");
+ mUVerticalRadiusLoc = GLES30.glGetUniformLocation(mVerticalBlurProgram, "uRadius");
+
+ mAVerticalPositionLoc = GLES30.glGetAttribLocation(mVerticalBlurProgram, "aPosition");
+ mAVerticalTextureCoordLoc = GLES30.glGetAttribLocation(mVerticalBlurProgram,
+ "aTextureCoord");
+ }
+
+ /**
+ * Executes all of the rendering logic. Sets up FrameBuffers and programs to complete
+ * two rendering passes on the captured screenshot to produce a blur.
+ */
+ public void render() {
+ setupProgram(mHorizontalBlurProgram, mScreenshotTextureId,
+ GLES11Ext.GL_TEXTURE_EXTERNAL_OES);
+ setHorizontalUniformsAndAttributes();
+
+ // Create the framebuffer that will hold the texture we render to
+ // for the first shader pass
+ mFrameBufferId = GLHelper.createAndBindFramebuffer(mFrameBuffer);
+
+ // Create the empty texture that will store the output of the first shader pass (this'll
+ // be held in the Framebuffer Object)
+ mFirstPassTextureId = GLHelper.createAndBindTextureObject(mFirstPassTextureBuffer,
+ GLES30.GL_TEXTURE_2D);
+
+ setupTextureForFramebuffer(mFirstPassTextureId);
+ assertValidFramebufferStatus();
+ renderToFramebuffer(mFrameBufferId);
+
+ setupProgram(mVerticalBlurProgram, mFirstPassTextureId, GLES30.GL_TEXTURE_2D);
+ setVerticalUniformsAndAttributes();
+
+ renderToSurface();
+ cleanupResources();
+ }
+
+ /**
+ * Cleans up all OpenGL resources used by programs in this class
+ */
+ public void cleanupResources() {
+ deleteFramebufferTexture();
+ deleteFrameBuffer();
+ deletePrograms();
+
+ GLES30.glFlush();
+ }
+
+ /**
+ * Attaches a 2D texture image to the active framebuffer object
+ *
+ * @param textureId The ID of the texture to be attached
+ */
+ private void setupTextureForFramebuffer(int textureId) {
+ GLES30.glTexImage2D(GLES30.GL_TEXTURE_2D, 0, GLES30.GL_RGB, mWidth, mHeight, 0,
+ GLES30.GL_RGB, GLES30.GL_UNSIGNED_BYTE, null);
+ GLHelper.checkGlErrors("glTexImage2D");
+ GLES30.glFramebufferTexture2D(GLES30.GL_FRAMEBUFFER, GLES30.GL_COLOR_ATTACHMENT0,
+ GLES30.GL_TEXTURE_2D, textureId, 0);
+ GLHelper.checkGlErrors("glFramebufferTexture2D");
+ }
+
+ /**
+ * Deletes the texture stored in the framebuffer
+ */
+ private void deleteFramebufferTexture() {
+ GLES30.glDeleteTextures(mFirstPassTextureBuffer.capacity(), mFirstPassTextureBuffer);
+ GLHelper.checkGlErrors("glDeleteTextures");
+ }
+
+ /**
+ * Deletes the frame buffers.
+ */
+ private void deleteFrameBuffer() {
+ GLES30.glDeleteBuffers(1, mFrameBuffer);
+ GLHelper.checkGlErrors("glDeleteBuffers");
+ }
+
+ /**
+ * Deletes the GL programs.
+ */
+ private void deletePrograms() {
+ GLES30.glDeleteProgram(mHorizontalBlurProgram);
+ GLHelper.checkGlErrors("glDeleteProgram");
+ GLES30.glDeleteProgram(mVerticalBlurProgram);
+ GLHelper.checkGlErrors("glDeleteProgram");
+ }
+
+ /**
+ * Set all of the Uniform and Attribute variable values for the horizontal blur program
+ */
+ private void setHorizontalUniformsAndAttributes() {
+ GLES30.glUniformMatrix4fv(mUHorizontalMVPMatrixLoc, 1, false, GLHelper.getIdentityMatrix(),
+ 0);
+ GLES30.glUniformMatrix4fv(mUHorizontalTexMatrixLoc, 1, false, mTexMatrix, 0);
+ GLES30.glUniform3fv(mUHorizontalResolutionLoc, 1, mResolutionBuffer);
+ GLES30.glUniform1f(mUHorizontalRadiusLoc, BLUR_RADIUS);
+
+ GLES30.glEnableVertexAttribArray(mAHorizontalPositionLoc);
+ GLES30.glVertexAttribPointer(mAHorizontalPositionLoc, NUM_COORDS_PER_VERTEX,
+ GLES30.GL_FLOAT, false, NUM_COORDS_PER_VERTEX * SIZEOF_FLOAT, mVertexBuffer);
+
+ GLES30.glEnableVertexAttribArray(mAHorizontalTextureCoordLoc);
+ GLES30.glVertexAttribPointer(mAHorizontalTextureCoordLoc, 2,
+ GLES30.GL_FLOAT, false, 2 * SIZEOF_FLOAT, mTexBuffer);
+ }
+
+ /**
+ * Set all of the Uniform and Attribute variable values for the vertical blur program
+ */
+ private void setVerticalUniformsAndAttributes() {
+ GLES30.glUniformMatrix4fv(mUVerticalMVPMatrixLoc, 1, false, GLHelper.getIdentityMatrix(),
+ 0);
+ GLES30.glUniformMatrix4fv(mUVerticalTexMatrixLoc, 1, false, mTexMatrix, 0);
+ GLES30.glUniform3fv(mUVerticalResolutionLoc, 1, mResolutionBuffer);
+ GLES30.glUniform1f(mUVerticalRadiusLoc, BLUR_RADIUS);
+
+ GLES30.glEnableVertexAttribArray(mAVerticalPositionLoc);
+ GLES30.glVertexAttribPointer(mAVerticalPositionLoc, NUM_COORDS_PER_VERTEX,
+ GLES30.GL_FLOAT, false, NUM_COORDS_PER_VERTEX * SIZEOF_FLOAT, mVertexBuffer);
+
+ GLES30.glEnableVertexAttribArray(mAVerticalTextureCoordLoc);
+ GLES30.glVertexAttribPointer(mAVerticalTextureCoordLoc, 2,
+ GLES30.GL_FLOAT, false, 2 * SIZEOF_FLOAT, mInvertedTexBuffer);
+ }
+
+ /**
+ * Sets the program to be used in the next rendering, and binds
+ * a texture to it
+ *
+ * @param programId The Id of the program
+ * @param textureId The Id of the texture to be bound
+ * @param textureTarget The type of texture that is being bound
+ */
+ private void setupProgram(int programId, int textureId, int textureTarget) {
+ GLES30.glUseProgram(programId);
+ GLHelper.checkGlErrors("glUseProgram");
+
+ GLES30.glActiveTexture(GLES30.GL_TEXTURE0);
+ GLHelper.checkGlErrors("glActiveTexture");
+
+ GLES30.glBindTexture(textureTarget, textureId);
+ GLHelper.checkGlErrors("glBindTexture");
+ }
+
+ /**
+ * Renders to a framebuffer using the current active program
+ *
+ * @param framebufferId The Id of the framebuffer being rendered to
+ */
+ private void renderToFramebuffer(int framebufferId) {
+ GLES30.glClear(GLES30.GL_COLOR_BUFFER_BIT);
+ GLHelper.checkGlErrors("glClear");
+
+ GLES30.glBindFramebuffer(GLES30.GL_FRAMEBUFFER, framebufferId);
+ GLHelper.checkGlErrors("glBindFramebuffer");
+
+ GLES30.glViewport(0, 0, mWidth, mHeight);
+ GLHelper.checkGlErrors("glViewport");
+
+ GLES30.glDrawArrays(GLES30.GL_TRIANGLE_STRIP, 0,
+ FRAME_COORDS.length / NUM_COORDS_PER_VERTEX);
+ GLHelper.checkGlErrors("glDrawArrays");
+
+ GLES30.glBindFramebuffer(GLES30.GL_FRAMEBUFFER, 0);
+ }
+
+ /**
+ * Renders to a the GLSurface using the current active program
+ */
+ private void renderToSurface() {
+ GLES30.glBindFramebuffer(GLES30.GL_FRAMEBUFFER, 0);
+ GLHelper.checkGlErrors("glDrawArrays");
+
+ GLES30.glClear(GLES30.GL_COLOR_BUFFER_BIT);
+ GLHelper.checkGlErrors("glDrawArrays");
+
+ GLES30.glDrawArrays(GLES30.GL_TRIANGLE_STRIP, 0,
+ FRAME_COORDS.length / NUM_COORDS_PER_VERTEX);
+ GLHelper.checkGlErrors("glDrawArrays");
+ }
+
+ private void assertValidFramebufferStatus() {
+ if (GLES30.glCheckFramebufferStatus(GLES30.GL_FRAMEBUFFER)
+ != GLES30.GL_FRAMEBUFFER_COMPLETE) {
+ throw new RuntimeException(
+ "Failed to attach Framebuffer. Framebuffer status code is: "
+ + GLES30.glCheckFramebufferStatus(GLES30.GL_FRAMEBUFFER));
+ }
+ }
+}
diff --git a/service/src/com/android/car/pm/blurredbackground/BlurredSurfaceRenderer.java b/service/src/com/android/car/pm/blurredbackground/BlurredSurfaceRenderer.java
new file mode 100644
index 0000000..2f6eb6d
--- /dev/null
+++ b/service/src/com/android/car/pm/blurredbackground/BlurredSurfaceRenderer.java
@@ -0,0 +1,192 @@
+/*
+ * 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.car.pm.blurredbackground;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.graphics.SurfaceTexture;
+import android.opengl.GLES11Ext;
+import android.opengl.GLES30;
+import android.opengl.GLSurfaceView;
+import android.os.IBinder;
+import android.util.Log;
+import android.view.Surface;
+import android.view.SurfaceControl;
+
+import com.android.car.R;
+
+import java.nio.IntBuffer;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+/**
+ * The renderer class for the {@link GLSurfaceView} of the {@link ActivityBlockingActivity}
+ */
+public class BlurredSurfaceRenderer implements GLSurfaceView.Renderer {
+
+ private static final String TAG = "BlurredSurfaceRenderer";
+ private static final int NUM_INDICES_TO_RENDER = 4;
+
+ private final String mVertexShader;
+ private final String mHorizontalBlurShader;
+ private final String mVerticalBlurShader;
+ private final Rect mWindowRect;
+
+ private BlurTextureProgram mProgram;
+ private SurfaceTexture mSurfaceTexture;
+ private Surface mSurface;
+
+ private int mScreenshotTextureId;
+ private final IntBuffer mScreenshotTextureBuffer = IntBuffer.allocate(1);
+ private final float[] mTexMatrix = new float[16];
+
+ private final boolean mShadersLoadedSuccessfully;
+ private final boolean mShouldRenderBlurred;
+ private boolean mIsScreenShotCaptured = false;
+
+ /**
+ * Constructs a new {@link BlurredSurfaceRenderer} and loads the shaders
+ * needed for rendering a blurred texture
+ *
+ * @param windowRect Rect that represents the application window
+ */
+ public BlurredSurfaceRenderer(Context context, Rect windowRect, boolean shouldRenderBlurred) {
+ mShouldRenderBlurred = shouldRenderBlurred;
+
+ mVertexShader = GLHelper.getShaderFromRaw(context, R.raw.vertex_shader);
+ mHorizontalBlurShader = GLHelper.getShaderFromRaw(context,
+ R.raw.horizontal_blur_fragment_shader);
+ mVerticalBlurShader = GLHelper.getShaderFromRaw(context,
+ R.raw.vertical_blur_fragment_shader);
+
+ mShadersLoadedSuccessfully = mVertexShader != null
+ && mHorizontalBlurShader != null
+ && mVerticalBlurShader != null;
+
+ mWindowRect = windowRect;
+ }
+
+ @Override
+ public void onSurfaceCreated(GL10 gl, EGLConfig config) {
+ mScreenshotTextureId = GLHelper.createAndBindTextureObject(mScreenshotTextureBuffer,
+ GLES11Ext.GL_TEXTURE_EXTERNAL_OES);
+
+ mSurfaceTexture = new SurfaceTexture(mScreenshotTextureId);
+ mSurface = new Surface(mSurfaceTexture);
+
+ if (mShouldRenderBlurred) {
+ mIsScreenShotCaptured = captureScreenshot();
+ }
+ }
+
+ @Override
+ public void onSurfaceChanged(GL10 gl, int width, int height) {
+ }
+
+ @Override
+ public void onDrawFrame(GL10 gl) {
+ if (shouldDrawFrame()) {
+ mProgram = new BlurTextureProgram(
+ mScreenshotTextureBuffer,
+ mTexMatrix,
+ mVertexShader,
+ mHorizontalBlurShader,
+ mVerticalBlurShader,
+ mWindowRect
+ );
+ mProgram.render();
+ } else {
+ logWillNotRenderBlurredMsg();
+
+ // If we determine we shouldn't render a blurred texture, we
+ // will default to rendering a transparent GLSurfaceView so that
+ // the ActivityBlockingActivity appears translucent
+ renderTransparent();
+ }
+ }
+
+ private void renderTransparent() {
+ GLES30.glClear(GLES30.GL_COLOR_BUFFER_BIT);
+ GLES30.glDrawArrays(GLES30.GL_TRIANGLE_STRIP, /*first index to render */ 0,
+ NUM_INDICES_TO_RENDER);
+ }
+
+ /**
+ * Called when the ActivityBlockingActivity pauses
+ * cleans up the OpenGL program
+ */
+ public void onPause() {
+ mProgram.cleanupResources();
+ deleteScreenshotTexture();
+ }
+
+ private boolean captureScreenshot() {
+ boolean isScreenshotCaptured = false;
+
+ try {
+ final IBinder token = SurfaceControl.getInternalDisplayToken();
+ if (token == null) {
+ Log.e(TAG,
+ "Could not find display token for screenshot. Will not capture screenshot");
+ } else {
+ SurfaceControl.screenshot(
+ token,
+ mSurface,
+ mWindowRect,
+ mWindowRect.width(),
+ mWindowRect.height(),
+ /* useIdentityTransform= */ false,
+ Surface.ROTATION_0
+ );
+
+ mSurfaceTexture.updateTexImage();
+ mSurfaceTexture.getTransformMatrix(mTexMatrix);
+ isScreenshotCaptured = true;
+ }
+
+ } finally {
+ mSurface.release();
+ mSurfaceTexture.release();
+ }
+
+ return isScreenshotCaptured;
+ }
+
+ private void deleteScreenshotTexture() {
+ GLES30.glDeleteTextures(mScreenshotTextureBuffer.capacity(), mScreenshotTextureBuffer);
+ GLHelper.checkGlErrors("glDeleteTextures");
+
+ mIsScreenShotCaptured = false;
+ }
+
+ private void logWillNotRenderBlurredMsg() {
+ if (!mIsScreenShotCaptured) {
+ Log.e(TAG, "Screenshot was not captured. Will not render blurred surface");
+ }
+ if (!mShadersLoadedSuccessfully) {
+ Log.e(TAG, "Shaders were not loaded successfully. Will not render blurred surface");
+ }
+ }
+
+ private boolean shouldDrawFrame() {
+ return mIsScreenShotCaptured
+ && mShadersLoadedSuccessfully
+ && mShouldRenderBlurred;
+ }
+}
+
diff --git a/service/src/com/android/car/pm/blurredbackground/GLHelper.java b/service/src/com/android/car/pm/blurredbackground/GLHelper.java
new file mode 100644
index 0000000..42df687
--- /dev/null
+++ b/service/src/com/android/car/pm/blurredbackground/GLHelper.java
@@ -0,0 +1,195 @@
+/*
+ * 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.car.pm.blurredbackground;
+
+import android.content.Context;
+import android.opengl.GLES30;
+import android.opengl.Matrix;
+import android.os.Build;
+import android.util.Log;
+import android.util.Slog;
+
+import androidx.annotation.Nullable;
+
+import libcore.io.Streams;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+
+/**
+ * A helper class for simple OpenGL operations
+ */
+public class GLHelper {
+
+ private static final String TAG = "GLHelper";
+ private static final int SIZEOF_FLOAT = 4;
+
+ /**
+ * Creates an OpenGL program that uses the provided shader sources
+ * and returns the id of the created program
+ *
+ * @param vertexShaderSource The source for the vertex shader
+ * @param fragmentShaderSource The source for the fragment shader
+ * @return The id of the created program
+ */
+ public static int createProgram(String vertexShaderSource, String fragmentShaderSource) {
+ int vertexShader = compileShader(GLES30.GL_VERTEX_SHADER, vertexShaderSource);
+ int fragmentShader = compileShader(GLES30.GL_FRAGMENT_SHADER, fragmentShaderSource);
+
+ int programId = GLES30.glCreateProgram();
+ checkGlErrors("glCreateProgram");
+
+ GLES30.glAttachShader(programId, vertexShader);
+ GLES30.glAttachShader(programId, fragmentShader);
+
+ // glDeleteShader flags these shaders to be deleted, the shaders
+ // are not actually deleted until the program they are attached to are deleted
+ GLES30.glDeleteShader(vertexShader);
+ checkGlErrors("glDeleteShader");
+ GLES30.glDeleteShader(fragmentShader);
+ checkGlErrors("glDeleteShader");
+
+ GLES30.glLinkProgram(programId);
+ checkGlErrors("glLinkProgram");
+
+ return programId;
+ }
+
+ /**
+ * Creates and binds a texture and returns the id of the created texture
+ *
+ * @param textureIdBuffer The IntBuffer that will contain the created texture id
+ * @param textureTarget The texture target for the created texture
+ * @return The id of the created and bound texture
+ */
+ public static int createAndBindTextureObject(IntBuffer textureIdBuffer, int textureTarget) {
+ GLES30.glGenTextures(1, textureIdBuffer);
+
+ int textureId = textureIdBuffer.get(0);
+
+ GLES30.glBindTexture(textureTarget, textureId);
+ checkGlErrors("glBindTexture");
+
+ // We define the filters that will be applied to the textures if
+ // they get minified or magnified when they are sampled
+ GLES30.glTexParameterf(textureTarget, GLES30.GL_TEXTURE_MIN_FILTER,
+ GLES30.GL_LINEAR);
+ GLES30.glTexParameterf(textureTarget, GLES30.GL_TEXTURE_MAG_FILTER,
+ GLES30.GL_LINEAR);
+
+ // Set the wrap parameters for if the edges of the texture do not fill the surface
+ GLES30.glTexParameteri(textureTarget, GLES30.GL_TEXTURE_WRAP_S,
+ GLES30.GL_CLAMP_TO_EDGE);
+ GLES30.glTexParameteri(textureTarget, GLES30.GL_TEXTURE_WRAP_T,
+ GLES30.GL_CLAMP_TO_EDGE);
+
+ return textureId;
+ }
+
+ /**
+ * Creates and binds a Framebuffer object
+ *
+ * @param frameBuffer the IntBuffer that will contain the created Framebuffer ID
+ * @return The id of the created and bound Framebuffer
+ */
+ public static int createAndBindFramebuffer(IntBuffer frameBuffer) {
+ GLES30.glGenFramebuffers(1, frameBuffer);
+ checkGlErrors("glGenFramebuffers");
+
+ int frameBufferId = frameBuffer.get(0);
+
+ GLES30.glBindFramebuffer(GLES30.GL_FRAMEBUFFER, frameBufferId);
+ checkGlErrors("glBindFramebuffer");
+
+ return frameBufferId;
+ }
+
+ /**
+ * Retrieves a string of an OpenGL shader
+ *
+ * @param id the ID of the raw shader resource
+ * @return The shader script, null if the shader failed to load
+ */
+ public static @Nullable String getShaderFromRaw(Context context, int id) {
+ try {
+ InputStream stream = context.getResources().openRawResource(id);
+ return new String(Streams.readFully(new InputStreamReader(stream)));
+ } catch (IOException e) {
+ Log.e(TAG, "Failed to load shader");
+ return null;
+ }
+ }
+
+ /**
+ * Creates a FloatBuffer to hold texture and vertex coordinates
+ *
+ * @param coords The coordinates that will be held in the FloatBuffer
+ * @return a FloatBuffer containing the provided coordinates
+ */
+ public static FloatBuffer createFloatBuffer(float[] coords) {
+ ByteBuffer byteBuffer = ByteBuffer.allocateDirect(coords.length * SIZEOF_FLOAT);
+ byteBuffer.order(ByteOrder.nativeOrder());
+
+ FloatBuffer floatBuffer = byteBuffer.asFloatBuffer();
+ floatBuffer.put(coords);
+ floatBuffer.position(0);
+ return floatBuffer;
+ }
+
+ /**
+ * @return a float[] representing a 4x4 identity matrix
+ */
+ public static float[] getIdentityMatrix() {
+ float[] identityMatrix = new float[16];
+ Matrix.setIdentityM(identityMatrix, 0);
+ return identityMatrix;
+ }
+
+ /**
+ * Checks for GL errors, logging any errors found
+ *
+ * @param func The name of the most recent GL function called
+ * @return a boolean representing if there was a GL error or not
+ */
+ public static boolean checkGlErrors(String func) {
+ boolean hadError = false;
+ int error;
+
+ while ((error = GLES30.glGetError()) != GLES30.GL_NO_ERROR) {
+ if (Build.IS_ENG || Build.IS_USERDEBUG) {
+ Slog.e(TAG, func + " failed: error " + error, new Throwable());
+ }
+ hadError = true;
+ }
+ return hadError;
+ }
+
+ private static int compileShader(int shaderType, String shaderSource) {
+ int shader = GLES30.glCreateShader(shaderType);
+ GLES30.glShaderSource(shader, shaderSource);
+
+ GLES30.glCompileShader(shader);
+ checkGlErrors("glCompileShader");
+
+ return shader;
+ }
+}
diff --git a/tests/CarDeveloperOptions/res/values-ar/strings.xml b/tests/CarDeveloperOptions/res/values-ar/strings.xml
index 1eb5f82..48fb99b 100644
--- a/tests/CarDeveloperOptions/res/values-ar/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ar/strings.xml
@@ -93,7 +93,7 @@
<string name="font_size_preview_text_title" msgid="2593520249400910305">"ساحر أوز العجيب"</string>
<string name="font_size_preview_text_subtitle" msgid="6106782964143379331">"الفصل ۱۱: مدينة أوز الزمردية العجيبة"</string>
<string name="font_size_preview_text_body" msgid="6803085337474390845">"على الرغم من احتماء دورثي ورفاقها خلف نظارات خضراء، انبهرت عيونهم للوهلة الأولى بتوهج المدينة العجيبة وتألقها. كانت المنازل الرائعة أمامهم متراصة على الشوارع ومصممة جميعها من الرخام الأخضر المرصع بالزمرّد البرّاق. ساروا على رصيف من الرخام الأخضر نفسه حيث تلتقي المباني الضخمة على صفوف من الزمرد المتلألئ تحت أشعة الشمس الساطعة. كانت ألواح النوافذ الزجاجية خضراء هي أيضًا، حتى أنّ السماء وأشعة الشمس تلوّنت بالأخضر الفاتح. \n\nرأوا الكثير من الرجال والنساء والأطفال يجوبون الشوارع وجميعهم في ثياب خضراء فوق بشرة تميل إلى الأخضر. نظروا إلى دورثي ورفاقها الغريبين بتعجب، في حين أنّ الأطفال اختبأوا وراء أمهاتهم خائفين من الأسد، ولكن لم يتحدث معهم أحد. اصطفّت في الشارع المتاجر الخضراء ولاحظت دورثي أنّ كل ما فيها كان أخضر، من الحلوى الخضراء والفشار الأخضر إلى الأحذية والقبعات والملابس الخضراء. وفي أحد الأركان، وقف رجل يبيع الليموناضة الخضراء ورأت دورثي أنّ الأطفال كانوا يشترون العصير منه بعملة خضراء هي أيضًا. \n\nخلت الشوارع من الأحصنة أو أي نوع آخر من الحيوانات، وكان الرجال ينقلون أمتعتهم في عربات خضراء صغيرة يدفعونها أمامهم. وبدت ملامح السعادة والارتياح على وجوه الجميع."</string>
- <string name="font_size_save" msgid="8652044574655753921">"موافق"</string>
+ <string name="font_size_save" msgid="8652044574655753921">"حسنًا"</string>
<string name="sdcard_setting" product="nosdcard" msgid="1533784309105748696">"وحدة تخزين USB"</string>
<string name="sdcard_setting" product="default" msgid="8398782065765523178">"بطاقة SD"</string>
<string name="bluetooth" msgid="1564520421786841227">"بلوتوث"</string>
@@ -136,7 +136,7 @@
<string name="device_picker" msgid="8345264486071697705">"اختيار جهاز البلوتوث"</string>
<string name="bluetooth_ask_enablement" msgid="8716802066127746062">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> تفعيل البلوتوث"</string>
<string name="bluetooth_ask_disablement" msgid="7125319551097350783">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> إيقاف البلوتوث"</string>
- <string name="bluetooth_ask_enablement_no_name" msgid="6105893027185475233">"يريد أحد التطبيقات تشغيل بلوتوث"</string>
+ <string name="bluetooth_ask_enablement_no_name" msgid="6105893027185475233">"يريد أحد التطبيقات تفعيل بلوتوث"</string>
<string name="bluetooth_ask_disablement_no_name" msgid="8648888502291681310">"يريد أحد التطبيقات إيقاف البلوتوث"</string>
<string name="bluetooth_ask_discovery" product="tablet" msgid="6871595755186170115">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> أن يكون جهازك اللوحي مرئيًا لأجهزة بلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%2$d</xliff:g> من الثواني."</string>
<string name="bluetooth_ask_discovery" product="default" msgid="3388041479101348095">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> أن يكون هاتفك مرئيًا لأجهزة بلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%2$d</xliff:g> من الثواني."</string>
@@ -183,7 +183,7 @@
<string name="connected_device_available_call_title" msgid="6774859446815858428">"أجهزة الاتصال المتاحة"</string>
<string name="connected_device_connected_title" msgid="6255107326608785482">"الأجهزة المتصلة حاليًا"</string>
<string name="connected_device_saved_title" msgid="8270136893488475163">"الأجهزة المحفوظة"</string>
- <string name="connected_device_add_device_summary" msgid="7960491471270158891">"سيتم تشغيل بلوتوث للإقران"</string>
+ <string name="connected_device_add_device_summary" msgid="7960491471270158891">"سيتم تفعيل بلوتوث للإقران"</string>
<string name="connected_device_connections_title" msgid="9205000271382018428">"إعدادات الاتصال المفضّلة"</string>
<string name="connected_device_previously_connected_title" msgid="225918223397410428">"الأجهزة المتصلة سابقًا"</string>
<string name="connected_device_previously_connected_screen_title" msgid="2018789662358162716">"الأجهزة المتصلة سابقًا"</string>
@@ -206,7 +206,7 @@
<string name="proxy_action_text" msgid="814511434843981413">"تم"</string>
<string name="proxy_hostname_label" msgid="6798891831427287847">"اسم المضيف للخادم الوكيل"</string>
<string name="proxy_error" msgid="5036164133669802299">"تنبيه"</string>
- <string name="proxy_error_dismiss" msgid="883805570485635650">"موافق"</string>
+ <string name="proxy_error_dismiss" msgid="883805570485635650">"حسنًا"</string>
<string name="proxy_error_invalid_host" msgid="5430640241353307223">"اسم المضيف الذي كتبته غير صالح."</string>
<string name="proxy_error_invalid_exclusion_list" msgid="4314503082913856333">"لم يتم تنسيق قائمة الاستبعاد التي كتبتها بشكل صحيح. اكتب قائمة مفصولة بفواصل للنطاقات المستبعدة."</string>
<string name="proxy_error_empty_port" msgid="8034561724923076215">"يلزمك إكمال حقل المنفذ."</string>
@@ -224,7 +224,7 @@
<string name="radio_info_roaming_label" msgid="3131949337031835485">"تجوال:"</string>
<string name="radio_info_imei_label" msgid="7300156592358133405">"IMEI:"</string>
<string name="radio_info_call_redirect_label" msgid="2679891718182753061">"إعادة توجيه الاتصال:"</string>
- <string name="radio_info_ppp_resets_label" msgid="2785162965440312941">"عدد مرات إعادة تعيين PPP منذ التشغيل:"</string>
+ <string name="radio_info_ppp_resets_label" msgid="2785162965440312941">"عدد مرات إعادة ضبط PPP منذ التشغيل:"</string>
<string name="radio_info_current_network_label" msgid="5785805819312999094">"الشبكة الحالية:"</string>
<string name="radio_info_ppp_received_label" msgid="5217391494757374330">"البيانات المستلمة:"</string>
<string name="radio_info_gsm_service_label" msgid="7488842563230281026">"الخدمة الصوتية:"</string>
@@ -299,7 +299,7 @@
<string name="sd_card_settings_label" product="default" msgid="1074813865245983607">"بطاقة SD"</string>
<string name="proxy_settings_label" msgid="7219106162267925123">"إعدادات الخادم الوكيل"</string>
<string name="cancel" msgid="2582602392048772404">"إلغاء"</string>
- <string name="okay" msgid="5838476766924989056">"موافق"</string>
+ <string name="okay" msgid="5838476766924989056">"حسنًا"</string>
<string name="forget" msgid="7735525146062672874">"نسيان"</string>
<string name="save" msgid="3418211178410498517">"حفظ"</string>
<string name="done" msgid="5143229467535372339">"تم"</string>
@@ -391,9 +391,9 @@
<string name="account_settings_title" msgid="7870321267198486578">"الحسابات"</string>
<string name="security_settings_title" msgid="8228075165942416425">"الأمان"</string>
<string name="encryption_and_credential_settings_title" msgid="6911729638397745353">"التشفير وبيانات الاعتماد"</string>
- <string name="encryption_and_credential_settings_summary" product="default" msgid="468749700109808546">"تم تشفير الهاتف"</string>
+ <string name="encryption_and_credential_settings_summary" product="default" msgid="468749700109808546">"تم ترميز الهاتف"</string>
<string name="decryption_settings_summary" product="default" msgid="7401802133199522441">"الهاتف ليس مشفّرًا."</string>
- <string name="encryption_and_credential_settings_summary" product="tablet" msgid="8170667308598998791">"تم تشفير الجهاز"</string>
+ <string name="encryption_and_credential_settings_summary" product="tablet" msgid="8170667308598998791">"تم ترميز الجهاز"</string>
<string name="decryption_settings_summary" product="tablet" msgid="7524119945312453569">"الجهاز ليس مشفرًا."</string>
<string name="lockscreen_settings_title" msgid="1221505938891948413">"عرض شاشة القفل"</string>
<string name="lockscreen_settings_what_to_show_category" msgid="3133378945821488654">"ما يتم عرضه"</string>
@@ -522,13 +522,13 @@
<string name="fingerprint_last_delete_message_profile_challenge" msgid="5385095150532247025">"لن تتمكن من استخدام بصمات إصبعك لإلغاء تأمين الملف الشخصي للعمل، أو السماح بعمليات الشراء، أو تسجيل الدخول إلى تطبيقات العمل"</string>
<string name="fingerprint_last_delete_confirm" msgid="7984595457589664004">"نعم، إزالة"</string>
<string name="crypt_keeper_settings_title" msgid="839783588093862748">"التشفير"</string>
- <string name="crypt_keeper_encrypt_title" product="tablet" msgid="2292129135369853167">"تشفير الجهاز اللوحي"</string>
- <string name="crypt_keeper_encrypt_title" product="default" msgid="3110852053238357832">"تشفير الهاتف"</string>
+ <string name="crypt_keeper_encrypt_title" product="tablet" msgid="2292129135369853167">"ترميز الجهاز اللوحي"</string>
+ <string name="crypt_keeper_encrypt_title" product="default" msgid="3110852053238357832">"ترميز الهاتف"</string>
<string name="crypt_keeper_encrypted_summary" msgid="2438498691741626642">"مشفّر"</string>
- <string name="crypt_keeper_desc" product="tablet" msgid="9142792050252407734">"يمكنك تشفير حساباتك وإعداداتك والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. وبعد تشفير جهازك اللوحي، بافتراض أنك قد أعددت قفل الشاشة (باستخدام نقش أو رقم تعريف شخصي أو كلمة مرور)، يجب فتح قفل الشاشة لفك تشفير الجهاز اللوحي في كل مرة تشغله فيها. والوسيلة الأخرى الوحيدة لفك تشفير الجهاز هي إجراء إعادة الضبط على الإعدادات الأصلية، ومحو كل بياناتك.\n\nيستغرق التشفير ساعة أو أكثر. ويجب البدء ببطارية مشحونة وتوصيل الجهاز اللوحي بالشاحن أثناء عملية التشفير. فإذا أوقفت العملية، ستفقد بعض أو كل بياناتك"</string>
- <string name="crypt_keeper_desc" product="default" msgid="1996334685607444282">"يمكنك تشفير حساباتك وإعداداتك والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. وبعد تشفير هاتفك، وبافتراض أنك قد أعددت قفل الشاشة (عبر النقش أو رقم التعريف الشخصي أو كلمة المرور)، يجب فتح قفل الشاشة لفك تشفير الهاتف في كل مرة تشغله فيها. الطريقة الوحيدة الأخرى لفك تشفير الجهاز هي إجراء إعادة الضبط على الإعدادات الأصلية، ومحو كل بياناتك.\n\nيستغرق التشفير ساعة أو أكثر. يجب البدء ببطارية مشحونة وتوصيل الهاتف بالشاحن أثناء عملية التشفير. فإذا أوقفت هذه العملية، ستفقد بعض أو كل البيانات."</string>
- <string name="crypt_keeper_button_text" product="tablet" msgid="7918671468758813824">"تشفير الجهاز اللوحي"</string>
- <string name="crypt_keeper_button_text" product="default" msgid="8737394386627318489">"تشفير الهاتف"</string>
+ <string name="crypt_keeper_desc" product="tablet" msgid="9142792050252407734">"يمكنك ترميز حساباتك وإعداداتك والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. وبعد ترميز جهازك اللوحي، بافتراض أنك قد أعددت قفل الشاشة (باستخدام نقش أو رقم تعريف شخصي أو كلمة مرور)، يجب فتح قفل الشاشة لفك ترميز الجهاز اللوحي في كل مرة تشغله فيها. والوسيلة الأخرى الوحيدة لفك ترميز الجهاز هي إجراء إعادة الضبط على الإعدادات الأصلية، ومحو كل بياناتك.\n\nيستغرق الترميز ساعة أو أكثر. ويجب البدء ببطارية مشحونة وتوصيل الجهاز اللوحي بالشاحن أثناء عملية الترميز. فإذا أوقفت العملية، ستفقد بعض أو كل بياناتك"</string>
+ <string name="crypt_keeper_desc" product="default" msgid="1996334685607444282">"يمكنك ترميز حساباتك وإعداداتك والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. وبعد ترميز هاتفك، وبافتراض أنك قد أعددت قفل الشاشة (عبر النقش أو رقم التعريف الشخصي أو كلمة المرور)، يجب فتح قفل الشاشة لفك ترميز الهاتف في كل مرة تشغله فيها. الطريقة الوحيدة الأخرى لفك ترميز الجهاز هي إجراء إعادة الضبط على الإعدادات الأصلية، ومحو كل بياناتك.\n\nيستغرق الترميز ساعة أو أكثر. يجب البدء ببطارية مشحونة وتوصيل الهاتف بالشاحن أثناء عملية الترميز. فإذا أوقفت هذه العملية، ستفقد بعض أو كل البيانات."</string>
+ <string name="crypt_keeper_button_text" product="tablet" msgid="7918671468758813824">"ترميز الجهاز اللوحي"</string>
+ <string name="crypt_keeper_button_text" product="default" msgid="8737394386627318489">"ترميز الهاتف"</string>
<string name="crypt_keeper_low_charge_text" msgid="1422879728632636311">"اشحن البطارية وأعد المحاولة."</string>
<string name="crypt_keeper_unplugged_text" msgid="6597684068340036200">"صل الشاحن وأعد المحاولة."</string>
<string name="crypt_keeper_dialog_need_password_title" msgid="8532211509636340535">"ليس هناك رقم تعريف شخصي (PIN) أو كلمة مرور لتأمين الشاشة"</string>
@@ -537,10 +537,10 @@
<string name="crypt_keeper_final_desc" product="tablet" msgid="2713708841024805586">"لا يمكن التراجع عن عملية التشفير، وفي حالة مقاطعتها، ستفقد البيانات. تستغرق عملية التشفير ساعة أو أكثر، وسيتم خلالها إعادة تشغيل الجهاز اللوحي عدة مرات."</string>
<string name="crypt_keeper_final_desc" product="default" msgid="2483549885938505746">"لا يمكن التراجع عن عملية التشفير، وفي حالة مقاطعتها، ستفقد البيانات. تستغرق عملية التشفير ساعة أو أكثر، وسيتم خلالها إعادة تشغيل الهاتف عدة مرات."</string>
<string name="crypt_keeper_setup_title" msgid="5444657765706199408">"التشفير"</string>
- <string name="crypt_keeper_setup_description" product="tablet" msgid="9129783898699975969">"انتظر حتى يتم تشفير الجهاز اللوحي. اكتمل <xliff:g id="PERCENT">^1</xliff:g>%."</string>
- <string name="crypt_keeper_setup_description" product="default" msgid="3391750289253411494">"انتظر حتى يتم تشفير هاتفك. اكتمل <xliff:g id="PERCENT">^1</xliff:g>%."</string>
- <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="7841271240063858796">"انتظر بينما يتم تشفير جهازك اللوحي. الوقت المتبقي: <xliff:g id="DURATION">^1</xliff:g>"</string>
- <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8049188590821796173">"انتظر بينما يتم تشفير هاتفك. الوقت المتبقي: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_description" product="tablet" msgid="9129783898699975969">"انتظر حتى يتم ترميز الجهاز اللوحي. اكتمل <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+ <string name="crypt_keeper_setup_description" product="default" msgid="3391750289253411494">"انتظر حتى يتم ترميز هاتفك. اكتمل <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="7841271240063858796">"انتظر بينما يتم ترميز جهازك اللوحي. الوقت المتبقي: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8049188590821796173">"انتظر بينما يتم ترميز هاتفك. الوقت المتبقي: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_force_power_cycle" product="tablet" msgid="9168213181845231795">"لإلغاء تأمين الجهاز اللوحي، يمكنك إيقافه وتشغيله مرة أخرى."</string>
<string name="crypt_keeper_force_power_cycle" product="default" msgid="1182690469082263666">"لإلغاء تأمين الهاتف، يمكنك إيقافه وتشغيله مرة أخرى."</string>
<string name="crypt_keeper_warn_wipe" msgid="700814581500057050">"تحذير: سيتم محو محتوى جهازك بعد فشل <xliff:g id="COUNT">^1</xliff:g> من المحاولات الأخرى في فتح القفل!"</string>
@@ -892,7 +892,7 @@
<string name="nfc_quick_toggle_title" msgid="4990697912813795002">"الاتصالات قصيرة المدى (NFC)"</string>
<string name="nfc_quick_toggle_summary" product="tablet" msgid="983451155092850657">"السماح بتبادل البيانات عندما يلمس الجهاز اللوحي جهازًا آخر"</string>
<string name="nfc_quick_toggle_summary" product="default" msgid="7141056939052895142">"السماح بتبادل البيانات عندما يلمس الهاتف جهازًا آخر"</string>
- <string name="nfc_disclaimer_title" msgid="4860231267351602970">"تشغيل NFC"</string>
+ <string name="nfc_disclaimer_title" msgid="4860231267351602970">"تفعيل NFC"</string>
<string name="nfc_disclaimer_content" msgid="3066113577854565782">"يتم من خلال تقنية الاتصال بالحقل القريب (NFC) تبادل البيانات بين هذا الجهاز والأجهزة أو الأهداف المجاورة الأخرى، مثل محطات الدفع وبرامج قراءة الوصول والعلامات أو الإعلانات التفاعلية."</string>
<string name="nfc_secure_settings_title" msgid="5153751163174916581">"تأمين الاتصال بالحقل القريب (NFC)"</string>
<string name="nfc_secure_toggle_summary" product="default" msgid="7631183023440112192">"السماح باستخدام \"الدفع والتقل عبر تقنية NFC\" فقط عندما تكون الشاشة مفتوحة"</string>
@@ -919,7 +919,7 @@
<string name="wifi_notify_open_networks_summary" msgid="1383681260705466715">"الإشعار عند توفر شبكة عامة عالية الجودة"</string>
<string name="wifi_wakeup" msgid="4963732992164721548">"تشغيل اتّصال Wi‑Fi تلقائيًا"</string>
<string name="wifi_wakeup_summary" msgid="1152699417411690">"إعادة تشغيل اتّصال Wi‑Fi بالقرب من الشبكات المحفوظة العالية الجودة، مثل الشبكة المنزلية"</string>
- <string name="wifi_wakeup_summary_no_location" msgid="3007457288587966962">"غير متاحة نظرًا لإيقاف خدمة الموقع. شغّل خدمة "<annotation id="link">"الموقع"</annotation>"."</string>
+ <string name="wifi_wakeup_summary_no_location" msgid="3007457288587966962">"غير متاحة نظرًا لإيقاف خدمة الموقع. فعِّل خدمة "<annotation id="link">"الموقع"</annotation>"."</string>
<string name="wifi_wakeup_summary_scanning_disabled" msgid="6820040651529910914">"غير متاح لأن ميزة \"البحث عن شبكات Wi‑Fi\" غير مفعّلة"</string>
<string name="wifi_wakeup_summary_scoring_disabled" msgid="7067018832237903151">"لاستخدام الميزة، اختر مقدِّم خدمة تقييم شبكة"</string>
<string name="wifi_poor_network_detection" msgid="7193423327400703073">"تجنب الاتصالات الضعيفة"</string>
@@ -934,7 +934,7 @@
<string name="wifi_scan_notify_text_scanning_off" msgid="723796963816095410">"لتحسين دقة تحديد الموقع الجغرافي، يمكنك تفعيل ميزة \"البحث عن شبكات Wi-Fi\" من خلال <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>إعدادات البحث<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
<string name="wifi_scan_notify_remember_choice" msgid="1235445971400237444">"عدم الإظهار مرة أخرى"</string>
<string name="wifi_setting_sleep_policy_title" msgid="2120785188625932076">"احتفاظ بـ Wi-Fi في وضع السكون"</string>
- <string name="wifi_setting_on_during_sleep_title" msgid="856670183023402715">"تشغيل Wi‑Fi أثناء وضع السكون"</string>
+ <string name="wifi_setting_on_during_sleep_title" msgid="856670183023402715">"تفعيل Wi-Fi أثناء وضع السكون"</string>
<string name="wifi_setting_sleep_policy_error" msgid="9029652631829560733">"حدثت مشكلة أثناء تغيير الإعدادات"</string>
<string name="wifi_suspend_efficiency_title" msgid="5292408676086580527">"تحسين الفعالية"</string>
<string name="wifi_suspend_optimizations" msgid="8826033336622472222">"تحسين Wi-Fi"</string>
@@ -1133,7 +1133,7 @@
<string name="wifi_hotspot_off_subtext" msgid="6177054857136221058">"لا تتم مشاركة اتصال الإنترنت أو المحتوى مع الأجهزة الأخرى"</string>
<string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="71421730039785897">"تتم مشاركة اتصال الإنترنت على هذا الجهاز اللوحي عبر نقطة الاتصال"</string>
<string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="8914285514605049879">"تتم مشاركة اتصال الإنترنت على هذا الهاتف عبر نقطة الاتصال"</string>
- <string name="wifi_hotspot_on_local_only_subtext" msgid="7415381343846704553">"يشارك التطبيق المحتوى. لمشاركة اتصال الإنترنت، يجب إيقاف نقطة الاتصال، ثم تشغيلها."</string>
+ <string name="wifi_hotspot_on_local_only_subtext" msgid="7415381343846704553">"يشارك التطبيق المحتوى. لمشاركة اتصال الإنترنت، يجب إيقاف نقطة الاتصال، ثم تفعيلها."</string>
<string name="wifi_hotspot_no_password_subtext" msgid="5400500962974373706">"لم يتم تعيين كلمة مرور"</string>
<string name="wifi_hotspot_name_title" msgid="6572202165400226127">"اسم نقطة الاتصال"</string>
<string name="wifi_hotspot_name_summary_connecting" msgid="5176787959408511889">"جارٍ تفعيل <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
@@ -1194,7 +1194,7 @@
<string name="all_volume_title" msgid="1750261506951315423">"مستويات الصوت"</string>
<string name="musicfx_title" msgid="6456079041566773649">"تأثيرات موسيقية"</string>
<string name="ring_volume_title" msgid="5874791723449821646">"مستوى صوت الرنين"</string>
- <string name="vibrate_in_silent_title" msgid="2314667015729841220">"اهتزاز عند تشغيل الوضع صامت"</string>
+ <string name="vibrate_in_silent_title" msgid="2314667015729841220">"اهتزاز عند تفعيل الوضع صامت"</string>
<string name="notification_sound_title" msgid="6812164482799723931">"الصوت التلقائي للإشعارات"</string>
<string name="incoming_call_volume_title" msgid="4736570528754310450">"نغمة الرنين"</string>
<string name="notification_volume_title" msgid="6022562909288085275">"التنبيه"</string>
@@ -1362,7 +1362,7 @@
<string name="sim_lock_failed" msgid="7949781515066772755">"لا يمكن تغيير حالة تأمين شريحة SIM.\nيُحتمل أن يكون رقم التعريف الشخصي غير صحيح."</string>
<string name="sim_pin_disable_failed" msgid="6780973900290546751">"يتعذَّر إيقاف رقم التعريف الشخصي."</string>
<string name="sim_pin_enable_failed" msgid="804897359922298792">"يتعذَّر تفعيل رقم التعريف الشخصي."</string>
- <string name="sim_enter_ok" msgid="5103626479976731229">"موافق"</string>
+ <string name="sim_enter_ok" msgid="5103626479976731229">"حسنًا"</string>
<string name="sim_enter_cancel" msgid="2806801210236824592">"إلغاء"</string>
<string name="sim_multi_sims_title" msgid="8816212852512189781">"تم العثور على بطاقات SIM متعددة"</string>
<string name="sim_multi_sims_summary" msgid="8237021982527032257">"اختر شريحة SIM المفضلة لبيانات الجوّال."</string>
@@ -1641,7 +1641,7 @@
<string name="error_adding_apn_type" msgid="671634520340569678">"لا يسمح مشغّل شبكة الجوّال بإضافة APN من النوع %s."</string>
<string name="restore_default_apn" msgid="7195266404077471007">"جارٍ استعادة إعدادات APN التلقائية."</string>
<string name="menu_restore" msgid="3799288817317293115">"إعادة الضبط على الإعداد التلقائي"</string>
- <string name="restore_default_apn_completed" msgid="5671734152740058937">"اكتملت إعادة تعيين إعدادات APN التلقائية."</string>
+ <string name="restore_default_apn_completed" msgid="5671734152740058937">"اكتملت إعادة ضبط إعدادات APN التلقائية."</string>
<string name="reset_dashboard_title" msgid="7084966342252178530">"خيارات إعادة الضبط"</string>
<string name="reset_dashboard_summary" msgid="8778383341461126642">"يمكن إعادة ضبط الشبكة أو التطبيقات أو الجهاز"</string>
<string name="reset_network_title" msgid="8944059136930806211">"إعادة ضبط شبكة Wi-Fi والجوّال والبلوتوث"</string>
@@ -1654,7 +1654,7 @@
<string name="reset_network_final_button_text" msgid="345255333127794393">"إعادة ضبط الإعدادات"</string>
<string name="reset_network_confirm_title" msgid="2432145031070536008">"هل تريد إعادة الضبط؟"</string>
<string name="network_reset_not_available" msgid="6146655531868016281">"إعادة ضبط الشبكة ليست متاحة لهذا المستخدم"</string>
- <string name="reset_network_complete_toast" msgid="128225929536005495">"تمت إعادة تعيين إعدادات الشبكة"</string>
+ <string name="reset_network_complete_toast" msgid="128225929536005495">"تمت إعادة ضبط إعدادات الشبكة"</string>
<string name="reset_esim_error_title" msgid="4728931209471875632">"يتعذّر محو بيانات شرائح SIM"</string>
<string name="reset_esim_error_msg" msgid="4716366079119742235">"يتعذّر محو بيانات شرائح التي تم تنزيلها بسبب خطأ.\n\nيمكنك إعادة تشغيل الجهاز وإعادة المحاولة."</string>
<string name="master_clear_title" msgid="1560712943955904673">"محو جميع البيانات (إعادة الضبط على الإعدادات الأصلية)"</string>
@@ -1816,9 +1816,9 @@
<string name="lockpassword_strong_auth_required_work_pattern" msgid="6861154706098327320">"استخدام نقش للملف الشخصي للعمل لزيادة الأمان"</string>
<string name="lockpassword_strong_auth_required_work_pin" msgid="6306902249365524526">"إدخال رقم تعريف شخصي للملف الشخصي للعمل لزيادة الأمان"</string>
<string name="lockpassword_strong_auth_required_work_password" msgid="2917338218971012776">"إدخال كلمة مرور للملف الشخصي للعمل لزيادة الأمان"</string>
- <string name="lockpassword_confirm_your_pattern_details_frp" msgid="1085862410379709928">"تم إعادة تعيين هاتفك على الإعدادات الأصلية. لاستخدام هذا الهاتف، أدخل النقش السابق."</string>
- <string name="lockpassword_confirm_your_pin_details_frp" msgid="6849889353126558761">"تم إعادة تعيين هاتفك على الإعدادات الأصلية. لاستخدام هذا الهاتف، أدخل رقم التعريف الشخصي السابق."</string>
- <string name="lockpassword_confirm_your_password_details_frp" msgid="3239944795659418737">"تم إعادة تعيين هاتفك على الإعدادات الأصلية. لاستخدام هذا الهاتف، أدخل كلمة المرور السابقة."</string>
+ <string name="lockpassword_confirm_your_pattern_details_frp" msgid="1085862410379709928">"تم إعادة ضبط هاتفك على الإعدادات الأصلية. لاستخدام هذا الهاتف، أدخل النقش السابق."</string>
+ <string name="lockpassword_confirm_your_pin_details_frp" msgid="6849889353126558761">"تم إعادة ضبط هاتفك على الإعدادات الأصلية. لاستخدام هذا الهاتف، أدخل رقم التعريف الشخصي السابق."</string>
+ <string name="lockpassword_confirm_your_password_details_frp" msgid="3239944795659418737">"تم إعادة ضبط هاتفك على الإعدادات الأصلية. لاستخدام هذا الهاتف، أدخل كلمة المرور السابقة."</string>
<string name="lockpassword_confirm_your_pattern_header_frp" msgid="3290569334665839860">"التحقق من النقش"</string>
<string name="lockpassword_confirm_your_pin_header_frp" msgid="8520474869079710782">"التحقق من رقم التعريف الشخصي"</string>
<string name="lockpassword_confirm_your_password_header_frp" msgid="7326670978891793470">"التحقق من كلمة المرور"</string>
@@ -1944,7 +1944,7 @@
<string name="recompute_size" msgid="4290692197892743928">"جارٍ إعادة حساب الحجم..."</string>
<string name="clear_data_dlg_title" msgid="7388024498687029597">"هل تريد حذف بيانات التطبيق؟"</string>
<string name="clear_data_dlg_text" msgid="6849657743695013414">"سيتم حذف جميع بيانات هذا التطبيق نهائيًا. ويشمل ذلك جميع الملفات والإعدادات والحسابات وقواعد البيانات وما إلى ذلك."</string>
- <string name="dlg_ok" msgid="4666570206507476557">"موافق"</string>
+ <string name="dlg_ok" msgid="4666570206507476557">"حسنًا"</string>
<string name="dlg_cancel" msgid="2434951039156262467">"إلغاء"</string>
<string name="app_not_found_dlg_title" msgid="394147475018718483"></string>
<string name="app_not_found_dlg_text" msgid="8807428608938210212">"لم يتم العثور على التطبيق في قائمة التطبيقات المثبتة."</string>
@@ -2075,7 +2075,7 @@
<string name="user_dict_settings_add_screen_title" msgid="8164998107273393830">"عبارة"</string>
<string name="user_dict_settings_add_dialog_more_options" msgid="577584009496650183">"خيارات أكثر"</string>
<string name="user_dict_settings_add_dialog_less_options" msgid="5678408488188525719">"خيارات أقل"</string>
- <string name="user_dict_settings_add_dialog_confirm" msgid="7279673661732968137">"موافق"</string>
+ <string name="user_dict_settings_add_dialog_confirm" msgid="7279673661732968137">"حسنًا"</string>
<string name="user_dict_settings_add_word_option_name" msgid="5310204485783762787">"الكلمة:"</string>
<string name="user_dict_settings_add_shortcut_option_name" msgid="1494012163016712256">"الاختصار:"</string>
<string name="user_dict_settings_add_locale_option_name" msgid="6589803829089582686">"اللغة:"</string>
@@ -2286,14 +2286,14 @@
<string name="enable_service_title" msgid="2746143093464928251">"هل تريد استخدام <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
<string name="capabilities_list_title" msgid="8177719542886123788">"خدمة <xliff:g id="SERVICE">%1$s</xliff:g> تحتاج إلى:"</string>
<string name="touch_filtered_warning" msgid="3072665526993043879">"نظرًا لأن هناك تطبيقًا يحجب طلب الإذن، لا تستطيع الإعدادات التحقق من ردك."</string>
- <string name="enable_service_encryption_warning" msgid="3580275420826492351">"في حالة تفعيل <xliff:g id="SERVICE">%1$s</xliff:g>، لن يستخدم جهازك ميزة قفل الشاشة لتحسين تشفير البيانات."</string>
- <string name="secure_lock_encryption_warning" msgid="8724670910924531152">"لن يستخدم جهازك ميزة قفل الشاشة لتحسين تشفير البيانات، وذلك لأنك قد فعّلت إحدى خدمات إمكانية الوصول."</string>
- <string name="enable_service_pattern_reason" msgid="7415969807374459848">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في تشفير البيانات، يجب تأكيد النقش."</string>
- <string name="enable_service_pin_reason" msgid="2899057249007636608">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في تشفير البيانات، يجب تأكيد رقم التعريف الشخصي."</string>
- <string name="enable_service_password_reason" msgid="5210815233227388083">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في تشفير البيانات، يجب تأكيد كلمة المرور."</string>
+ <string name="enable_service_encryption_warning" msgid="3580275420826492351">"في حالة تفعيل <xliff:g id="SERVICE">%1$s</xliff:g>، لن يستخدم جهازك ميزة قفل الشاشة لتحسين ترميز البيانات."</string>
+ <string name="secure_lock_encryption_warning" msgid="8724670910924531152">"لن يستخدم جهازك ميزة قفل الشاشة لتحسين ترميز البيانات، وذلك لأنك قد فعّلت إحدى خدمات إمكانية الوصول."</string>
+ <string name="enable_service_pattern_reason" msgid="7415969807374459848">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في ترميز البيانات، يجب تأكيد النقش."</string>
+ <string name="enable_service_pin_reason" msgid="2899057249007636608">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في ترميز البيانات، يجب تأكيد رقم التعريف الشخصي."</string>
+ <string name="enable_service_password_reason" msgid="5210815233227388083">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في ترميز البيانات، يجب تأكيد كلمة المرور."</string>
<string name="accessibility_service_warning" msgid="345702253188068806">"تطلب خدمة <xliff:g id="SERVICE">%1$s</xliff:g> الحصول على تحكم كامل في هذا الجهاز. ويمكن للخدمة قراءة الشاشة والتصرف بالنيابة عن المستخدمين ذوي الاحتياجات المتعلقة بإمكانية الوصول. ولا يناسب هذا المستوى من التحكم معظم التطبيقات."</string>
<string name="disable_service_title" msgid="6234243399949005825">"هل تريد إيقاف <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
- <string name="disable_service_message" msgid="4250593674885651779">"يؤدي النقر على \"موافق\" إلى إيقاف <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+ <string name="disable_service_message" msgid="4250593674885651779">"يؤدي النقر على \"حسنًا\" إلى إيقاف <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
<string name="accessibility_no_services_installed" msgid="6979918129976547334">"لم يتم تثبيت أي خدمات"</string>
<string name="accessibility_no_service_selected" msgid="3909390566736834080">"لم يتم اختيار أي خدمة"</string>
<string name="accessibility_service_default_description" msgid="857921874644864502">"لم يتم تقديم أي وصف."</string>
@@ -2604,7 +2604,7 @@
<skip />
<string name="battery_saver_seekbar_title_placeholder" msgid="2321082163892561703">"تفعيل"</string>
<string name="battery_saver_master_switch_title" msgid="8241862826825517212">"استخدام الوضع \"توفير شحن البطارية\""</string>
- <string name="battery_saver_turn_on_automatically_title" msgid="7316920304024245838">"التشغيل تلقائيًا"</string>
+ <string name="battery_saver_turn_on_automatically_title" msgid="7316920304024245838">"التفعيل تلقائيًا"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="2623381258359775227">"أبدًا"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="434270432432390307">"البطارية عند مستوى <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_percentage" msgid="7782252476471033843">"نسبة شحن البطارية"</string>
@@ -2776,7 +2776,7 @@
<string name="really_remove_account_message" product="device" msgid="3751798556257519916">"ستؤدي إزالة هذا الحساب إلى إزالة جميع رسائله وجهات الاتصال الخاصة به وبياناته الأخرى من الجهاز."</string>
<string name="remove_account_failed" msgid="491458185327106966">"لا يسمح المشرف بإجراء هذا التغيير"</string>
<string name="cant_sync_dialog_title" msgid="5483419398223189881">"لا يمكن المزامنة يدويًا"</string>
- <string name="cant_sync_dialog_message" msgid="3467126947262857534">"مزامنة هذا العنصر غير مفعّلة في الوقت الحالي. لتغيير هذا الإعداد، شغّل بشكل مؤقت بيانات الخلفية والمزامنة التلقائية."</string>
+ <string name="cant_sync_dialog_message" msgid="3467126947262857534">"مزامنة هذا العنصر غير مفعّلة في الوقت الحالي. لتغيير هذا الإعداد، فعِّل بشكل مؤقت بيانات الخلفية والمزامنة التلقائية."</string>
<string name="enter_password" msgid="2963496904625715235">"لبدء تشغيل Android، أدخل كلمة المرور"</string>
<string name="enter_pin" msgid="7140938268709546890">"لبدء تشغيل Android، أدخل رقم التعريف الشخصي"</string>
<string name="enter_pattern" msgid="1653841963422825336">"لبدء تشغيل Android، ارسم النقش"</string>
@@ -2920,18 +2920,18 @@
<string name="vpn_forget_long" msgid="8457511440635534478">"نسيان الشبكة الافتراضية الخاصة"</string>
<string name="vpn_replace_vpn_title" msgid="8517436922021598103">"هل تريد استبدال الشبكة الافتراضية الخاصة الحالية؟"</string>
<string name="vpn_set_vpn_title" msgid="6483554732067951052">"هل تريد تشغيل الشبكة الافتراضية الخاصة باستمرار؟"</string>
- <string name="vpn_first_always_on_vpn_message" msgid="7050017738816963855">"عند تشغيل هذا الإعداد، لن تتمكن من الاتصال بالإنترنت إلا بعد أن ينجح اتصال الشبكة الافتراضية الخاصة (VPN)"</string>
+ <string name="vpn_first_always_on_vpn_message" msgid="7050017738816963855">"عند تفعيل هذا الإعداد، لن تتمكن من الاتصال بالإنترنت إلا بعد أن ينجح اتصال الشبكة الافتراضية الخاصة (VPN)"</string>
<string name="vpn_replace_always_on_vpn_enable_message" msgid="4149931501300203205">"سيتم استبدال شبكتك الافتراضية الخاصة (VPN) الحالية ولن تتمكن من الاتصال بالإنترنت إلا بعد أن ينجح اتصال الشبكة الافتراضية الخاصة (VPN)"</string>
<string name="vpn_replace_always_on_vpn_disable_message" msgid="4924947523200883088">"أنت متصل حاليًا بشبكة افتراضية خاصة (VPN) مضبوطة على وضع التشغيل الدائم. وإذا اتصلت بشبكة افتراضية خاصة أخرى، فسيتم استبدال شبكتك الافتراضية الخاصة الحالية، كما سيتم إيقاف وضع التشغيل الدائم."</string>
<string name="vpn_replace_vpn_message" msgid="8009433728523145393">"أنت متصل حاليًا بشبكة افتراضية خاصة (VPN). وإذا اتصلت بشبكة افتراضية خاصة أخرى، فسيتم استبدال شبكتك الافتراضية الخاصة الحالية."</string>
- <string name="vpn_turn_on" msgid="2334736319093953055">"تشغيل"</string>
+ <string name="vpn_turn_on" msgid="2334736319093953055">"تفعيل"</string>
<string name="vpn_cant_connect_title" msgid="5803347131129293771">"يتعذر الاتصال بـ <xliff:g id="VPN_NAME">%1$s</xliff:g>"</string>
<string name="vpn_cant_connect_message" msgid="7729125036551401236">"لا يتوافق هذا التطبيق مع الشبكة الافتراضية الخاصة (VPN) التي يتم تشغيلها دائمًا"</string>
<string name="vpn_title" msgid="7801918186865029203">"الشبكات الافتراضية الخاصة"</string>
<string name="vpn_create" msgid="2477570636472897359">"إضافة ملف شخصي لشبكة افتراضية خاصة (VPN)"</string>
<string name="vpn_menu_edit" msgid="8061437799373333593">"تعديل الملف الشخصي"</string>
<string name="vpn_menu_delete" msgid="4128305800374946877">"حذف الملف الشخصي"</string>
- <string name="vpn_menu_lockdown" msgid="6951452279924808089">"شبكة افتراضية خاصة (VPN) دائمة التشغيل"</string>
+ <string name="vpn_menu_lockdown" msgid="6951452279924808089">"شبكة افتراضية خاصة (VPN) دائمة التفعيل"</string>
<string name="vpn_no_vpns_added" msgid="6616183541896197147">"لم تتم إضافة أي شبكات افتراضية خاصة (VPN)"</string>
<string name="vpn_always_on_summary" msgid="3639994551631437397">"متابعة الاتصال بشبكة VPN في جميع الأوقات"</string>
<string name="vpn_always_on_summary_not_supported" msgid="9077720997795965133">"عدم التوافق مع هذا التطبيق"</string>
@@ -2940,7 +2940,7 @@
<string name="vpn_require_connection_title" msgid="8361434328767853717">"أيتطلب الأمر اتصالاً بشبكة افتراضية خاصة؟"</string>
<string name="vpn_lockdown_summary" msgid="6770030025737770861">"حدد ملفًا شخصيًا للشبكة الافتراضية الخاصة (VPN) للاتصال الدائم بها. لن يتم السماح بحركة مرور الشبكة إلا عند الاتصال بهذه الشبكة الافتراضية الخاصة."</string>
<string name="vpn_lockdown_none" msgid="3789288793603394679">"بدون"</string>
- <string name="vpn_lockdown_config_error" msgid="8761770968704589885">"تتطلب الشبكة الافتراضية الخاصة (VPN) دائمة التشغيل عنوان IP لكل من الخادم ونظام أسماء النطاقات."</string>
+ <string name="vpn_lockdown_config_error" msgid="8761770968704589885">"تتطلب الشبكة الافتراضية الخاصة (VPN) دائمة التفعيل عنوان IP لكل من الخادم ونظام أسماء النطاقات."</string>
<string name="vpn_no_network" msgid="8313250136194588023">"ليس هناك اتصال بالشبكة. يُرجى إعادة المحاولة لاحقًا."</string>
<string name="vpn_disconnected" msgid="4597953053220332539">"تم قطع الاتصال بالشبكة الافتراضية الخاصة"</string>
<string name="vpn_disconnected_summary" msgid="3784118965271376808">"غير متّصل بشبكة"</string>
@@ -3061,7 +3061,7 @@
<string name="user_exit_guest_confirm_message" msgid="6955182181145748919">"سيتم حذف كل التطبيقات والبيانات في هذه الجلسة."</string>
<string name="user_exit_guest_dialog_remove" msgid="1878866060881115716">"إزالة"</string>
<string name="user_enable_calling" msgid="864760054792249503">"تفعيل المكالمات الهاتفية"</string>
- <string name="user_enable_calling_sms" msgid="3450252891736718793">"تشغيل المكالمات الهاتفية والرسائل القصيرة SMS"</string>
+ <string name="user_enable_calling_sms" msgid="3450252891736718793">"تفعيل المكالمات الهاتفية والرسائل القصيرة SMS"</string>
<string name="user_remove_user" msgid="3687544420125911166">"حذف حساب المستخدم"</string>
<string name="user_enable_calling_confirm_title" msgid="1141612415529158542">"هل تريد تفعيل المكالمات الهاتفية؟"</string>
<string name="user_enable_calling_confirm_message" msgid="2490126715153125970">"ستتم مشاركة سجل المكالمات مع هذا المستخدم."</string>
@@ -3335,7 +3335,7 @@
<item quantity="one">تم تفعيل قاعدة واحدة.</item>
</plurals>
<string name="zen_mode_settings_title" msgid="3425263414594779244">"وضع \"عدم الإزعاج\""</string>
- <string name="zen_mode_settings_turn_on_dialog_title" msgid="3062548369931058282">"تشغيل وضع \"الرجاء عدم الإزعاج\""</string>
+ <string name="zen_mode_settings_turn_on_dialog_title" msgid="3062548369931058282">"تفعيل وضع \"الرجاء عدم الإزعاج\""</string>
<string name="zen_mode_behavior_settings_title" msgid="423125904296667490">"الاستثناءات"</string>
<string name="zen_mode_duration_settings_title" msgid="5522668871014735728">"المدة التلقائية"</string>
<string name="zen_mode_behavior_allow_title" msgid="2440627647424280842">"السماح بالأصوات والاهتزازات من"</string>
@@ -3395,7 +3395,7 @@
<string name="zen_mode_no_exceptions" msgid="3099578343994492857">"بدون"</string>
<string name="zen_mode_other_options" msgid="7216192179063769057">"خيارات أخرى"</string>
<string name="zen_mode_add" msgid="2533484377786927366">"إضافة"</string>
- <string name="zen_mode_enable_dialog_turn_on" msgid="6396050543542026184">"تشغيل"</string>
+ <string name="zen_mode_enable_dialog_turn_on" msgid="6396050543542026184">"تفعيل"</string>
<string name="zen_mode_button_turn_on" msgid="1097964136225943415">"التفعيل الآن"</string>
<string name="zen_mode_button_turn_off" msgid="3990967728457149454">"الإيقاف الآن"</string>
<string name="zen_mode_settings_dnd_manual_end_time" msgid="4307574188962071429">"وضع \"الرجاء عدم الإزعاج\" مفعَّل حتى <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
@@ -3640,9 +3640,9 @@
<string name="zen_mode_unknown_app_set_behavior" msgid="5666462954329932302">"لا يمكن تغيير هذه الإعدادات الآن. لقد اختار أحد التطبيقات تفعيل وضع \"الرجاء عدم الإزعاج\" تلقائيًا مع سلوك مخصّص."</string>
<string name="zen_mode_qs_set_behavior" msgid="788646569296973998">"لا يمكن تغيير هذه الإعدادات الآن. تم تفعيل وضع \"الرجاء عدم الإزعاج\" يدويًا مع سلوك مخصّص."</string>
<string name="zen_schedule_rule_type_name" msgid="4516851728113801329">"وقت"</string>
- <string name="zen_schedule_rule_enabled_toast" msgid="1742354493045049048">"تم ضبط القاعدة التلقائية على تشغيل وضع \"عدم الإزعاج\" أثناء أوقات محددة"</string>
+ <string name="zen_schedule_rule_enabled_toast" msgid="1742354493045049048">"تم ضبط القاعدة التلقائية على تفعيل وضع \"عدم الإزعاج\" أثناء أوقات محددة"</string>
<string name="zen_event_rule_type_name" msgid="7467729997336583342">"حدث"</string>
- <string name="zen_event_rule_enabled_toast" msgid="7087368268966855976">"تم ضبط القاعدة التلقائية على تشغيل وضع \"عدم الإزعاج\" أثناء أحداث محددة"</string>
+ <string name="zen_event_rule_enabled_toast" msgid="7087368268966855976">"تم ضبط القاعدة التلقائية على تفعيل وضع \"عدم الإزعاج\" أثناء أحداث محددة"</string>
<string name="zen_mode_event_rule_calendar" msgid="6088077103908487442">"أثناء الأحداث لـ"</string>
<string name="zen_mode_event_rule_summary_calendar_template" msgid="4027207992040792657">"أثناء الأحداث للتقويم <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
<string name="zen_mode_event_rule_summary_any_calendar" msgid="7590085295784895885">"أي تقويم"</string>
@@ -3723,7 +3723,7 @@
<string name="zen_mode_calls_summary_two" msgid="9017678770532673578">"السماح بالمكالمات من <xliff:g id="CALLER_TYPE">%1$s</xliff:g> و<xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
<string name="zen_mode_repeat_callers_summary" msgid="1752513516040525545">"في حال اتصال الشخص نفسه للمرة الثانية في غضون <xliff:g id="MINUTES">%d</xliff:g> دقيقة"</string>
<string name="zen_mode_behavior_summary_custom" msgid="3909532602640130841">"مخصص"</string>
- <string name="zen_mode_when" msgid="7835420687948416255">"تشغيل تلقائي"</string>
+ <string name="zen_mode_when" msgid="7835420687948416255">"تفعيل تلقائي"</string>
<string name="zen_mode_when_never" msgid="4506296396609224524">"مطلقًا"</string>
<string name="zen_mode_when_every_night" msgid="3942151668791426194">"كل ليلة"</string>
<string name="zen_mode_when_weeknights" msgid="2412709309122408474">"ليالي الأسبوع"</string>
@@ -3755,7 +3755,7 @@
<string name="zen_mode_screen_off_summary" msgid="8592179073243001267">"السماح للإشعارات التي يتجاهلها وضع \"الرجاء عدم الإزعاج\" بتشغيل الشاشة وإحداث وميض ضوئي"</string>
<string name="zen_mode_screen_off_summary_no_led" msgid="7255874108150630145">"السماح للإشعارات التي يتجاهلها وضع \"الرجاء عدم الإزعاج\" بتشغيل الشاشة"</string>
<string name="notification_app_settings_button" msgid="3651180424198580907">"إعدادات الإشعارات"</string>
- <string name="suggestion_button_text" msgid="5783566542423813847">"موافق"</string>
+ <string name="suggestion_button_text" msgid="5783566542423813847">"حسنًا"</string>
<string name="device_feedback" msgid="4042352891448769818">"إرسال تعليقات حول هذا الجهاز"</string>
<string name="restr_pin_enter_admin_pin" msgid="8577847751493521230">"إدخال رقم التعريف الشخصي للمشرف"</string>
<string name="switch_on_text" msgid="7100491749799298324">"مفعّل"</string>
@@ -4126,7 +4126,7 @@
<string name="admin_profile_owner_user_message" msgid="2991249382056855531">"يمكن للمشرف مراقبة التطبيقات والبيانات المرتبطة بهذا المستخدم وإدارتها، بما في ذلك الإعدادات والأذونات والدخول إلى المؤسسة ونشاط الشبكة ومعلومات موقع الجهاز."</string>
<string name="admin_device_owner_message" msgid="1823477572459610869">"يمكن للمشرف مراقبة التطبيقات والبيانات المرتبطة بهذا الجهاز وإدارتها، بما في ذلك الإعدادات والأذونات والدخول إلى المؤسسة ونشاط الشبكة ومعلومات موقع الجهاز."</string>
<string name="condition_turn_off" msgid="4395150881365143558">"إيقاف"</string>
- <string name="condition_turn_on" msgid="1699088245481841159">"تشغيل"</string>
+ <string name="condition_turn_on" msgid="1699088245481841159">"تفعيل"</string>
<string name="condition_expand_show" msgid="4118818022763913777">"إظهار"</string>
<string name="condition_expand_hide" msgid="1112721783024332643">"إخفاء"</string>
<string name="condition_hotspot_title" msgid="4143299802283098506">"نقطة الاتصال مفعّلة"</string>
@@ -4135,7 +4135,7 @@
<string name="condition_zen_title" msgid="2128184708916052585">"تمّ تفعيل \"الرجاء عدم الإزعاج\""</string>
<string name="condition_zen_summary_phone_muted" msgid="4396050395522974654">"تم كتم صوت الهاتف."</string>
<string name="condition_zen_summary_with_exceptions" msgid="3435216391993785818">"مع بعض الاستثناءات"</string>
- <string name="condition_battery_title" msgid="6704870010912986274">"تم تشغيل وضع توفير شحن البطارية"</string>
+ <string name="condition_battery_title" msgid="6704870010912986274">"تم تفعيل وضع توفير شحن البطارية"</string>
<string name="condition_battery_summary" msgid="1236078243905690620">"تم تقييد الميزات."</string>
<string name="condition_cellular_title" msgid="6605277435894307935">"تم إيقاف بيانات الجوّال"</string>
<string name="condition_cellular_summary" msgid="3607459310548343777">"يتوفّر الإنترنت من خلال Wi‑Fi فقط."</string>
@@ -4324,7 +4324,7 @@
<item quantity="one">يمكن لتطبيق واحد استخدام البيانات غير المقيّدة</item>
</plurals>
<string name="special_access_more" msgid="7086690625048471400">"الاطّلاع على المزيد"</string>
- <string name="confirm_convert_to_fbe_warning" msgid="4972595831034280189">"هل تريد فعلًا مسح بيانات المستخدم والتحويل إلى تشفير الملفات؟"</string>
+ <string name="confirm_convert_to_fbe_warning" msgid="4972595831034280189">"هل تريد فعلًا مسح بيانات المستخدم والتحويل إلى ترميز الملفات؟"</string>
<string name="button_confirm_convert_fbe" msgid="419832223125147297">"مسح وتحويل"</string>
<string name="reset_shortcut_manager_throttling" msgid="1912184636360233397">"إعادة ضبط تقييد المعدّل في ShortcutManager"</string>
<string name="reset_shortcut_manager_throttling_complete" msgid="2932990541160593632">"تمت إعادة ضبط تقييد المعدّل في ShortcutManager."</string>
@@ -4481,9 +4481,9 @@
</plurals>
<string name="enterprise_privacy_input_method" msgid="5885916325874284011">"لوحة المفاتيح التلقائية"</string>
<string name="enterprise_privacy_input_method_name" msgid="439610095825218563">"تعيين على <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
- <string name="enterprise_privacy_always_on_vpn_device" msgid="2022700916516458213">"تم تشغيل إعداد \"شبكة افتراضية خاصة (VPN) دائمة التشغيل\""</string>
- <string name="enterprise_privacy_always_on_vpn_personal" msgid="5644065780843002044">"تم تشغيل إعداد \"شبكة افتراضية خاصة (VPN) دائمة التشغيل\" في الملف الشخصي"</string>
- <string name="enterprise_privacy_always_on_vpn_work" msgid="6443089897985373564">"تم تفعيل \"شبكة افتراضية خاصة (VPN) دائمة التشغيل\" في الملف الشخصي للعمل"</string>
+ <string name="enterprise_privacy_always_on_vpn_device" msgid="2022700916516458213">"تم تفعيل إعداد \"شبكة افتراضية خاصة (VPN) دائمة التفعيل\""</string>
+ <string name="enterprise_privacy_always_on_vpn_personal" msgid="5644065780843002044">"تم تفعيل إعداد \"شبكة افتراضية خاصة (VPN) دائمة التفعيل\" في الملف الشخصي"</string>
+ <string name="enterprise_privacy_always_on_vpn_work" msgid="6443089897985373564">"تم تفعيل \"شبكة افتراضية خاصة (VPN) دائمة التفعيل\" في الملف الشخصي للعمل"</string>
<string name="enterprise_privacy_global_http_proxy" msgid="3862135895716080830">"تم تعيين الخادم الوكيل HTTP العام"</string>
<string name="enterprise_privacy_ca_certs_device" msgid="7715658848470643878">"بيانات الاعتماد الموثوقة"</string>
<string name="enterprise_privacy_ca_certs_personal" msgid="1356447417193483802">"بيانات اعتماد موثوقة في ملفك الشخصي"</string>
diff --git a/tests/CarDeveloperOptions/res/values-es/arrays.xml b/tests/CarDeveloperOptions/res/values-es/arrays.xml
index d728216..5b52eee 100644
--- a/tests/CarDeveloperOptions/res/values-es/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-es/arrays.xml
@@ -257,7 +257,7 @@
<item msgid="5420704980305018295">"volumen de la voz"</item>
<item msgid="5797363115508970204">"volumen del tono"</item>
<item msgid="8233154098550715999">"volumen de multimedia"</item>
- <item msgid="5196715605078153950">"volumen de la alarma"</item>
+ <item msgid="5196715605078153950">"volumen de alarma"</item>
<item msgid="394030698764284577">"volumen de las notificaciones"</item>
<item msgid="8952898972491680178">"volumen de Bluetooth"</item>
<item msgid="8506227454543690851">"mantener activo"</item>
@@ -324,7 +324,7 @@
<item msgid="1600379420669104929">"Volumen de la voz"</item>
<item msgid="6296768210470214866">"Volumen del tono"</item>
<item msgid="510690696071629241">"Volumen de multimedia"</item>
- <item msgid="406861638631430109">"Volumen de la alarma"</item>
+ <item msgid="406861638631430109">"Volumen de alarma"</item>
<item msgid="4715864795872233884">"Volumen de notificaciones"</item>
<item msgid="2311478519251301183">"Volumen de Bluetooth"</item>
<item msgid="5133991377896747027">"Activo"</item>
diff --git a/tests/CarDeveloperOptions/res/values-es/strings.xml b/tests/CarDeveloperOptions/res/values-es/strings.xml
index fdbbdf2..4ea66a5 100644
--- a/tests/CarDeveloperOptions/res/values-es/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-es/strings.xml
@@ -324,7 +324,7 @@
<string name="date_and_time_settings_title_setup_wizard" msgid="1573030770187844365">"Establecer fecha y hora"</string>
<string name="date_and_time_settings_summary" msgid="4617979434474713417">"Establecer fecha, hora, zona horaria y formatos"</string>
<string name="date_time_auto" msgid="2679132152303750218">"Usar hora de la red"</string>
- <string name="zone_auto_title" msgid="5500880975376882488">"Usar zona horaria proporcionada por la red"</string>
+ <string name="zone_auto_title" msgid="5500880975376882488">"Usar la zona horaria proporcionada por la red"</string>
<string name="date_time_24hour_auto" msgid="7499659679134962547">"Usar la configuración regional predeterminada"</string>
<string name="date_time_24hour_title" msgid="6209923858891621283">"Formato de 24 horas"</string>
<string name="date_time_24hour" msgid="1265706705061608742">"Usar formato de 24 horas"</string>
@@ -764,7 +764,7 @@
<string name="bluetooth_device_context_unpair" msgid="250588431708253041">"Desincronizar"</string>
<string name="bluetooth_device_context_disconnect_unpair" msgid="4519151805677280077">"Desconectar y desincronizar"</string>
<string name="bluetooth_device_context_connect_advanced" msgid="423463405499392444">"Opciones…"</string>
- <string name="bluetooth_menu_advanced" msgid="7566858513372603652">"Ajustes avanzados"</string>
+ <string name="bluetooth_menu_advanced" msgid="7566858513372603652">"Avanzado"</string>
<string name="bluetooth_advanced_titlebar" msgid="6459469494039004784">"Ajustes avanzados de Bluetooth"</string>
<string name="bluetooth_empty_list_bluetooth_off" msgid="6255367297830430459">"Si se activa el Bluetooth, tu dispositivo se puede comunicar con otros dispositivos con Bluetooth cercanos"</string>
<string name="bluetooth_scanning_on_info_message" msgid="5460370815156050550">"Si el Bluetooth está activado, el dispositivo se puede comunicar con otros dispositivos Bluetooth cercanos.\n\nPara mejorar la experiencia de uso del dispositivo, las aplicaciones y los servicios pueden seguir buscando dispositivos cercanos en cualquier momento, aunque el Bluetooth esté desactivado. Esta opción se puede utilizar, por ejemplo, para mejorar los servicios y funciones basados en la ubicación, y puedes cambiarla en los "<annotation id="link">"ajustes de búsqueda"</annotation>"."</string>
@@ -883,7 +883,7 @@
<string name="wifi_menu_more_options" msgid="8318269834264035524">"Más opciones"</string>
<string name="wifi_menu_p2p" msgid="4945665601551289791">"Wi-Fi Direct"</string>
<string name="wifi_menu_scan" msgid="9082691677803181629">"Buscar"</string>
- <string name="wifi_menu_advanced" msgid="5984484498045511072">"Ajustes avanzados"</string>
+ <string name="wifi_menu_advanced" msgid="5984484498045511072">"Avanzado"</string>
<string name="wifi_menu_configure" msgid="52192491120701266">"Configurar"</string>
<string name="wifi_menu_connect" msgid="3984327567173931219">"Conectarse a la red"</string>
<string name="wifi_menu_remember" msgid="717257200269700641">"Recordar red"</string>
@@ -1070,7 +1070,7 @@
<string name="wifi_hotspot_ap_band_title" msgid="3485744480410441949">"Banda del punto de acceso"</string>
<string name="wifi_hotspot_footer_info_regular" msgid="3876006922622827363">"Utiliza un punto de acceso para crear una red Wi‑Fi que puedan usar otros dispositivos. Los puntos de acceso permiten acceder a Internet con una conexión de datos móviles. Es posible que se apliquen cargos adicionales por el uso de datos."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="3339582350894639261">"Las aplicaciones pueden crear un punto de acceso para compartir contenido con dispositivos cercanos."</string>
- <string name="wifi_hotspot_auto_off_title" msgid="7416022590415189590">"Desactivar el punto de acceso automáticamente"</string>
+ <string name="wifi_hotspot_auto_off_title" msgid="7416022590415189590">"Desactivar punto de acceso automáticamente"</string>
<string name="wifi_hotspot_auto_off_summary" msgid="3866769400624802105">"El punto de acceso Wi‑Fi se desactivará si no hay dispositivos conectados"</string>
<string name="wifi_tether_starting" msgid="7676952148471297900">"Activando zona Wi-Fi…"</string>
<string name="wifi_tether_stopping" msgid="7478561853791953349">"Desactivando zona Wi-Fi…"</string>
@@ -1128,7 +1128,7 @@
<string name="notification_volume_title" msgid="6022562909288085275">"Notificación"</string>
<string name="checkbox_notification_same_as_incoming_call" msgid="7312942422655861175">"Utilizar volumen de llamada entrante para notificaciones"</string>
<string name="home_work_profile_not_supported" msgid="6137073723297076818">"No admite perfiles de trabajo"</string>
- <string name="notification_sound_dialog_title" msgid="6653341809710423276">"Sonido notif. predet."</string>
+ <string name="notification_sound_dialog_title" msgid="6653341809710423276">"Sonido de notificación predeterminado"</string>
<string name="media_volume_title" msgid="1030438549497800914">"Multimedia"</string>
<string name="media_volume_summary" msgid="3142433516297061652">"Establecer volumen para música y vídeos"</string>
<string name="alarm_volume_title" msgid="8902277801531496243">"Alarma"</string>
@@ -2489,8 +2489,8 @@
<string name="menu_duration_6h" msgid="6169009210638008417">"6 horas"</string>
<string name="menu_duration_12h" msgid="1435242738163843797">"12 horas"</string>
<string name="menu_duration_1d" msgid="6476370834372352174">"1 día"</string>
- <string name="menu_show_system" msgid="6315865548558708248">"Mostrar aplicaciones del sistema"</string>
- <string name="menu_hide_system" msgid="8457027118873733782">"Ocultar aplicaciones del sistema"</string>
+ <string name="menu_show_system" msgid="6315865548558708248">"Mostrar sistema"</string>
+ <string name="menu_hide_system" msgid="8457027118873733782">"Ocultar sistema"</string>
<string name="menu_show_percentage" msgid="6983272380729890884">"Mostrar porcentajes"</string>
<string name="menu_use_uss" msgid="3765054705208926803">"Usar USS"</string>
<string name="menu_proc_stats_type" msgid="2680179749566186247">"Tipo de estadísticas"</string>
@@ -2531,7 +2531,7 @@
<string name="trusted_credentials_summary" msgid="7411781319056251582">"Mostrar certificados de CA de confianza"</string>
<string name="user_credentials" msgid="8365731467650306757">"Credenciales de usuario"</string>
<string name="user_credentials_summary" msgid="7350223899317423252">"Ver y modificar credenciales almacenadas"</string>
- <string name="advanced_security_title" msgid="286883005673855845">"Ajustes avanzados"</string>
+ <string name="advanced_security_title" msgid="286883005673855845">"Avanzado"</string>
<string name="credential_storage_type" msgid="2585337320206095255">"Tipo de almacenamiento"</string>
<string name="credential_storage_type_hardware" msgid="5054143224259023600">"Almacenado en hardware"</string>
<string name="credential_storage_type_software" msgid="1335905150062717150">"Solo software"</string>
@@ -3135,7 +3135,7 @@
<string name="media_volume_option_title" msgid="3553411883305505682">"Volumen de multimedia"</string>
<string name="remote_media_volume_option_title" msgid="6355710054191873836">"Volumen de envío"</string>
<string name="call_volume_option_title" msgid="5028003296631037334">"Volumen de llamada"</string>
- <string name="alarm_volume_option_title" msgid="3184076022438477047">"Volumen de la alarma"</string>
+ <string name="alarm_volume_option_title" msgid="3184076022438477047">"Volumen de alarma"</string>
<string name="ring_volume_option_title" msgid="2038924918468372264">"Volumen del tono"</string>
<string name="notification_volume_option_title" msgid="1358512611511348260">"Volumen de notificaciones"</string>
<string name="ringtone_title" msgid="1409086028485922583">"Tono del teléfono"</string>
@@ -3295,7 +3295,7 @@
<string name="configure_notification_settings" msgid="291914315140851270">"Notificaciones"</string>
<string name="recent_notifications" msgid="8125865995065032049">"Enviadas recientemente"</string>
<string name="recent_notifications_see_all_title" msgid="4089007770442871469">"Ver las de los últimos 7 días"</string>
- <string name="advanced_section_header" msgid="984680389373090015">"Ajustes avanzados"</string>
+ <string name="advanced_section_header" msgid="984680389373090015">"Avanzado"</string>
<string name="profile_section_header" msgid="5471479005472037417">"Notificaciones de trabajo"</string>
<string name="asst_capability_prioritizer_title" msgid="3488284760645922160">"Prioridad de los avisos automáticos"</string>
<string name="asst_capability_prioritizer_summary" msgid="3525640645743790796">"Silenciar y disminuir el nivel de las notificaciones menos importantes"</string>
@@ -3640,7 +3640,7 @@
<string name="filter_notif_low_channels" msgid="6859599463135775287">"Categorías: poca importancia"</string>
<string name="filter_notif_blocked_channels" msgid="6110799550327612670">"Categorías: desactivadas"</string>
<string name="filter_notif_dnd_channels" msgid="3251570137256371092">"Categorías: prioritarias"</string>
- <string name="advanced_apps" msgid="6643869089344883537">"Ajustes avanzados"</string>
+ <string name="advanced_apps" msgid="6643869089344883537">"Avanzado"</string>
<string name="configure_apps" msgid="4066683118857400943">"Configurar aplicaciones"</string>
<string name="unknown_app" msgid="2312052973570376877">"Aplicación desconocida"</string>
<string name="app_permissions" msgid="3215958256821756086">"Gestor de permisos"</string>
diff --git a/tests/CarDeveloperOptions/res/values-eu/arrays.xml b/tests/CarDeveloperOptions/res/values-eu/arrays.xml
index 7454bad..03259f7 100644
--- a/tests/CarDeveloperOptions/res/values-eu/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-eu/arrays.xml
@@ -192,7 +192,7 @@
<item msgid="6123238544099198034">"jaso SMS mezuak"</item>
<item msgid="838342167431596036">"jaso larrialdiko SMS mezuak"</item>
<item msgid="8554432731560956686">"jaso MMS mezuak"</item>
- <item msgid="7464863464299515059">"jaso WAP push-jakinarazpenak"</item>
+ <item msgid="7464863464299515059">"jaso WAP push jakinarazpenak"</item>
<item msgid="310463075729606765">"bidali SMS mezuak"</item>
<item msgid="7338021933527689514">"irakurri ICC SMS mezuak"</item>
<item msgid="6130369335466613036">"idatzi ICC SMS mezuak"</item>
diff --git a/tests/CarDeveloperOptions/res/values-eu/strings.xml b/tests/CarDeveloperOptions/res/values-eu/strings.xml
index aefeda7..22beea0 100644
--- a/tests/CarDeveloperOptions/res/values-eu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-eu/strings.xml
@@ -93,14 +93,14 @@
<string name="sdcard_setting" product="nosdcard" msgid="1533784309105748696">"USB bidezko memoria"</string>
<string name="sdcard_setting" product="default" msgid="8398782065765523178">"SD txartela"</string>
<string name="bluetooth" msgid="1564520421786841227">"Bluetooth-a"</string>
- <string name="bluetooth_is_discoverable" msgid="6748888489356326898">"Inguruko Bluetooth gailu guztietarako ikusgai (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
- <string name="bluetooth_is_discoverable_always" msgid="6835934878803488274">"Inguruko Bluetooth gailu guztietarako ikusgai"</string>
- <string name="bluetooth_not_visible_to_other_devices" msgid="9134284066024557293">"Ez da beste Bluetooth gailuetarako ikusgai"</string>
+ <string name="bluetooth_is_discoverable" msgid="6748888489356326898">"Inguruko Bluetooth bidezko gailuetarako ikusgai (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+ <string name="bluetooth_is_discoverable_always" msgid="6835934878803488274">"Inguruko Bluetooth bidezko gailuetarako ikusgai"</string>
+ <string name="bluetooth_not_visible_to_other_devices" msgid="9134284066024557293">"Bluetooth bidezko beste gailuetarako ikusgaitz"</string>
<string name="bluetooth_only_visible_to_paired_devices" msgid="3830247336229883519">"Bikotetutako gailuetarako soilik ikusgai"</string>
<string name="bluetooth_visibility_timeout" msgid="4804679276398564496">"Ikusgaitasunaren denbora-muga gainditu da"</string>
<string name="bluetooth_lock_voice_dialing" msgid="1600385868298081015">"Blokeatu ahots bidezko markatzea"</string>
<string name="bluetooth_lock_voice_dialing_summary" msgid="5005776616112427980">"Galarazi Bluetooth telefonoa erabiltzea pantaila blokeatuta dagoenean"</string>
- <string name="bluetooth_devices" msgid="4143880830505625666">"Bluetooth gailuak"</string>
+ <string name="bluetooth_devices" msgid="4143880830505625666">"Bluetooth bidezko gailuak"</string>
<string name="bluetooth_device_name" msgid="3682016026866302981">"Gailuaren izena"</string>
<string name="bluetooth_device_details" msgid="2500840679106321361">"Gailuaren ezarpenak"</string>
<string name="bluetooth_profile_details" msgid="1785505059738682493">"Profilaren ezarpenak"</string>
@@ -123,7 +123,7 @@
<string name="bluetooth_broadcasting" msgid="8926408584599563760">"Igorpena"</string>
<string name="bluetooth_device" msgid="3170974107364990008">"Izenik gabeko Bluetooth bidezko gailua"</string>
<string name="progress_scanning" msgid="633923400401041181">"Bilatzen"</string>
- <string name="bluetooth_no_devices_found" msgid="4396050022213494322">"Ez da Bluetooth gailurik aurkitu inguruan."</string>
+ <string name="bluetooth_no_devices_found" msgid="4396050022213494322">"Bluetooth bidezko gailurik ez inguruan."</string>
<string name="bluetooth_notif_ticker" msgid="8398481099943141819">"Bluetooth bidez parekatzeko eskaera"</string>
<string name="bluetooth_notif_title" msgid="5090288898529286011">"Bikotetzeko eskaera"</string>
<string name="bluetooth_notif_message" msgid="6612367890895077938">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuarekin parekatzeko, sakatu hau."</string>
@@ -134,14 +134,14 @@
<string name="bluetooth_ask_disablement" msgid="7125319551097350783">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak Bluetooth konexioa desaktibatu nahi du"</string>
<string name="bluetooth_ask_enablement_no_name" msgid="6105893027185475233">"Aplikazio batek Bluetooth konexioa aktibatu nahi du"</string>
<string name="bluetooth_ask_disablement_no_name" msgid="8648888502291681310">"Aplikazio batek Bluetooth konexioa desaktibatu nahi du"</string>
- <string name="bluetooth_ask_discovery" product="tablet" msgid="6871595755186170115">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak tableta beste Bluetooth gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%2$d</xliff:g> segundoz."</string>
- <string name="bluetooth_ask_discovery" product="default" msgid="3388041479101348095">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak telefonoa beste Bluetooth gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%2$d</xliff:g> segundoz."</string>
- <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="1472358802231150345">"Aplikazio batek tableta beste Bluetooth gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%1$d</xliff:g> segundoz."</string>
- <string name="bluetooth_ask_discovery_no_name" product="default" msgid="6195796094297507404">"Aplikazio batek telefonoa beste Bluetooth gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%1$d</xliff:g> segundoz."</string>
- <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="2702942027812132427">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak tableta beste Bluetooth gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth ezarpenetan alda dezakezu hori geroago."</string>
- <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7796723473397303412">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak telefonoa beste Bluetooth gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth ezarpenetan alda dezakezu hori geroago."</string>
- <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="5961921359655434504">"Aplikazio batek tableta beste Bluetooth gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth ezarpenetan alda dezakezu hori geroago."</string>
- <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="3585910858758443872">"Aplikazio batek telefonoa beste Bluetooth gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth ezarpenetan alda dezakezu hori geroago."</string>
+ <string name="bluetooth_ask_discovery" product="tablet" msgid="6871595755186170115">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak tableta Bluetooth bidezko beste gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%2$d</xliff:g> segundoz."</string>
+ <string name="bluetooth_ask_discovery" product="default" msgid="3388041479101348095">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak telefonoa Bluetooth bidezko beste gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%2$d</xliff:g> segundoz."</string>
+ <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="1472358802231150345">"Aplikazio batek tableta Bluetooth bidezko beste gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%1$d</xliff:g> segundoz."</string>
+ <string name="bluetooth_ask_discovery_no_name" product="default" msgid="6195796094297507404">"Aplikazio batek telefonoa Bluetooth bidezko beste gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%1$d</xliff:g> segundoz."</string>
+ <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="2702942027812132427">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak tableta beste Bluetooth bidezko gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth-aren ezarpenetan alda dezakezu hori geroago."</string>
+ <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7796723473397303412">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak telefonoa beste Bluetooth bidezko gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth-aren ezarpenetan alda dezakezu hori geroago."</string>
+ <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="5961921359655434504">"Aplikazio batek tableta beste Bluetooth bidezko gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth-aren ezarpenetan alda dezakezu hori geroago."</string>
+ <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="3585910858758443872">"Aplikazio batek telefonoa beste Bluetooth bidezko gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth-aren ezarpenetan alda dezakezu hori geroago."</string>
<string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5676466923424941153">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak Bluetooth konexioa aktibatu eta tableta beste gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%2$d</xliff:g> segundoz."</string>
<string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="507088376226791063">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak Bluetooth konexioa aktibatu eta telefonoa beste gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%2$d</xliff:g> segundoz."</string>
<string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="1164681893121736219">"Aplikazio batek Bluetooth konexioa aktibatu eta tableta beste gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%1$d</xliff:g> segundoz."</string>
@@ -167,9 +167,9 @@
<string name="bluetooth_off_footer" msgid="7658444560543730571">"Aktibatu Bluetooth konexioa beste gailu batzuetara konektatzeko."</string>
<string name="bluetooth_paired_device_title" msgid="8361860197780425286">"Zure gailuak"</string>
<string name="bluetooth_pairing_page_title" msgid="9053463656712597709">"Parekatu gailu batekin"</string>
- <string name="bluetooth_pref_summary" product="tablet" msgid="3601662966604648212">"Baimendu tabletari inguruko Bluetooth gailuekin komunikatzea"</string>
- <string name="bluetooth_pref_summary" product="device" msgid="2286727776570956969">"Baimendu gailuari inguruko Bluetooth gailuekin komunikatzea"</string>
- <string name="bluetooth_pref_summary" product="default" msgid="863659221858781186">"Baimendu telefonoari inguruko Bluetooth gailuekin komunikatzea"</string>
+ <string name="bluetooth_pref_summary" product="tablet" msgid="3601662966604648212">"Baimendu tabletari inguruko Bluetooth bidezko gailuekin komunikatzea"</string>
+ <string name="bluetooth_pref_summary" product="device" msgid="2286727776570956969">"Eman gailuari inguruko Bluetooth bidezko gailuekin komunikatzeko baimena"</string>
+ <string name="bluetooth_pref_summary" product="default" msgid="863659221858781186">"Baimendu telefonoari inguruko Bluetooth bidezko gailuekin komunikatzea"</string>
<string name="bluetooth_disable_a2dp_hw_offload" msgid="293429878480958234">"Desgaitu Bluetooth A2DP hardwarea deskargatzeko aukera"</string>
<string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="7362106962085861626">"Gailua berrabiarazi?"</string>
<string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="4837282201316413412">"Ezarpen hau aldatzeko, gailua berrabiarazi egin behar duzu."</string>
@@ -766,9 +766,9 @@
<string name="bluetooth_device_context_connect_advanced" msgid="423463405499392444">"Aukerak…"</string>
<string name="bluetooth_menu_advanced" msgid="7566858513372603652">"Aurreratuak"</string>
<string name="bluetooth_advanced_titlebar" msgid="6459469494039004784">"Bluetooth ezarpen aurreratuak"</string>
- <string name="bluetooth_empty_list_bluetooth_off" msgid="6255367297830430459">"Bluetooth aktibatuta badago, inguruko Bluetooth gailuekin komunika daiteke gailua."</string>
- <string name="bluetooth_scanning_on_info_message" msgid="5460370815156050550">"Bluetooth konexioa aktibatuta dagoenean, inguruko Bluetooth gailuekin komunika daiteke gailua.\n\nGailuaren erabilera hobetzeko, aplikazioek eta zerbitzuek wifi-sareak bilatzen jarraituko dute, baita wifi-konexioa desaktibatuta dagoenean ere. Besteak beste, kokapenean oinarritutako eginbideak eta zerbitzuak hobetzeko erabil daiteke. Aukera hori aldatzeko, joan "<annotation id="link">"gailuak bilatzeko ezarpenetara"</annotation>"."</string>
- <string name="ble_scan_notify_text" msgid="6290170236546386932">"Kokapenaren zehaztasuna hobetzeko, sistemaren aplikazioek eta zerbitzuek Bluetooth gailuak hautematen jarraituko dute. Hori aldatzeko, zoaz <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>gailuak bilatzeko ezarpenetara<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+ <string name="bluetooth_empty_list_bluetooth_off" msgid="6255367297830430459">"Bluetooth-a aktibatuta badago, inguruko Bluetooth bidezko gailuekin komunika daiteke gailua."</string>
+ <string name="bluetooth_scanning_on_info_message" msgid="5460370815156050550">"Bluetooth-a aktibatuta badago, inguruko Bluetooth bidezko gailuekin komunika daiteke gailua.\n\nGailuaren erabilera hobetzeko, aplikazioek eta zerbitzuek wifi-sareak bilatzen jarraituko dute, baita wifi-konexioa desaktibatuta dagoenean ere. Besteak beste, kokapenean oinarritutako eginbideak eta zerbitzuak hobetzeko erabil daiteke. Aukera hori aldatzeko, joan "<annotation id="link">"gailuak bilatzeko ezarpenetara"</annotation>"."</string>
+ <string name="ble_scan_notify_text" msgid="6290170236546386932">"Kokapenaren zehaztasuna hobetzeko, sistemaren aplikazioek eta zerbitzuek Bluetooth bidezko gailuak hautematen jarraituko dute. Hori aldatzeko, zoaz <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>gailuak bilatzeko ezarpenetara<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
<string name="bluetooth_connect_failed" msgid="1151234676456333786">"Ezin izan da konektatu. Saiatu berriro."</string>
<string name="device_details_title" msgid="726517818032923222">"Gailuaren xehetasunak"</string>
<string name="bluetooth_device_mac_address" msgid="5328203122581150405">"Gailuaren Bluetooth helbidea: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
@@ -2159,7 +2159,7 @@
<string name="captioning_foreground_opacity" msgid="7635639017810117478">"Testuaren opakutasuna"</string>
<string name="captioning_edge_color" msgid="4330622137047993780">"Ertzen kolorea"</string>
<string name="captioning_edge_type" msgid="4414946407430588162">"Ertz mota"</string>
- <string name="captioning_typeface" msgid="7893208796949341767">"Letra-tipoaren familia"</string>
+ <string name="captioning_typeface" msgid="7893208796949341767">"Letra-familia"</string>
<string name="captioning_preview_text" msgid="4877753964772618049">"Azpitituluek itxura hau izango dute"</string>
<string name="captioning_preview_characters" msgid="6469599599352973561">"Aa"</string>
<string name="locale_default" msgid="910074908458214054">"Lehenetsia"</string>
@@ -3305,7 +3305,7 @@
<string name="hide_silent_icons_summary" msgid="2624346914488256888">"Ezkutatu jakinarazpen isilen ikonoak egoera-barran"</string>
<string name="notification_badging_title" msgid="6311699476970264712">"Baimendu jakinarazpen-biribiltxoak"</string>
<string name="notification_bubbles_title" msgid="9196562435741861317">"Burbuilak"</string>
- <string name="notification_bubbles_summary" msgid="4624512775901949578">"Atzitu bizkor aplikazioetako edukia lasterbide flotagarriak erabilita"</string>
+ <string name="notification_bubbles_summary" msgid="4624512775901949578">"Atzitu bizkor aplikazioetako edukia lasterbide gainerakorrak erabilita"</string>
<string name="bubbles_feature_education" msgid="8979109826818881018">"Jakinarazpen batzuk eta bestelako edukia burbuila gisa ager daitezke pantailan. Burbuilak irekitzeko, saka itzazu. Baztertzeko, ordea, arrasta itzazu pantailan behera."</string>
<string name="bubbles_app_toggle_title" msgid="6401217027603326439">"Burbuilak"</string>
<string name="bubbles_app_toggle_summary" msgid="7707611139796553855">"Baimendu <xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioari jakinarazpen batzuk burbuila gisa erakustea"</string>
@@ -4043,7 +4043,7 @@
<string name="notification_log_details_ranking_none" msgid="3687243721168608404">"Sailkapen-objektuak ez du gako hau."</string>
<string name="theme_customization_category" msgid="4043457940936660368">"Gaiak"</string>
<string name="theme_customization_accent_color_title" msgid="3949108608589133216">"Nabarmentzeko kolorea"</string>
- <string name="theme_customization_font_title" msgid="309728559821356597">"Goiburuaren eta gorputzaren letra-tipoa"</string>
+ <string name="theme_customization_font_title" msgid="309728559821356597">"Goiburuaren eta gorputzaren letra"</string>
<string name="theme_customization_icon_shape_title" msgid="4603248388639328322">"Ikonoaren forma"</string>
<string name="theme_customization_device_default" msgid="7188874258500934312">"Gailuaren balio lehenetsiak"</string>
<string name="display_cutout_emulation" msgid="288975763151891685">"Pantailaren mozketa"</string>
@@ -4331,7 +4331,7 @@
<string name="prevent_ringing_option_mute_summary" msgid="3509459199090688328">"Aktibatuta (audioa desaktibatuta)"</string>
<string name="prevent_ringing_option_none_summary" msgid="5152618221093037451">"Desaktibatuta"</string>
<string name="pref_title_network_details" msgid="3971074015034595956">"Sarearen xehetasunak"</string>
- <string name="about_phone_device_name_warning" msgid="9088572775969880106">"Mugikorreko aplikazioek gailuaren izena ikus dezakete. Halaber, jendeak ere ikus dezake Bluetooth gailuetara konektatzean edo Wi-Fi sare publiko bat konfiguratzean."</string>
+ <string name="about_phone_device_name_warning" msgid="9088572775969880106">"Mugikorreko aplikazioek gailuaren izena ikus dezakete. Halaber, jendeak ere ikus dezake Bluetooth bidezko gailuetara konektatzean edo wifi-sare publiko bat konfiguratzean."</string>
<string name="devices_title" msgid="4768432575951993648">"Gailuak"</string>
<string name="homepage_all_settings" msgid="3201220879559136116">"Ezarpen guztiak"</string>
<string name="homepage_personal_settings" msgid="7472638597249114564">"Iradokizunak"</string>
@@ -4456,7 +4456,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> gailu daude konektatuta</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> gailu dago konektatuta</item>
</plurals>
- <string name="no_bluetooth_devices" msgid="4338224958734305244">"Ez dago Bluetooth gailurik"</string>
+ <string name="no_bluetooth_devices" msgid="4338224958734305244">"Ez dago Bluetooth bidezko gailurik"</string>
<string name="bluetooth_left_name" msgid="4393660998014637355">"Ezkerrekoa"</string>
<string name="bluetooth_right_name" msgid="8356091262762973801">"Eskuinekoa"</string>
<string name="bluetooth_middle_name" msgid="1489185200445352103">"Zorroa"</string>
diff --git a/tests/CarDeveloperOptions/res/values-hy/strings.xml b/tests/CarDeveloperOptions/res/values-hy/strings.xml
index e076190..10597a3 100644
--- a/tests/CarDeveloperOptions/res/values-hy/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-hy/strings.xml
@@ -1388,7 +1388,7 @@
<string name="sd_format" product="default" msgid="1346245995138883960">"Ջնջել SD քարտը"</string>
<string name="sd_format_summary" product="nosdcard" msgid="1179857727779521920">"Ջնջել USB կրիչի բոլոր տվյալները, ինչպիսիք են երաժշտությունը և լուսանկարները"</string>
<string name="sd_format_summary" product="default" msgid="4284028411908176234">"SD քարտից ջնջում է ողջ տեղեկատվությունը, ինչպիսիք են երաժշտությունն ու լուսանկարները"</string>
- <string name="memory_clear_cache_title" msgid="4306793268129306684">"Մաքրե՞լ քեշավորված տվյալները:"</string>
+ <string name="memory_clear_cache_title" msgid="4306793268129306684">"Ջնջե՞լ քեշավորված տվյալները:"</string>
<string name="memory_clear_cache_message" msgid="6723120398411410031">"Սա կմաքրի բոլոր ծրագրերի քեշավորված տվյալները:"</string>
<string name="mtp_ptp_mode_summary" msgid="6074099855478444183">"MTP կամ PTP գործառույթը ակտիվ է"</string>
<string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3843209947310774105">"Անջատե՞լ USB կրիչը:"</string>
@@ -4451,7 +4451,7 @@
<string name="network_connection_timeout_dialog_ok" msgid="5156496438627748361">"Նորից փորձել"</string>
<string name="network_connection_errorstate_dialog_message" msgid="1599445930536043943">"Սխալ առաջացավ: Հավելվածը չեղարկել է սարք ընտրելու հայտը:"</string>
<string name="network_connection_connect_successful" msgid="888912275986965748">"Կապը հաստատվեց"</string>
- <string name="network_connection_request_dialog_showall" msgid="396928496030183071">"Ցուցադրել բոլորը"</string>
+ <string name="network_connection_request_dialog_showall" msgid="396928496030183071">"Ցույց տալ բոլորը"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="7451733907387872891">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> միացված սարք</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> միացված սարք</item>
diff --git a/tests/CarDeveloperOptions/res/values-in/strings.xml b/tests/CarDeveloperOptions/res/values-in/strings.xml
index a855c38..6f332df 100644
--- a/tests/CarDeveloperOptions/res/values-in/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-in/strings.xml
@@ -3765,7 +3765,7 @@
<string name="assist_footer" msgid="7030121180457472165">"Aplikasi bantuan dapat membantu Anda berdasarkan informasi dari layar yang sedang Anda lihat. Beberapa aplikasi mendukung peluncur dan layanan masukan suara untuk memberikan bantuan terintegrasi."</string>
<string name="average_memory_use" msgid="5333366040118953945">"Rata-rata penggunaan memori"</string>
<string name="maximum_memory_use" msgid="6509872438499846077">"Penggunaan memori maksimum"</string>
- <string name="memory_usage" msgid="7963253555330830906">"Pemakaian memori"</string>
+ <string name="memory_usage" msgid="7963253555330830906">"Penggunaan memori"</string>
<string name="app_list_memory_use" msgid="356095943215944031">"Penggunaan aplikasi"</string>
<string name="memory_details" msgid="5165105904103664110">"Detail"</string>
<string name="memory_use_summary" msgid="7676311343819965850">"<xliff:g id="SIZE">%1$s</xliff:g> rata-rata memori yang digunakan dalam 3 jam terakhir"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ky/strings.xml b/tests/CarDeveloperOptions/res/values-ky/strings.xml
index b1c53cd..9cd2014 100644
--- a/tests/CarDeveloperOptions/res/values-ky/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ky/strings.xml
@@ -598,11 +598,11 @@
<string name="unlock_disable_frp_warning_content_pattern" msgid="1843950215687159135">"Графикалык ачкычсыз түзмөктү коргоо функциялары иштебейт."</string>
<string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8846957650251741548">"Графикалык ачкычыңызсыз түзмөгүңүздү коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
-</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн өчүрүлөт жана алардын жардамы менен түзмөгүңүздүн кулпусун ачып, ар кандай нерселерди сатып алып же аккаунтка кире албай каласыз."</string>
+</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн өчүрүлөт жана алардын жардамы менен, түзмөгүңүздүн кулпусун ачып, ар кандай нерселерди сатып алып же аккаунтка кире албай каласыз."</string>
<string name="unlock_disable_frp_warning_content_pin" msgid="6760473271034592796">"PIN кодсуз түзмөктү коргоо функциялары иштебейт."</string>
<string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="4384632309103635233">"PIN кодуңузсуз түзмөктү коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
-</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн өчүрүлөт жана алардын жардамы менен түзмөгүңүздүн кулпусун ачып, ар кандай нерселерди сатып алып же аккаунтка кире албай каласыз."</string>
+</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн өчүрүлөт жана алардын жардамы менен, түзмөгүңүздүн кулпусун ачып, ар кандай нерселерди сатып алып же аккаунтка кире албай каласыз."</string>
<string name="unlock_disable_frp_warning_content_password" msgid="854665587186358170">"Сырсөзүңүзсүз түзмөктү коргоо функциялары иштебейт."</string>
<string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="218143910981979545">"Сырсөзүңүзсүз түзмөктү коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
@@ -610,23 +610,23 @@
<string name="unlock_disable_frp_warning_content_unknown" msgid="3570135744390201244">"Экраныңыздын кулпусусуз түзмөктү коргоо функциялары иштебейт."</string>
<string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="5775815077478538855">"Экраныңыздын кулпусусуз түзмөктү коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
-</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн өчүрүлөт жана алардын жардамы менен түзмөгүңүздүн кулпусун ачып, ар кандай нерселерди сатып алып же аккаунтка кире албай каласыз."</string>
+</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн өчүрүлөт жана алардын жардамы менен, түзмөгүңүздүн кулпусун ачып, ар кандай нерселерди сатып алып же аккаунтка кире албай каласыз."</string>
<string name="unlock_disable_frp_warning_content_pattern_profile" msgid="2369992898062808499">"Графикалык ачкычыңызсыз профилди коргоо функциялары иштебейт."</string>
<string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="8511105093090018735">"Графикалык ачкычыңызсыз профилди коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
-</xliff:g>Сакталган манжа издериңиз да бул профилден өчүрүлөт жана алардын жардамы менен профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же аккаунтка кире албай каласыз."</string>
+</xliff:g>Сакталган манжа издериңиз да бул профилден өчүрүлөт жана алардын жардамы менен, профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же аккаунтка кире албай каласыз."</string>
<string name="unlock_disable_frp_warning_content_pin_profile" msgid="7114165651000498040">"PIN кодуңузсуз профилди коргоо функциялары иштебейт."</string>
<string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="5118210431544156122">"PIN кодуңузсуз профилди коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
-</xliff:g>Сакталган манжа издериңиз да бул профилден өчүрүлөт жана алардын жардамы менен профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же аккаунтка кире албай каласыз."</string>
+</xliff:g>Сакталган манжа издериңиз да бул профилден өчүрүлөт жана алардын жардамы менен, профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же аккаунтка кире албай каласыз."</string>
<string name="unlock_disable_frp_warning_content_password_profile" msgid="3989497526180082037">"Сырсөзүңүзсүз профилди коргоо функциялары иштебейт."</string>
<string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="8360485354164416198">"Сырсөзүңүзсүз профилди коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
-</xliff:g>Сакталган манжа издериңиз да бул профилден өчүрүлөт жана алардын жардамы менен профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же аккаунтка кире албай каласыз."</string>
+</xliff:g>Сакталган манжа издериңиз да бул профилден өчүрүлөт жана алардын жардамы менен, профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же аккаунтка кире албай каласыз."</string>
<string name="unlock_disable_frp_warning_content_unknown_profile" msgid="4066001421137974082">"Экраныңыздын кулпусусуз профилди коргоо функциялары иштебейт."</string>
<string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1201259228331105948">"Экраныңыздын кулпусусуз профилди коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
-</xliff:g>Сакталган манжа издериңиз да бул профилден өчүрүлөт жана алардын жардамы менен профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же аккаунтка кире албай каласыз."</string>
+</xliff:g>Сакталган манжа издериңиз да бул профилден өчүрүлөт жана алардын жардамы менен, профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же аккаунтка кире албай каласыз."</string>
<string name="unlock_disable_frp_warning_ok" msgid="2373890505202766456">"Ооба, өчүрүлсүн"</string>
<string name="unlock_change_lock_pattern_title" msgid="7622476883851319877">"Кулпн ачуу үлгсн өзгрт"</string>
<string name="unlock_change_lock_pin_title" msgid="6671224158800812238">"Клпн ачуу PIN кдн өзгр"</string>
@@ -830,7 +830,7 @@
<string name="android_beam_settings_title" msgid="3083436415873738389">"Android Beam"</string>
<string name="android_beam_on_summary" msgid="8068287225180474199">"Дайындар NFC аркылуу өткөрүлөт"</string>
<string name="android_beam_off_summary" msgid="7365818039159364600">"Өчүк"</string>
- <string name="nfc_disabled_summary" msgid="2181777971122724361">"NFC өчүк болгондуктан жеткиликсиз"</string>
+ <string name="nfc_disabled_summary" msgid="2181777971122724361">"NFC өчүк болгондуктан, жеткиликсиз"</string>
<string name="android_beam_label" msgid="5340299879556025708">"Android Beam"</string>
<string name="android_beam_explained" msgid="4501176353247859329">"Бул мүмкүнчүлүк жандырылганда, түзмөктөрдү бири-бирине тийиштирип, NFC аркылуу веб баракчалар, YouTube видеолору, байланыштар, шилтемелер, сүрөттөр сыяктуу дайындарды биринен экинчисине өткөрө аласыз.\n\nТүзмөктөрдү бири-бирине тийиштирип (арка жактарын), экраныңызды басып коюңуз. Эмне өткөрүлөөрүн колдонмо өзү аныктай алат."</string>
<string name="wifi_quick_toggle_title" msgid="7935778388625246184">"Wi‑Fi"</string>
@@ -895,7 +895,7 @@
<string name="wifi_setup_wps" msgid="6730131677695521321">"Автоматтык тууралоо (WPS)"</string>
<string name="wifi_settings_scanning_required_title" msgid="3593457187659922490">"Wi‑Fi издөөнү күйгүзөсүзбү?"</string>
<string name="wifi_settings_scanning_required_summary" msgid="7469610959462708782">"Wi‑Fi тармактарына автоматтык түрдө туташуу үчүн, Wi-Fi издөө функциясын иштетишиңиз керек."</string>
- <string name="wifi_settings_scanning_required_info" msgid="5913535073390607386">"Бул функция аркылуу Интернет байланышы жок болсо да, колдонмолор менен кызматтар Wi-Fi тармактарын издей алышат. Жайгашкан жерди аныктоо функциясын жана кызматтарды жакшырткыңыз келсе, аны иштетиңиз."</string>
+ <string name="wifi_settings_scanning_required_info" msgid="5913535073390607386">"Бул функция аркылуу Интернет жок болсо да, колдонмолор менен кызматтар Wi-Fi тармактарын издей алышат. Жайгашкан жерди аныктоо функциясын жана кызматтарды жакшырткыңыз келсе, аны иштетиңиз."</string>
<string name="wifi_settings_scanning_required_turn_on" msgid="4327570180594277049">"Күйгүзүү"</string>
<string name="wifi_settings_scanning_required_enabled" msgid="3336102100425307040">"Wi‑Fi\'ды издөө күйгүзүлдү"</string>
<string name="wifi_show_advanced" msgid="8199779277168030597">"Өркүндөтүлгөн параметрлер"</string>
@@ -1067,7 +1067,7 @@
<string name="wifi_hotspot_name_summary_connected" msgid="8387768642326756749">"Башка түзмөктөр <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> тармагына туташа алышат"</string>
<string name="wifi_hotspot_password_title" msgid="4289338152595154889">"Байланыш түйүнүнүн сырсөзү"</string>
<string name="wifi_hotspot_ap_band_title" msgid="3485744480410441949">"Wi-Fi жыштыктарынын диапазону"</string>
- <string name="wifi_hotspot_footer_info_regular" msgid="3876006922622827363">"Байланыш түйүнү аркылуу Wi‑Fi тармагын түзүңүз. Анын жардамы менен башка түзмөктөр мобилдик Интернетке туташа алышат. Мобилдик Интернет үчүн кошумча акы алынышы мүмкүн."</string>
+ <string name="wifi_hotspot_footer_info_regular" msgid="3876006922622827363">"Байланыш түйүнү аркылуу Wi‑Fi тармагын түзүңүз. Анын жардамы менен, башка түзмөктөр мобилдик Интернетке туташа алышат. Мобилдик Интернет үчүн кошумча акы алынышы мүмкүн."</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="3339582350894639261">"Жакын жердеги түзмөктөр менен мазмунду бөлүшүү үчүн колдонмолор байланыш түйүнү болуп бере алышат."</string>
<string name="wifi_hotspot_auto_off_title" msgid="7416022590415189590">"Байланыш түйүнү автоматтык түрдө өчөт"</string>
<string name="wifi_hotspot_auto_off_summary" msgid="3866769400624802105">"Бир дагы түзмөк туташпаса, Wi‑Fi байланыш түйүнү автоматтык түрдө өчүп калат"</string>
diff --git a/tests/CarDeveloperOptions/res/values-mk/strings.xml b/tests/CarDeveloperOptions/res/values-mk/strings.xml
index c69807b..7f0c5aa 100644
--- a/tests/CarDeveloperOptions/res/values-mk/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mk/strings.xml
@@ -1690,7 +1690,7 @@
<string name="safety_and_regulatory_info" msgid="7113766428000920132">"Упатство за безбедност и регулатива"</string>
<string name="copyright_title" msgid="3847703367689932190">"Авторски права"</string>
<string name="license_title" msgid="7582145947873528540">"Лиценца"</string>
- <string name="terms_title" msgid="1804549588198223771">"Правила и услови"</string>
+ <string name="terms_title" msgid="1804549588198223771">"Одредби и услови"</string>
<string name="webview_license_title" msgid="8244960025549725051">"Системска лиценца за WebView"</string>
<string name="wallpaper_attributions" msgid="2941987966332943253">"Тапети"</string>
<string name="wallpaper_attributions_values" msgid="4461979853894606323">"Извор на сателитски снимки:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
diff --git a/tests/CarDeveloperOptions/res/values-my/strings.xml b/tests/CarDeveloperOptions/res/values-my/strings.xml
index 7cb218b..77c81fc 100644
--- a/tests/CarDeveloperOptions/res/values-my/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-my/strings.xml
@@ -239,7 +239,7 @@
<string name="ping_test_label" msgid="4759194831308897624">"Ping စမ်းသပ်ခြင်း လုပ်ဆောင်ပါ"</string>
<string name="radio_info_smsc_label" msgid="4561160340649588034">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="3992739670219389246">"အပ်ဒိတ်"</string>
- <string name="radio_info_smsc_refresh_label" msgid="5343925292858337909">"ပြန်လည်ဆန်းသစ်ရန်"</string>
+ <string name="radio_info_smsc_refresh_label" msgid="5343925292858337909">"ပြန်လည်စတင်ရန်"</string>
<string name="radio_info_toggle_dns_check_label" msgid="3058615074503857400">"DNS စစ်ဆေးမှုခလုတ်နှိပ်ပါ"</string>
<string name="oem_radio_info_label" msgid="8679815523111164378">"ထုတ်လုပ်သူနှင့် သက်ဆိုင်သော အချက်အလက်/ဆက်တင်များ"</string>
<string name="band_mode_title" msgid="8180320100446559884">"ရေဒီယိုလိုင်းမုဒ်သို့ သတ်မှတ်ပါ"</string>
@@ -745,7 +745,7 @@
<string name="bluetooth_error_title" msgid="5718761586633101960"></string>
<string name="bluetooth_connecting_error_message" msgid="8473359363469518478">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ကို ချိတ်ဆက်မရပါ။"</string>
<string name="bluetooth_preference_scan_title" msgid="457781003962324807">"စက်များကိုရှာဖွေရန် စကင်ပြုလုပ်နေသည်"</string>
- <string name="bluetooth_search_for_devices" msgid="6796307228261078451">"ပြန်လည်ဆန်းသစ်ရန်"</string>
+ <string name="bluetooth_search_for_devices" msgid="6796307228261078451">"ပြန်လည်စတင်ရန်"</string>
<string name="bluetooth_searching_for_devices" msgid="7820814625522702494">"ရှာဖွေနေသည်…"</string>
<string name="bluetooth_preference_device_settings" msgid="4247085616427015908">"စက်ပစ္စည်း အပြင်အဆင်များ"</string>
<string name="bluetooth_preference_paired_dialog_title" msgid="3567187438908143693">"ချိတ်တွဲထားသည့် ကိရိယာ"</string>
@@ -2440,7 +2440,7 @@
<string name="menu_stats_unplugged" msgid="774132771877485277">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> အားသွင်းကြိုးဖြုတ်စဥ်မှ"</string>
<string name="menu_stats_last_unplugged" msgid="197591229866380225">"<xliff:g id="UNPLUGGED">%1$s</xliff:g>မှ ကြိုးဖြုတ်ထားသည်"</string>
<string name="menu_stats_total" msgid="2270006562448894071">"အသုံးပြုမှု စုစုပေါင်း"</string>
- <string name="menu_stats_refresh" msgid="9017362786647223203">"ပြန်လည်ဆန်းသစ်ရန်"</string>
+ <string name="menu_stats_refresh" msgid="9017362786647223203">"ပြန်လည်စတင်ရန်"</string>
<string name="process_kernel_label" msgid="4175060316414593760">"Android OS"</string>
<string name="process_mediaserver_label" msgid="8591722404282619153">"မီဒီယာဆာဗာ"</string>
<string name="process_dex2oat_label" msgid="8249082119748556085">"အက်ပ်ပိုမိုကောင်းအောင်ပြုခြင်း"</string>
diff --git a/tests/CarDeveloperOptions/res/values-sl/strings.xml b/tests/CarDeveloperOptions/res/values-sl/strings.xml
index 004d9e2..79edce5 100644
--- a/tests/CarDeveloperOptions/res/values-sl/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sl/strings.xml
@@ -1866,7 +1866,7 @@
<string name="disable_text" msgid="5065834603951474397">"Onemogoči"</string>
<string name="enable_text" msgid="7179141636849225884">"Omogoči"</string>
<string name="clear_user_data_text" msgid="8894073247302821764">"Počisti shrambo"</string>
- <string name="app_factory_reset" msgid="8718986000278776272">"Odstrani posodobitve"</string>
+ <string name="app_factory_reset" msgid="8718986000278776272">"Odmesti posodobitve"</string>
<string name="auto_launch_enable_text" msgid="3372898942144027341">"Izbrali ste, da se bo pri nekaterih dejanjih ta aplikacija samodejno zagnala."</string>
<string name="always_allow_bind_appwidgets_text" msgid="2286211654774611037">"Aplikaciji dovolite, da ustvari pripomočke in dostopa do njihovih podatkov."</string>
<string name="auto_launch_disable_text" msgid="8560921288036801416">"Ni privzetih nastavitev."</string>
diff --git a/tests/CarDeveloperOptions/res/values-sq/strings.xml b/tests/CarDeveloperOptions/res/values-sq/strings.xml
index 8583d20..dd535eb 100644
--- a/tests/CarDeveloperOptions/res/values-sq/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sq/strings.xml
@@ -294,7 +294,7 @@
<string name="okay" msgid="5838476766924989056">"Në rregull"</string>
<string name="forget" msgid="7735525146062672874">"Harro"</string>
<string name="save" msgid="3418211178410498517">"Ruaj"</string>
- <string name="done" msgid="5143229467535372339">"U krye!"</string>
+ <string name="done" msgid="5143229467535372339">"U krye"</string>
<string name="apply" msgid="951230399613164126">"Zbato"</string>
<string name="share" msgid="3567029787293158575">"Ndaj"</string>
<string name="add" msgid="903114118076816060">"Shto"</string>
@@ -809,7 +809,7 @@
<string name="wifi_display_details" msgid="6379855523460749126">"Shfaq cilësimet"</string>
<string name="wifi_display_options_title" msgid="4587264519668872213">"Opsionet e shfaqjes së Wi-Fi"</string>
<string name="wifi_display_options_forget" msgid="7882982544626742073">"Harro"</string>
- <string name="wifi_display_options_done" msgid="5922060890309265817">"U krye!"</string>
+ <string name="wifi_display_options_done" msgid="5922060890309265817">"U krye"</string>
<string name="wifi_display_options_name" msgid="8477627781133827607">"Emri"</string>
<string name="wifi_band_24ghz" msgid="2973143764653628618">"2,4 GHz"</string>
<string name="wifi_band_5ghz" msgid="6469832209748522207">"5 GHz"</string>
@@ -2827,7 +2827,7 @@
<string name="backup_pw_cancel_button_text" msgid="6170984655621611957">"Anulo"</string>
<string name="additional_system_update_settings_list_item_title" msgid="8674710454802166341">"Përditësime të sistemit"</string>
<string name="ssl_ca_cert_warning" msgid="7794291734272626026">"Rrjeti mund të jetë i monitoruar"</string>
- <string name="done_button" msgid="7652373284597307008">"U krye!"</string>
+ <string name="done_button" msgid="7652373284597307008">"U krye"</string>
<plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7323708984446517980">
<item quantity="other">Besoji ose hiqi certifikatat</item>
<item quantity="one">Besoje ose hiqe certifikatën</item>
@@ -3426,7 +3426,7 @@
<string name="app_notification_row_banned" msgid="2079325338122151677">"I bllokuar"</string>
<string name="app_notification_row_priority" msgid="432299064888787236">"Me prioritet"</string>
<string name="app_notification_row_sensitive" msgid="4919671519227722958">"Delikate"</string>
- <string name="app_notifications_dialog_done" msgid="5395611029779655968">"U krye!"</string>
+ <string name="app_notifications_dialog_done" msgid="5395611029779655968">"U krye"</string>
<string name="app_notification_importance_title" msgid="1902794400671001142">"Rëndësia"</string>
<string name="notification_show_lights_title" msgid="5381920725933228542">"Drita me pulsim"</string>
<string name="notification_vibrate_title" msgid="8221718258793835282">"Dridhje"</string>
diff --git a/tests/CarDeveloperOptions/res/values-sw/strings.xml b/tests/CarDeveloperOptions/res/values-sw/strings.xml
index c33fe8d..a2b211b 100644
--- a/tests/CarDeveloperOptions/res/values-sw/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sw/strings.xml
@@ -574,7 +574,7 @@
<string name="unlock_set_unlock_pin_summary" msgid="8076921768675948228">"Wastani hadi usalama wa juu"</string>
<string name="unlock_set_unlock_password_title" msgid="2092949379238466560">"Nenosiri"</string>
<string name="unlock_set_unlock_password_summary" msgid="7042787631866059147">"Usalama wa juu"</string>
- <string name="unlock_set_do_later_title" msgid="2939110070503695956">"Siyo sasa"</string>
+ <string name="unlock_set_do_later_title" msgid="2939110070503695956">"Si sasa"</string>
<string name="current_screen_lock" msgid="398328543694154510">"Mbinu inayotumika kufunga skrini"</string>
<string name="fingerprint_unlock_set_unlock_pattern" msgid="132337696546315927">"Alama ya kidole + Mchoro"</string>
<string name="fingerprint_unlock_set_unlock_pin" msgid="886426673328906002">"Alama ya kidole + PIN"</string>
@@ -2874,7 +2874,7 @@
<string name="user_setup_dialog_message" msgid="2988559933258353919">"Hakikisha kuwa mtu huyu anaweza kuchukua kifaa na kuweka mapendeleo yake"</string>
<string name="user_setup_profile_dialog_message" msgid="7611900802824048526">"Ungependa kuweka wasifu sasa?"</string>
<string name="user_setup_button_setup_now" msgid="4941459406266856176">"Mwongeze sasa"</string>
- <string name="user_setup_button_setup_later" msgid="6596031428556518752">"Siyo sasa"</string>
+ <string name="user_setup_button_setup_later" msgid="6596031428556518752">"Si sasa"</string>
<string name="user_cannot_manage_message" product="tablet" msgid="7108992906553210763">"Mmiliki wa kompyuta kibao pekee ndiye anayeweza kudhibiti watumiaji."</string>
<string name="user_cannot_manage_message" product="default" msgid="915260531390608092">"Mmiliki wa simu pekee ndiye anayeweza kudhibiti watumiaji."</string>
<string name="user_cannot_add_accounts_message" msgid="5993561303748749097">"Wasifu zilizodhibitiwa haziwezi kuongeza akaunti"</string>
@@ -4505,7 +4505,7 @@
<string name="media_output_panel_summary_of_playing_device" msgid="7425231720911606911">"Inacheza sasa kwenye <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
<string name="wfc_disclaimer_title_text" msgid="3245793509743182243">"Maelezo muhimu"</string>
<string name="wfc_disclaimer_agree_button_text" msgid="4706101805260434404">"ENDELEA"</string>
- <string name="wfc_disclaimer_disagree_text" msgid="908289420390194127">"HAPANA, ASANTE"</string>
+ <string name="wfc_disclaimer_disagree_text" msgid="908289420390194127">"HAPANA"</string>
<string name="wfc_disclaimer_location_title_text" msgid="5696194250838686019">"Eneo"</string>
<string name="wfc_disclaimer_location_desc_text" msgid="3879710366995108723">"Mtoa huduma wako huenda atachukua eneo lako ili atoe huduma hii.\n\n Tafadhali kagua sera ya faragha ya mtoa huduma wako."</string>
<string name="forget_passpoint_dialog_message" msgid="3337626966248310367">"Huenda ukapoteza idhini ya kutumia muda au data inayosalia. Wasiliana na mtoa huduma wako kabla hujaondoa."</string>
diff --git a/tests/CarDeveloperOptions/res/values-ta/strings.xml b/tests/CarDeveloperOptions/res/values-ta/strings.xml
index e24bd36..8399953 100644
--- a/tests/CarDeveloperOptions/res/values-ta/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ta/strings.xml
@@ -31,8 +31,8 @@
<string name="dev_settings_disabled_warning" msgid="3198732189395396721">"முதலில் டெவெலப்பர் விருப்பங்களை இயக்கவும்."</string>
<string name="header_category_wireless_networks" msgid="8968405993937795898">"வயர்லெஸ் & நெட்வொர்க்குகள்"</string>
<string name="header_category_system" msgid="4045988717359334410">"சிஸ்டம்"</string>
- <string name="radio_info_data_connection_enable" msgid="2554249462719717119">"தரவு இணைப்பை இயக்கு"</string>
- <string name="radio_info_data_connection_disable" msgid="2430609627397999371">"தரவு இணைப்பை முடக்கு"</string>
+ <string name="radio_info_data_connection_enable" msgid="2554249462719717119">"டேட்டா இணைப்பை இயக்கு"</string>
+ <string name="radio_info_data_connection_disable" msgid="2430609627397999371">"டேட்டா இணைப்பை முடக்கு"</string>
<string name="volte_provisioned_switch_string" msgid="6326756678226686704">"VoLTE ஒதுக்கீட்டுக் கொடி இயக்கத்தில்"</string>
<string name="vt_provisioned_switch_string" msgid="7458479879009293613">"வீடியோ அழைப்பு அமைக்கப்பட்டது"</string>
<string name="wfc_provisioned_switch_string" msgid="5446697646596639516">"வைஃபை அழைப்பு அமைக்கப்பட்டது"</string>
@@ -162,7 +162,7 @@
<string name="bluetooth_map_request" msgid="34345631620551756">"செய்திக்கான அணுகல் கோரிக்கை"</string>
<string name="bluetooth_map_acceptance_dialog_text" msgid="736507842082640410">"உங்கள் செய்திகளை %1$s அணுக விரும்புகிறது. %2$s க்கு அணுகலை வழங்கவா?"</string>
<string name="bluetooth_sap_request" msgid="6318039677671263261">"SIM அணுகல் கோரிக்கை"</string>
- <string name="bluetooth_sap_acceptance_dialog_text" msgid="1909352413109340355">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> உங்கள் சிம் கார்டை அணுக விரும்புகிறது. சிம் கார்டிற்கு அணுகல் வழங்குவது இணைப்பின் போது, உங்கள் சாதனத்தின் தரவு இணைப்பை முடக்கும். <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>க்கு அணுகல் வழங்கவும்"</string>
+ <string name="bluetooth_sap_acceptance_dialog_text" msgid="1909352413109340355">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> உங்கள் சிம் கார்டை அணுக விரும்புகிறது. சிம் கார்டிற்கு அணுகல் வழங்குவது இணைப்பின் போது, உங்கள் சாதனத்தின் டேட்டா இணைப்பை முடக்கும். <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>க்கு அணுகல் வழங்கவும்"</string>
<string name="bluetooth_device_name_summary" msgid="8661066392056595005">"பிற சாதனங்களில் “<xliff:g id="DEVICE_NAME">^1</xliff:g>” எனத் தெரியும்"</string>
<string name="bluetooth_off_footer" msgid="7658444560543730571">"பிற சாதனங்களுடன் இணைக்க, புளூடூத்தை ஆன் செய்யவும்."</string>
<string name="bluetooth_paired_device_title" msgid="8361860197780425286">"உங்கள் சாதனங்கள்"</string>
@@ -312,7 +312,7 @@
<string name="roaming" msgid="8860308342135146004">"ரோமிங்"</string>
<string name="roaming_enable" msgid="2108142024297441116">"ரோமிங்கின் போது டேட்டா சேவைகளுடன் இணை"</string>
<string name="roaming_disable" msgid="1915440242079953809">"ரோமிங்கின் போது டேட்டா சேவைகளுடன் இணை"</string>
- <string name="roaming_reenable_message" msgid="8388505868655113258">"உங்களுடைய உள்ளூர் நெட்வொர்க்கில் தரவு ரோமிங்கை முடக்கியுள்ளதால் உங்கள் தரவு இணைப்பை இழந்துவிட்டீர்கள்."</string>
+ <string name="roaming_reenable_message" msgid="8388505868655113258">"உங்களுடைய உள்ளூர் நெட்வொர்க்கில் தரவு ரோமிங்கை முடக்கியுள்ளதால் உங்கள் டேட்டா இணைப்பை இழந்துவிட்டீர்கள்."</string>
<string name="roaming_turn_it_on_button" msgid="4370846458830537578">"இதை இயக்கவும்"</string>
<string name="roaming_warning" msgid="5488050911277592868">"கட்டணம் விதிக்கப்படலாம்."</string>
<string name="roaming_warning_multiuser" product="tablet" msgid="7090388691615686893">"நீங்கள் தரவு ரோமிங்கை அனுமதிக்கும்போது, குறிப்பிட்ட ரோமிங் பேமெண்ட்கள் உங்களுக்கு விதிக்கப்படலாம்!\n\nஅமைப்பானது, டேப்லெட்டில் உள்ள அனைவரையும் பாதிக்கும்."</string>
@@ -1239,7 +1239,7 @@
<string name="wallpaper_settings_title" msgid="347390905813529607">"வால்பேப்பர்"</string>
<string name="style_and_wallpaper_settings_title" msgid="8898539141152705754">"ஸ்டைல்கள் & வால்பேப்பர்கள்"</string>
<string name="wallpaper_settings_summary_default" msgid="2626880032742784599">"இயல்பு"</string>
- <string name="wallpaper_settings_summary_custom" msgid="8950504698015331202">"தனிப்பயன்"</string>
+ <string name="wallpaper_settings_summary_custom" msgid="8950504698015331202">"பிரத்தியேகம்"</string>
<string name="wallpaper_suggestion_title" msgid="3012130414886743201">"வால்பேப்பரை மாற்று"</string>
<string name="wallpaper_suggestion_summary" msgid="4247262938988875842">"திரையைப் பிரத்தியேகமாக்கு"</string>
<string name="wallpaper_settings_fragment_title" msgid="1503701065297188901">"வால்பேப்பர் தேர்வு"</string>
@@ -2043,7 +2043,7 @@
<string name="display_category_title" msgid="545168481672250195">"திரை அமைப்பு"</string>
<string name="interaction_control_category_title" msgid="8775039211811947683">"ஊடாடல் கட்டுப்பாடுகள்"</string>
<string name="user_installed_services_category_title" msgid="4288689493753221319">"பதிவிறக்கிய சேவைகள்"</string>
- <string name="experimental_category_title" msgid="3797000069740110717">"சோதனை முயற்சி"</string>
+ <string name="experimental_category_title" msgid="3797000069740110717">"பரிசோதனை முயற்சி"</string>
<string name="feature_flags_dashboard_title" msgid="3153034144122754381">"அம்சங்களை மாற்றுதல்"</string>
<string name="talkback_title" msgid="3717960404234260050">"Talkback"</string>
<string name="talkback_summary" msgid="6602857105831641574">"திரைப் படிப்பான் முக்கியமாக பார்வையற்றோர் மற்றும் பார்வைக் குறைபாடு உள்ளவர்களுக்காக வடிவமைக்கப்பட்டது"</string>
@@ -2150,7 +2150,7 @@
<string name="captioning_locale" msgid="4734464353806207943">"மொழி"</string>
<string name="captioning_text_size" msgid="1707122517246408084">"உரையின் அளவு"</string>
<string name="captioning_preset" msgid="7429888317480872337">"தலைப்பின் நடை"</string>
- <string name="captioning_custom_options_title" msgid="4530479671071326732">"தனிப்பயன் விருப்பங்கள்"</string>
+ <string name="captioning_custom_options_title" msgid="4530479671071326732">"பிரத்தியேக விருப்பங்கள்"</string>
<string name="captioning_background_color" msgid="2434458880326292180">"பின்புல வண்ணம்"</string>
<string name="captioning_background_opacity" msgid="8178926599201811936">"பின்னணி ஒளிபுகாத்தன்மை"</string>
<string name="captioning_window_color" msgid="8696903405657599896">"தலைப்பு சாளரத்தின் வண்ணம்"</string>
@@ -2619,7 +2619,7 @@
<string name="sync_gmail" msgid="4457967084840001296">"Gmail"</string>
<string name="sync_calendar" msgid="6573708019827519372">"கேலெண்டர்"</string>
<string name="sync_contacts" msgid="5687434785723746534">"தொடர்புகள்"</string>
- <string name="sync_plug" msgid="6703804441408427257"><font fgcolor="#ffffffff">"Google ஒத்திசைவுக்கு வரவேற்கிறோம்!"</font>" \nநீங்கள் எங்கிருந்தாலும் உங்கள் தொடர்புகள், சந்திப்புகள் மற்றும் பலவற்றுக்கான அணுகலை அனுமதிப்பதற்காக Google தரவை ஒத்திசைக்கிறது."</string>
+ <string name="sync_plug" msgid="6703804441408427257"><font fgcolor="#ffffffff">"Google ஒத்திசைவுக்கு வரவேற்கிறோம்!"</font>" \nநீங்கள் எங்கிருந்தாலும் உங்கள் தொடர்புகள், அப்பாயிண்ட்மெண்ட்டுகள் மற்றும் பலவற்றுக்கான அணுகலை அனுமதிப்பதற்காக Google தரவை ஒத்திசைக்கிறது."</string>
<string name="header_application_sync_settings" msgid="4581847153669774489">"ஆப்ஸ் ஒத்திசைவு அமைப்பு"</string>
<string name="header_data_and_synchronization" msgid="400831816068697286">"தரவு & ஒத்திசைத்தல்"</string>
<string name="preference_change_password_title" msgid="7243527448378789274">"கடவுச்சொல்லை மாற்று"</string>
@@ -3201,8 +3201,8 @@
<string name="zen_mode_restrict_notifications_hide_summary" msgid="1449301153755270168">"அறிவிப்புகளைப் பார்க்கவோ கேட்கவோ மாட்டீர்கள்"</string>
<string name="zen_mode_restrict_notifications_hide_footer" msgid="7617688597593946765">"புதிய அல்லது ஏற்கனவே இருக்கும் அறிவிப்புகளை உங்கள் மொபைல் காட்டாது, அதிர்வுறாது அல்லது ஒலி எழுப்பாது. உங்கள் மொபைலின் செயல்பாடு மற்றும் நிலை தொடர்பான முக்கிய அறிவிப்புகள் தொடர்ந்து தோன்றும் என்பதை நினைவில்கொள்ளவும்.\n\nதொந்தரவு செய்ய வேண்டாம் என்பதை நீங்கள் முடக்கும் போது, உங்கள் திரையின் மேலிருந்து கீழாக ஸ்வைப் செய்வதன் மூலம் தவறிய அழைப்புகள் எவை என்பதைப் பார்க்கலாம்."</string>
<string name="zen_mode_restrict_notifications_custom" msgid="3167252482570424133">"பிரத்தியேகமானது"</string>
- <string name="zen_mode_restrict_notifications_enable_custom" msgid="6376983315529894440">"தனிப்பயன் அமைப்பை இயக்கு"</string>
- <string name="zen_mode_restrict_notifications_disable_custom" msgid="8004212081465043044">"தனிப்பயன் அமைப்பை அகற்று"</string>
+ <string name="zen_mode_restrict_notifications_enable_custom" msgid="6376983315529894440">"பிரத்தியேக அமைப்பை இயக்கு"</string>
+ <string name="zen_mode_restrict_notifications_disable_custom" msgid="8004212081465043044">"பிரத்தியேக அமைப்பை அகற்று"</string>
<string name="zen_mode_restrict_notifications_summary_muted" msgid="1075196788469381282">"அறிவிப்புகள் வரும்போது ஒலியெழுப்ப வேண்டாம்"</string>
<string name="zen_mode_restrict_notifications_summary_custom" msgid="4982187708274505748">"பகுதியளவு மறைக்கப்பட்டவை"</string>
<string name="zen_mode_restrict_notifications_summary_hidden" msgid="7637206880685474111">"அறிவிப்புகள் வரும்போது காட்டவோ ஒலியெழுப்பவோ வேண்டாம்"</string>
@@ -3212,7 +3212,7 @@
<string name="zen_mode_block_effect_sound" msgid="1499243540186357631">"ஒலியையும் அதிர்வையும் முடக்கு"</string>
<string name="zen_mode_block_effect_intent" msgid="5666951244667422668">"திரையை ஆன் செய்யாதே"</string>
<string name="zen_mode_block_effect_light" msgid="8679333758037487644">"ஒளியை மிளிரச் செய்யாதே"</string>
- <string name="zen_mode_block_effect_peek" msgid="6075662813575910221">"திரையில் அறிவிப்புகளைப் பாப் அப் செய்யாதே"</string>
+ <string name="zen_mode_block_effect_peek" msgid="6075662813575910221">"திரையில் அறிவிப்புகளைப் பாப்-அப் செய்யாதே"</string>
<string name="zen_mode_block_effect_status" msgid="6516614225115681068">"திரையின் மேற்பகுதியில் \'நிலைப் பட்டி\' ஐகான்களை மறை"</string>
<string name="zen_mode_block_effect_badge" msgid="3891743027347075136">"ஆப்ஸ் ஐகான்களில் அறிவிப்புப் புள்ளிகளை மறை"</string>
<string name="zen_mode_block_effect_ambient" msgid="6382013125863616197">"அறிவிப்புகள் வரும்போது சாதனத்தை எழுப்ப வேண்டாம்"</string>
@@ -3235,7 +3235,7 @@
<string name="zen_mode_settings_dnd_automatic_rule" msgid="2843297614114625408">"திட்ட அட்டவணையின் (<xliff:g id="RULE_NAME">%s</xliff:g>) மூலம் ‘தொந்தரவு செய்ய வேண்டாம்’ தானாக ஆன் செய்யப்பட்டது"</string>
<string name="zen_mode_settings_dnd_automatic_rule_app" msgid="5103454923160912313">"(<xliff:g id="APP_NAME">%s</xliff:g>) ஆப்ஸின் மூலம், ‘தொந்தரவு செய்ய வேண்டாம்’ தானாக ஆன் செய்யப்பட்டது"</string>
<string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6335108298640066560">"பிரத்தியேக அமைப்புகளுடன் <xliff:g id="RULE_NAMES">%s</xliff:g> என்பதற்குத் \'தொந்தரவு செய்ய வேண்டாம்’ ஆன் நிலையில் உள்ளது."</string>
- <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="4007974052885089379"><annotation id="link">" தனிப்பயன் அமைப்புகளைக் காட்டு"</annotation></string>
+ <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="4007974052885089379"><annotation id="link">" பிரத்தியேக அமைப்புகளைக் காட்டு"</annotation></string>
<string name="zen_interruption_level_priority" msgid="9178419297408319234">"முக்கியமானவை மட்டும்"</string>
<string name="zen_mode_and_condition" msgid="4123722186007123567">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="zen_mode_sound_summary_on_with_info" msgid="2539952366467518398">"ஆன் / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -3264,7 +3264,7 @@
<string name="zen_sound_one_allowed" msgid="2417988417080579980">"ஒலியடக்கப்பட்டது, ஆனால் <xliff:g id="SOUND_TYPE">%1$s</xliff:g> அனுமதிக்கப்பட்டுள்ளது"</string>
<string name="zen_sound_two_allowed" msgid="299344481401823614">"ஒலியடக்கப்பட்டது, ஆனால் <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> மற்றும் <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> அனுமதிக்கப்பட்டுள்ளன"</string>
<string name="zen_sound_three_allowed" msgid="8374564453060696012">"ஒலியடக்கப்பட்டது, ஆனால் <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> மற்றும் <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> அனுமதிக்கப்பட்டுள்ளன"</string>
- <string name="zen_custom_settings_dialog_title" msgid="908049494676219236">"தனிப்பயன் அமைப்புகள்"</string>
+ <string name="zen_custom_settings_dialog_title" msgid="908049494676219236">"பிரத்தியேக அமைப்புகள்"</string>
<string name="zen_custom_settings_dialog_review_schedule" msgid="2247761749333893513">"திட்ட அட்டவணையைச் சரிபார்"</string>
<string name="zen_custom_settings_dialog_ok" msgid="3572754922025853427">"புரிந்தது"</string>
<string name="zen_custom_settings_notifications_header" msgid="7469592764589354302">"அறிவிப்புகள்"</string>
@@ -3288,7 +3288,7 @@
<string name="work_sync_dialog_title" msgid="4799120971202956837">"ஒலிகளை மாற்றியமைக்கவா?"</string>
<string name="work_sync_dialog_yes" msgid="2110726233746476066">"மாற்று"</string>
<string name="work_sync_dialog_message" msgid="944233463059129156">"உங்கள் தனிப்பட்ட சுயவிவர ஒலிகள், உங்கள் பணி விவரத்திற்குப் பயன்படுத்தப்படும்"</string>
- <string name="ringtones_install_custom_sound_title" msgid="210551218424553671">"தனிப்பயன் ஒலியைச் சேர்க்கவா?"</string>
+ <string name="ringtones_install_custom_sound_title" msgid="210551218424553671">"பிரத்தியேக ஒலியைச் சேர்க்கவா?"</string>
<string name="ringtones_install_custom_sound_content" msgid="6683649115132255452">"இந்தக் கோப்பு, <xliff:g id="FOLDER_NAME">%s</xliff:g> கோப்புறைக்கு நகலெடுக்கப்படும்"</string>
<string name="ringtones_category_preference_title" msgid="4491932700769815470">"ரிங்டோன்கள்"</string>
<string name="other_sound_category_preference_title" msgid="2045757472469840859">"பிற ஒலிகள் மற்றும் அதிர்வுகள்"</string>
@@ -3339,7 +3339,7 @@
<string name="notification_importance_low" msgid="7609797151662295364">"ஒலிக்காமல் காட்டும்"</string>
<string name="notification_importance_default" msgid="4091563759103917166">"ஒலியெழுப்பும்"</string>
<string name="notification_importance_high" msgid="7973764540402436656">"ஒலியெழுப்பி, திரையில் காட்டும்"</string>
- <string name="notification_importance_high_silent" msgid="3177662759865661155">"திரையில் பாப் அப் செய்யும்"</string>
+ <string name="notification_importance_high_silent" msgid="3177662759865661155">"திரையில் பாப்-அப் செய்யும்"</string>
<string name="notification_importance_min_title" msgid="705872537330744154">"சிறிதாக்கு"</string>
<string name="notification_importance_low_title" msgid="2956199021781786232">"நடுத்தர முக்கியத்துவம்"</string>
<string name="notification_importance_default_title" msgid="7985549807203332482">"அதிக முக்கியத்துவம்"</string>
@@ -3444,9 +3444,9 @@
<string name="zen_mode_delete_rule_confirmation" msgid="2646596466259025978">"\"<xliff:g id="RULE">%1$s</xliff:g>\" விதியை நீக்கவா?"</string>
<string name="zen_mode_delete_rule_button" msgid="611058106279881991">"நீக்கு"</string>
<string name="zen_mode_rule_type_unknown" msgid="2819480113355191421">"தெரியாதது"</string>
- <string name="zen_mode_app_set_behavior" msgid="8597398780262575571">"இந்த அமைப்புகளை இப்போது மாற்ற முடியாது. தனிப்பயன் செயல்பாட்டின் அடிப்படையில், ஆப்ஸின் (<xliff:g id="APP_NAME">%1$s</xliff:g>) மூலம் ’தொந்தரவு செய்ய வேண்டாம்’ தானாக ஆன் செய்யப்பட்டது."</string>
- <string name="zen_mode_unknown_app_set_behavior" msgid="5666462954329932302">"இந்த அமைப்புகளை இப்போது மாற்ற முடியாது. தனிப்பயன் செயல்பாட்டின் அடிப்படையில், ஆப்ஸின் மூலம் ’தொந்தரவு செய்ய வேண்டாம்’ தானாக ஆன் செய்யப்பட்டது."</string>
- <string name="zen_mode_qs_set_behavior" msgid="788646569296973998">"இந்த அமைப்புகளை இப்போது மாற்ற முடியாது. தனிப்பயன் செயல்பாட்டின் அடிப்படையில் ’தொந்தரவு செய்ய வேண்டாம்’ கைமுறையாக ஆன் செய்யப்பட்டது."</string>
+ <string name="zen_mode_app_set_behavior" msgid="8597398780262575571">"இந்த அமைப்புகளை இப்போது மாற்ற முடியாது. பிரத்தியேக செயல்பாட்டின் அடிப்படையில், ஆப்ஸின் (<xliff:g id="APP_NAME">%1$s</xliff:g>) மூலம் ’தொந்தரவு செய்ய வேண்டாம்’ தானாக ஆன் செய்யப்பட்டது."</string>
+ <string name="zen_mode_unknown_app_set_behavior" msgid="5666462954329932302">"இந்த அமைப்புகளை இப்போது மாற்ற முடியாது. பிரத்தியேக செயல்பாட்டின் அடிப்படையில், ஆப்ஸின் மூலம் ’தொந்தரவு செய்ய வேண்டாம்’ தானாக ஆன் செய்யப்பட்டது."</string>
+ <string name="zen_mode_qs_set_behavior" msgid="788646569296973998">"இந்த அமைப்புகளை இப்போது மாற்ற முடியாது. பிரத்தியேக செயல்பாட்டின் அடிப்படையில் ’தொந்தரவு செய்ய வேண்டாம்’ கைமுறையாக ஆன் செய்யப்பட்டது."</string>
<string name="zen_schedule_rule_type_name" msgid="4516851728113801329">"நேரம்"</string>
<string name="zen_schedule_rule_enabled_toast" msgid="1742354493045049048">"குறிப்பிட்ட நேரங்களில் தொந்தரவு செய்ய வேண்டாம் என்பதை இயக்கும் தானியங்கு விதி"</string>
<string name="zen_event_rule_type_name" msgid="7467729997336583342">"நிகழ்வு"</string>
@@ -3506,7 +3506,7 @@
<string name="zen_mode_reminders" msgid="7560664194610054038">"நினைவூட்டல்களை அனுமதி"</string>
<string name="zen_mode_reminders_list" msgid="7347061314032326677">"நினைவூட்டல்கள்"</string>
<string name="zen_mode_events" msgid="5784076928339534984">"நிகழ்வுகளை அனுமதி"</string>
- <string name="zen_mode_bypassing_apps" msgid="3080739479028713449">"ஆப்ஸை மேலெழுத அனுமதிக்கின்றன"</string>
+ <string name="zen_mode_bypassing_apps" msgid="3080739479028713449">"ஆப்ஸை மீறிச் செயல்பட அனுமதிக்கின்றன"</string>
<string name="zen_mode_bypassing_apps_title" msgid="2115024664615538847">"ஆப்ஸ் விதிவிலக்குகள்"</string>
<plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="8723144434730871572">
<item quantity="other">‘தொந்தரவு செய்ய வேண்டாம்’ அம்சம் ஆன் செய்யப்பட்டிருந்தாலும் <xliff:g id="NUMBER">%1$d</xliff:g> ஆப்ஸில் இருந்து அறிவிப்புகள் வரும்</item>
@@ -3542,7 +3542,7 @@
<string name="zen_mode_summary_alarms_only_by_time" msgid="2462898862757904560">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> வரை அலாரங்கள் மட்டும் என மாற்று"</string>
<string name="zen_mode_summary_always" msgid="2703276042913200837">"எப்போதும் குறுக்கிடு என மாற்று"</string>
<string name="zen_mode_screen_on" msgid="7098470659072167219">"திரை ஆன் செய்யப்பட்டிருக்கும்போது"</string>
- <string name="zen_mode_screen_on_summary" msgid="8275416649295357524">"\'தொந்தரவு செய்ய வேண்டாம்\' மூலம் ஒலியடக்கப்பட்ட அறிவிப்புகள் வரும்போது, திரையில் பாப் அப் ஆவதுடன், நிலைப்பட்டி ஐகானைக் காட்டும்"</string>
+ <string name="zen_mode_screen_on_summary" msgid="8275416649295357524">"\'தொந்தரவு செய்ய வேண்டாம்\' மூலம் ஒலியடக்கப்பட்ட அறிவிப்புகள் வரும்போது, திரையில் பாப்-அப் ஆவதுடன், நிலைப்பட்டி ஐகானைக் காட்டும்"</string>
<string name="zen_mode_screen_off" msgid="84211490206459038">"திரை ஆஃப் செய்யப்பட்டிருக்கும்போது"</string>
<string name="zen_mode_screen_off_summary" msgid="8592179073243001267">"’தொந்தரவு செய்ய வேண்டாம்’ அம்சத்தின் மூலம் ஒலியடக்கப்பட்ட அறிவிப்புகள் வரும்போது, திரை ஆன் செய்யப்பட்டு, ஒளியை மிளிரச் செய்யட்டும்"</string>
<string name="zen_mode_screen_off_summary_no_led" msgid="7255874108150630145">"’தொந்தரவு செய்ய வேண்டாம்’ அம்சத்தின் மூலம் ஒலியடக்கப்பட்ட அறிவிப்புகள் வரும்போது, திரையை ஆன் செய்யட்டும்."</string>
@@ -3560,7 +3560,7 @@
<string name="screen_pinning_unlock_none" msgid="9183040569733226911">"திரையை விலக்கும்போது சாதனத்தைப் பூட்டு"</string>
<string name="opening_paragraph_delete_profile_unknown_company" msgid="2350380017136403670">"இந்தப் பணிக் கணக்கை நிர்வகிப்பது:"</string>
<string name="managing_admin" msgid="3212584016377581608">"நிர்வகிப்பது: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
- <string name="experimental_preference" msgid="5903223408406906322">"(சோதனை முயற்சி)"</string>
+ <string name="experimental_preference" msgid="5903223408406906322">"(பரிசோதனை முயற்சி)"</string>
<string name="encryption_interstitial_header" msgid="3298397268731647519">"பாதுகாப்பான தொடக்கம்"</string>
<string name="encryption_continue_button" msgid="2808797091460167842">"தொடர்"</string>
<string name="encryption_interstitial_message_pin" msgid="6592265582286340307">"இந்தச் சாதனத்தைத் துவக்கும் முன், பின் தேவைப்படுமாறு அமைத்து, மேலும் பாதுகாக்கலாம். சாதனம் துவங்கும் வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஉங்கள் சாதனம் தொலைந்து போனாலோ திருடப்பட்டாலோ, அதில் உள்ள உங்கள் டேட்டாவைப் பாதுகாக்க இதைக் கடைபிடிக்கலாம். சாதனத்தைத் தொடங்கும் போது, பின்னைக் கேட்பதை அமைக்கவா?"</string>
@@ -4466,7 +4466,7 @@
<string name="mobile_data_ap_mode_disabled" msgid="2452716524753472885">"விமானப் பயன்முறையின்போது கிடைக்காது"</string>
<string name="force_desktop_mode" msgid="6973100177551040740">"கட்டாய டெஸ்க்டாப் பயன்முறை"</string>
<string name="force_desktop_mode_summary" msgid="8865007610266954719">"இரண்டாம்நிலை திரைகளில் \'கட்டாயப் பரிசோதனை டெஸ்க்டாப்\' பயன்முறை"</string>
- <string name="hwui_force_dark_title" msgid="3744825212652331461">"force-dark அம்சத்தை மேலெழுதுதல்"</string>
+ <string name="hwui_force_dark_title" msgid="3744825212652331461">"force-dark அம்சத்தை மீறிச் செயல்படுதல்"</string>
<string name="hwui_force_dark_summary" msgid="2051891908674765817">"எப்போதும் இயக்கத்தில் இருக்குமாறு force-dark அம்சத்தை மேலெழுதுகிறது"</string>
<string name="privacy_dashboard_title" msgid="8764930992456607513">"தனியுரிமை"</string>
<string name="privacy_dashboard_summary" msgid="7916431309860824945">"அனுமதிகள், கணக்குச் செயல்பாடு, தனிப்பட்ட தரவு"</string>
diff --git a/tests/MultiDisplayTest/Android.mk b/tests/MultiDisplayTest/Android.mk
index dcee7b4..91b1a0c 100644
--- a/tests/MultiDisplayTest/Android.mk
+++ b/tests/MultiDisplayTest/Android.mk
@@ -31,9 +31,11 @@
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_STATIC_ANDROID_LIBRARIES += \
+ androidx.annotation_annotation \
androidx.lifecycle_lifecycle-livedata \
androidx.lifecycle_lifecycle-viewmodel \
- androidx.car_car
+ androidx.fragment_fragment \
+ androidx.recyclerview_recyclerview
include $(BUILD_PACKAGE)
diff --git a/tests/MultiDisplayTest/res/values-ar/strings.xml b/tests/MultiDisplayTest/res/values-ar/strings.xml
index 310a066..d36c86e 100644
--- a/tests/MultiDisplayTest/res/values-ar/strings.xml
+++ b/tests/MultiDisplayTest/res/values-ar/strings.xml
@@ -20,5 +20,5 @@
<string name="presentation_info_button" msgid="3138993281071284633">"معلومات"</string>
<string name="presentation_display_id_text" msgid="4094870216265474973">"الشاشة #%1$d: %2$s"</string>
<string name="presentation_alert_info_text" msgid="8826889501417145349">"معلومات عن الشاشة #%1$d"</string>
- <string name="presentation_alert_dismiss_text" msgid="9001797425513629072">"موافق"</string>
+ <string name="presentation_alert_dismiss_text" msgid="9001797425513629072">"حسنًا"</string>
</resources>
diff --git a/tests/android_car_api_test/src/android/car/apitest/CarFeatureTest.java b/tests/android_car_api_test/src/android/car/apitest/CarFeatureTest.java
index 092cbcb..e76f6ab 100644
--- a/tests/android_car_api_test/src/android/car/apitest/CarFeatureTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/CarFeatureTest.java
@@ -39,7 +39,6 @@
Car.AUDIO_SERVICE,
Car.BLUETOOTH_SERVICE,
Car.CAR_BUGREPORT_SERVICE,
- Car.CAR_CONFIGURATION_SERVICE,
Car.CAR_DRIVING_STATE_SERVICE,
Car.CAR_MEDIA_SERVICE,
Car.CAR_NAVIGATION_SERVICE,
diff --git a/tests/carservice_unit_test/src/com/android/car/CarConfigurationServiceTest.java b/tests/carservice_unit_test/src/com/android/car/CarConfigurationServiceTest.java
deleted file mode 100644
index e39f5c8..0000000
--- a/tests/carservice_unit_test/src/com/android/car/CarConfigurationServiceTest.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.car;
-
-import static com.android.car.CarConfigurationService.DEFAULT_SPEED_BUMP_ACQUIRED_PERMITS_PER_SECOND;
-import static com.android.car.CarConfigurationService.DEFAULT_SPEED_BUMP_MAX_PERMIT_POOL;
-import static com.android.car.CarConfigurationService.DEFAULT_SPEED_BUMP_PERMIT_FILL_DELAY;
-import static com.android.car.CarConfigurationService.SPEED_BUMP_ACQUIRED_PERMITS_PER_SECOND_KEY;
-import static com.android.car.CarConfigurationService.SPEED_BUMP_CONFIG_KEY;
-import static com.android.car.CarConfigurationService.SPEED_BUMP_MAX_PERMIT_POOL_KEY;
-import static com.android.car.CarConfigurationService.SPEED_BUMP_PERMIT_FILL_DELAY_KEY;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.car.settings.SpeedBumpConfiguration;
-
-import androidx.test.InstrumentationRegistry;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
-
-/**
- * Tests for {@link CarConfigurationService}.
- */
-@RunWith(MockitoJUnitRunner.class)
-public class CarConfigurationServiceTest {
- @Test
- public void testJsonResourceSuccessfullyRead() {
- // Use the default JsonReader to check that the resource JSON can be retrieved.
- CarConfigurationService service = new CarConfigurationService(
- InstrumentationRegistry.getTargetContext(),
- new JsonReaderImpl());
- service.init();
-
- assertThat(service.mConfigFile).isNotNull();
-
- // Default values should be stored in the JSON file as well.
- SpeedBumpConfiguration expectedConfiguration = new SpeedBumpConfiguration(
- DEFAULT_SPEED_BUMP_ACQUIRED_PERMITS_PER_SECOND,
- DEFAULT_SPEED_BUMP_MAX_PERMIT_POOL,
- DEFAULT_SPEED_BUMP_PERMIT_FILL_DELAY);
-
- assertThat(service.getSpeedBumpConfiguration()).isEqualTo(expectedConfiguration);
- }
-
- @Test
- public void testJsonFileSuccessfullyRead() {
- // Return an empty json file.
- CarConfigurationService service = new CarConfigurationService(
- InstrumentationRegistry.getTargetContext(),
- (context, resId) -> "{}");
- service.init();
-
- // The configuration should still be initialized.
- assertThat(service.mConfigFile).isNotNull();
- }
-
- @Test
- public void testNullJsonStringResultsInNullConfigFile() {
- // Return null as the string representation.
- CarConfigurationService service = new CarConfigurationService(
- InstrumentationRegistry.getTargetContext(),
- (context, resId) -> null);
- service.init();
-
- // No config file should be created.
- assertThat(service.mConfigFile).isNull();
- }
-
- @Test
- public void testSpeedBumpConfigurationSuccessfullyRead() throws JSONException {
- double acquiredPermitsPerSecond = 5d;
- double maxPermitPool = 10d;
- long permitFillDelay = 500L;
-
- String jsonFile = new SpeedBumpJsonBuilder()
- .setAcquiredPermitsPerSecond(acquiredPermitsPerSecond)
- .setMaxPermitPool(maxPermitPool)
- .setPermitFillDelay(permitFillDelay)
- .build();
-
- CarConfigurationService service = new CarConfigurationService(
- InstrumentationRegistry.getTargetContext(),
- (context, resId) -> jsonFile);
- service.init();
-
- SpeedBumpConfiguration expectedConfiguration = new SpeedBumpConfiguration(
- acquiredPermitsPerSecond,
- maxPermitPool,
- permitFillDelay);
-
- assertThat(service.getSpeedBumpConfiguration()).isEqualTo(expectedConfiguration);
- }
-
- @Test
- public void testDefaultSpeedBumpConfigurationReturned() {
- // Return null as the JSON representation.
- CarConfigurationService service = new CarConfigurationService(
- InstrumentationRegistry.getTargetContext(),
- (context, resId) -> null);
- service.init();
-
- // Default values should be used.
- SpeedBumpConfiguration expectedConfiguration = new SpeedBumpConfiguration(
- DEFAULT_SPEED_BUMP_ACQUIRED_PERMITS_PER_SECOND,
- DEFAULT_SPEED_BUMP_MAX_PERMIT_POOL,
- DEFAULT_SPEED_BUMP_PERMIT_FILL_DELAY);
-
- assertThat(service.getSpeedBumpConfiguration()).isEqualTo(expectedConfiguration);
- }
-
- /**
- * Builder for a string that represents the contents of a JSON file with speed bump
- * configuration.
- */
- private class SpeedBumpJsonBuilder {
- private double mAcquiredPermitsPerSecond;
- private double mMaxPermitPool;
- private long mPermitFillDelay;
-
- SpeedBumpJsonBuilder setAcquiredPermitsPerSecond(double acquiredPermitsPerSecond) {
- mAcquiredPermitsPerSecond = acquiredPermitsPerSecond;
- return this;
- }
-
- SpeedBumpJsonBuilder setMaxPermitPool(double maxPermitPool) {
- mMaxPermitPool = maxPermitPool;
- return this;
- }
-
- SpeedBumpJsonBuilder setPermitFillDelay(long permitFillDelay) {
- mPermitFillDelay = permitFillDelay;
- return this;
- }
-
- String build() throws JSONException {
- JSONObject speedBump = new JSONObject();
- speedBump.put(SPEED_BUMP_ACQUIRED_PERMITS_PER_SECOND_KEY, mAcquiredPermitsPerSecond);
- speedBump.put(SPEED_BUMP_MAX_PERMIT_POOL_KEY, mMaxPermitPool);
- speedBump.put(SPEED_BUMP_PERMIT_FILL_DELAY_KEY, mPermitFillDelay);
-
- JSONObject container = new JSONObject();
- container.put(SPEED_BUMP_CONFIG_KEY, speedBump);
-
- return container.toString();
- }
- }
-}
diff --git a/tests/carservice_unit_test/src/com/android/car/hal/UserHalServiceTest.java b/tests/carservice_unit_test/src/com/android/car/hal/UserHalServiceTest.java
index bf07c26..db2e00d 100644
--- a/tests/carservice_unit_test/src/com/android/car/hal/UserHalServiceTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/hal/UserHalServiceTest.java
@@ -81,7 +81,7 @@
* Timeout for {@link GenericHalCallback#assertCalled()} for tests where the HAL is not supposed
* to return anything - it's a slightly longer to make sure the test doesn't fail prematurely.
*/
- private static final int INITIAL_USER_CALLBACK_TIMEOUT_TIMEOUT = INITIAL_USER_TIMEOUT_MS + 500;
+ private static final int INITIAL_USER_CALLBACK_TIMEOUT_TIMEOUT = INITIAL_USER_TIMEOUT_MS + 2000;
// Used when crafting a reqquest property - the real value will be set by the mock.
private static final int REQUEST_ID_PLACE_HOLDER = 42;
diff --git a/watchdog/server/src/IoPerfCollection.cpp b/watchdog/server/src/IoPerfCollection.cpp
index bae5766..788be4b 100644
--- a/watchdog/server/src/IoPerfCollection.cpp
+++ b/watchdog/server/src/IoPerfCollection.cpp
@@ -586,7 +586,7 @@
}
const Result<std::unordered_map<uint32_t, UidIoUsage>>& usage = mUidIoStats->collect();
- if (!usage) {
+ if (!usage.ok()) {
return Error() << "Failed to collect uid I/O usage: " << usage.error();
}
@@ -638,7 +638,7 @@
}
const auto& ret = updateUidToPackageNameMapping(unmappedUids);
- if (!ret) {
+ if (!ret.ok()) {
ALOGW("%s", ret.error().message().c_str());
}
@@ -693,7 +693,7 @@
}
const Result<ProcStatInfo>& procStatInfo = mProcStat->collect();
- if (!procStatInfo) {
+ if (!procStatInfo.ok()) {
return Error() << "Failed to collect proc stats: " << procStatInfo.error();
}
@@ -752,7 +752,7 @@
}
const auto& ret = updateUidToPackageNameMapping(unmappedUids);
- if (!ret) {
+ if (!ret.ok()) {
ALOGW("%s", ret.error().message().c_str());
}
diff --git a/watchdog/server/src/ProcPidStat.cpp b/watchdog/server/src/ProcPidStat.cpp
index b92c739..0743f39 100644
--- a/watchdog/server/src/ProcPidStat.cpp
+++ b/watchdog/server/src/ProcPidStat.cpp
@@ -122,7 +122,7 @@
Mutex::Autolock lock(mMutex);
const auto& processStats = getProcessStatsLocked();
- if (!processStats) {
+ if (!processStats.ok()) {
return Error() << processStats.error();
}
@@ -171,7 +171,7 @@
ProcessStats curStats;
std::string path = StringPrintf((mPath + kStatFileFormat).c_str(), pid);
const auto& ret = readPidStatFile(path, &curStats.process);
- if (!ret) {
+ if (!ret.ok()) {
// PID may disappear between scanning the directory and parsing the stat file.
// Thus treat ERR_FILE_OPEN_READ errors as soft errors.
if (ret.error().code() != ERR_FILE_OPEN_READ) {
@@ -190,7 +190,7 @@
it->second.process.startTime != curStats.process.startTime || it->second.tgid == -1 ||
it->second.uid == -1) {
const auto& ret = getPidStatusLocked(&curStats);
- if (!ret) {
+ if (!ret.ok()) {
if (ret.error().code() != ERR_FILE_OPEN_READ) {
return Error() << "Failed to read pid status for pid " << curStats.process.pid
<< ": " << ret.error().message().c_str();
@@ -233,7 +233,7 @@
PidStat curThreadStat = {};
path = StringPrintf((taskDir + kStatFileFormat).c_str(), tid);
const auto& ret = readPidStatFile(path, &curThreadStat);
- if (!ret) {
+ if (!ret.ok()) {
if (ret.error().code() != ERR_FILE_OPEN_READ) {
return Error() << "Failed to read per-thread stat file: "
<< ret.error().message().c_str();
diff --git a/watchdog/server/src/ProcStat.cpp b/watchdog/server/src/ProcStat.cpp
index 34b847f..bb3dd11 100644
--- a/watchdog/server/src/ProcStat.cpp
+++ b/watchdog/server/src/ProcStat.cpp
@@ -78,7 +78,7 @@
Mutex::Autolock lock(mMutex);
const auto& info = getProcStatLocked();
- if (!info) {
+ if (!info.ok()) {
return Error() << "Failed to get proc stat contents: " << info.error();
}