Merge "Localize "Driver" string and some API cleanup"
diff --git a/car-usb-handler/AndroidManifest.xml b/car-usb-handler/AndroidManifest.xml
index be64f82..7803318 100644
--- a/car-usb-handler/AndroidManifest.xml
+++ b/car-usb-handler/AndroidManifest.xml
@@ -23,7 +23,11 @@
                  android:directBootAware="true" >
         <activity android:name=".UsbHostManagementActivity"
                   android:theme="@android:style/Theme.Material.Light.Dialog"
-                  android:launchMode="singleTop" />
+                  android:launchMode="singleTop">
+            <meta-data
+                android:name="distractionOptimized"
+                android:value="true" />
+        </activity>
         <receiver android:name=".BootUsbScanner" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
diff --git a/car_product/build/car.mk b/car_product/build/car.mk
index f4a67c1..bfe12d6 100644
--- a/car_product/build/car.mk
+++ b/car_product/build/car.mk
@@ -91,7 +91,6 @@
     OverviewApp \
     CarLauncher \
     CarSystemUI \
-    CarLensPickerApp \
     LocalMediaPlayer \
     CarMediaApp \
     CarMessengerApp \
diff --git a/car_product/overlay/frameworks/base/core/res/res/layout/resolve_list_item.xml b/car_product/overlay/frameworks/base/core/res/res/layout/resolve_list_item.xml
new file mode 100644
index 0000000..2cdb228
--- /dev/null
+++ b/car_product/overlay/frameworks/base/core/res/res/layout/resolve_list_item.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright 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.
+*/
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:layout_height="wrap_content"
+              android:layout_width="match_parent"
+              android:minHeight="?attr/listPreferredItemHeightLarge"
+              android:paddingTop="4dp"
+              android:paddingBottom="4dp"
+              android:background="?attr/activatedBackgroundIndicator">
+    <ImageView android:id="@+id/icon"
+               android:layout_width="75dp"
+               android:layout_height="75dp"
+               android:layout_gravity="start|center_vertical"
+               android:layout_marginStart="?attr/listPreferredItemPaddingStart"
+               android:layout_marginTop="12dp"
+               android:layout_marginBottom="12dp"
+               android:scaleType="fitXY" />
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:gravity="start|center_vertical"
+                  android:orientation="vertical"
+                  android:paddingStart="?attr/listPreferredItemPaddingStart"
+                  android:paddingEnd="?attr/listPreferredItemPaddingEnd"
+                  android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:layout_gravity="start|center_vertical">
+        <!-- Activity name -->
+        <TextView android:id="@android:id/text1"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_gravity="start|center_vertical"
+                  android:textAppearance="?attr/textAppearanceLarge"
+                  android:minHeight="50sp"
+                  android:minLines="1"
+                  android:maxLines="1"
+                  android:textColor="@color/white"
+                  android:ellipsize="marquee" />
+        <!-- Extended activity info to distinguish between duplicate activity names -->
+        <TextView android:id="@android:id/text2"
+                  android:textAppearance="?android:attr/textAppearanceLarge"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_gravity="center_vertical"
+                  android:textColor="@color/white"
+                  android:minLines="1"
+                  android:maxLines="1"
+                  android:ellipsize="marquee" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/car_product/overlay/frameworks/base/core/res/res/layout/resolver_list.xml b/car_product/overlay/frameworks/base/core/res/res/layout/resolver_list.xml
new file mode 100644
index 0000000..9d64d65
--- /dev/null
+++ b/car_product/overlay/frameworks/base/core/res/res/layout/resolver_list.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright 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.
+*/
+-->
+<com.android.internal.widget.ResolverDrawerLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:theme="@android:style/Theme.DeviceDefault.NoActionBar"
+    android:id="@id/contentPanel">
+
+    <LinearLayout
+        android:id="@+id/button_bar"
+        android:visibility="gone"
+        style="?attr/buttonBarStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_ignoreOffset="true"
+        android:layout_alwaysShow="true"
+        android:layout_hasNestedScrollIndicator="true"
+        android:background="?attr/colorBackgroundFloating"
+        android:orientation="horizontal"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:paddingStart="12dp"
+        android:weightSum="5"
+        android:paddingEnd="12dp"
+        android:elevation="8dp">
+
+        <TextView
+            android:id="@+id/profile_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:textSize="40sp"
+            android:layout_weight="5"
+            android:layout_gravity = "left"
+            android:visibility="gone"
+            android:textColor="?attr/colorAccent"
+            android:singleLine="true"/>
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minHeight="56dp"
+            android:layout_gravity = "left"
+            android:layout_weight="3"
+            android:paddingTop="8dp"
+            android:layout_below="@id/profile_button"
+            android:paddingBottom="8dp"/>
+
+        <Button
+            android:id="@+id/button_once"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:enabled="false"
+            android:layout_gravity = "right"
+            android:text="@string/activity_resolver_use_once"
+            android:layout_weight="1"
+            android:onClick="onButtonClick"/>
+
+        <Button
+            android:id="@+id/button_always"
+            android:layout_marginLeft="10dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:enabled="false"
+            android:layout_gravity = "right"
+            android:text="@string/activity_resolver_use_always"
+            android:layout_weight="1"
+            android:onClick="onButtonClick"/>
+    </LinearLayout>
+
+    <ListView
+        android:layout_width="match_parent"
+        android:layout_height="500dp"
+        android:id="@+id/resolver_list"
+        android:clipToPadding="false"
+        android:scrollbarStyle="outsideOverlay"
+        android:background="?attr/colorBackgroundFloating"
+        android:elevation="8dp"
+        android:nestedScrollingEnabled="true"
+        android:scrollIndicators="top|bottom"/>
+
+    <TextView android:id="@+id/empty"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:background="?attr/colorBackgroundFloating"
+              android:elevation="8dp"
+              android:layout_alwaysShow="true"
+              android:text="@string/noApplications"
+              android:padding="32dp"
+              android:gravity="center"
+              android:visibility="gone"/>
+
+</com.android.internal.widget.ResolverDrawerLayout>
diff --git a/car_product/overlay/frameworks/base/core/res/res/layout/resolver_list_with_default.xml b/car_product/overlay/frameworks/base/core/res/res/layout/resolver_list_with_default.xml
new file mode 100644
index 0000000..62d4d69
--- /dev/null
+++ b/car_product/overlay/frameworks/base/core/res/res/layout/resolver_list_with_default.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright 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.
+*/
+-->
+<com.android.internal.widget.ResolverDrawerLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:theme="@android:style/Theme.DeviceDefault"
+    android:maxCollapsedHeight="200dp"
+    android:id="@id/contentPanel">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:weightSum="5"
+        android:layout_alwaysShow="true"
+        android:orientation="vertical"
+        android:background="?attr/colorBackgroundFloating"
+        android:elevation="8dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/icon"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_gravity="start|top"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="20dp"
+                android:src="@drawable/resolver_icon_placeholder"
+                android:scaleType="fitCenter"/>
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="?attr/listPreferredItemHeight"
+                android:layout_marginStart="16dp"
+                android:textAppearance="?attr/textAppearanceMedium"
+                android:gravity="start|center_vertical"
+                android:paddingEnd="16dp"/>
+
+            <LinearLayout
+                android:id="@+id/profile_button"
+                android:layout_width="wrap_content"
+                android:layout_height="48dp"
+                android:layout_marginTop="4dp"
+                android:layout_marginEnd="4dp"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:paddingTop="4dp"
+                android:paddingBottom="4dp"
+                android:focusable="true"
+                android:visibility="gone"
+                style="?attr/borderlessButtonStyle">
+
+                <ImageView
+                    android:id="@+id/icon"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_gravity="start|center_vertical"
+                    android:layout_marginEnd="?attr/listPreferredItemPaddingEnd"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginBottom="12dp"
+                    android:scaleType="fitCenter"/>
+
+                <TextView
+                    android:id="@id/text1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="start|center_vertical"
+                    android:layout_marginEnd="?attr/listPreferredItemPaddingEnd"
+                    android:textAppearance="?attr/textAppearanceButton"
+                    android:textColor="?attr/textColorPrimary"
+                    android:minLines="1"
+                    android:maxLines="1"
+                    android:ellipsize="marquee"/>
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/button_bar"
+            android:visibility="gone"
+            style="?attr/buttonBarStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alwaysShow="true"
+            android:gravity="end|center_vertical"
+            android:layout_weight="0.5"
+            android:orientation="horizontal"
+            android:layoutDirection="locale"
+            android:measureWithLargestChild="true"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:elevation="8dp">
+
+            <Button
+                android:id="@+id/button_once"
+                android:layout_width="wrap_content"
+                android:layout_gravity="start"
+                android:maxLines="2"
+                style="?attr/buttonBarNegativeButtonStyle"
+                android:minHeight="@dimen/alert_dialog_button_bar_height"
+                android:layout_height="wrap_content"
+                android:enabled="false"
+                android:text="@string/activity_resolver_use_once"
+                android:onClick="onButtonClick"/>
+
+            <Button
+                android:id="@+id/button_always"
+                android:layout_width="wrap_content"
+                android:layout_gravity="end"
+                android:maxLines="2"
+                android:minHeight="@dimen/alert_dialog_button_bar_height"
+                style="?attr/buttonBarPositiveButtonStyle"
+                android:layout_height="wrap_content"
+                android:enabled="false"
+                android:text="@string/activity_resolver_use_always"
+                android:onClick="onButtonClick"/>
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?attr/dividerVertical"/>
+
+
+        <ListView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/resolver_list"
+            android:layout_weight="4"
+            android:clipToPadding="false"
+            android:scrollbarStyle="outsideOverlay"
+            android:background="?attr/colorBackgroundFloating"
+            android:elevation="8dp"
+            android:nestedScrollingEnabled="true"
+            android:divider="@null"/>
+    </LinearLayout>
+
+</com.android.internal.widget.ResolverDrawerLayout>
\ No newline at end of file
diff --git a/car_product/overlay/frameworks/base/core/res/res/values/config.xml b/car_product/overlay/frameworks/base/core/res/res/values/config.xml
index 3ab6085..1de7df0 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values/config.xml
@@ -50,10 +50,6 @@
     <!-- Automotive Bluetooth pairing option -->
     <bool name="enable_pbap_pce_profile">true</bool>
 
-    <!-- Component name of a custom ResolverActivity (Intent resolver) to be used instead of
-         the default framework version. -->
-    <string name="config_customResolverActivity" translatable="false">com.android.support.car.lenspicker/.LensResolverActivity</string>
-
     <!-- Flag indicating that the entire notification header can be clicked to expand the
          notification. If false, then the expand icon has to be clicked in order for the expand
          to occur. -->
diff --git a/service/src/com/android/car/CarPowerManagementService.java b/service/src/com/android/car/CarPowerManagementService.java
index 5b6fca0..ce65e0f 100644
--- a/service/src/com/android/car/CarPowerManagementService.java
+++ b/service/src/com/android/car/CarPowerManagementService.java
@@ -281,7 +281,11 @@
             synchronized (this) {
                 releaseTimerLocked();
             }
-            doHandleShutdown();
+            // Notify hal that we are shutting down and since it is immediate, don't schedule next
+            // wake up
+            mHal.sendShutdownStart(0);
+            // shutdown HU
+            mSystemInterface.shutdown();
         }
     }
 
@@ -299,7 +303,8 @@
 
     private void handleFinish() {
         if (mShutdownOnFinish) {
-            doHandleShutdown();
+            // shutdown HU
+            mSystemInterface.shutdown();
         } else {
             doHandleDeepSleep();
         }
@@ -408,12 +413,6 @@
         }
     }
 
-    private void doHandleShutdown() {
-        // now shutdown
-        mHal.sendShutdownStart(mHal.isTimedWakeupAllowed() ? mNextWakeupSec : 0);
-        mSystemInterface.shutdown();
-    }
-
     private void doHandleProcessingComplete() {
         synchronized (this) {
             releaseTimerLocked();
@@ -517,6 +516,11 @@
             Log.w(CarLog.TAG_POWER, "Next wake up can not be in negative time. Ignoring!");
             return;
         }
+        if (!mHal.isTimedWakeupAllowed()) {
+            Log.w(CarLog.TAG_POWER, "Setting timed wakeups are disabled in HAL. Skipping");
+            mNextWakeupSec = 0;
+            return;
+        }
         if (mNextWakeupSec == 0 || mNextWakeupSec > seconds) {
             mNextWakeupSec = seconds;
         } else {
diff --git a/tests/CarTrustAgentClientApp/res/values/strings.xml b/tests/CarTrustAgentClientApp/res/values/strings.xml
index ff110d8..6e33a81 100644
--- a/tests/CarTrustAgentClientApp/res/values/strings.xml
+++ b/tests/CarTrustAgentClientApp/res/values/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <resources>
-    <string name="app_name">CarTrustAgentClient</string>
+    <string name="app_name" translatable="false">CarTrustAgentClient</string>
 
     <!-- service/characteristics uuid for unlocking a device -->
     <string name="unlock_service_uuid" translatable="false">5e2a68a1-27be-43f9-8d1e-4546976fabd7</string>
@@ -30,8 +30,8 @@
     <string name="pref_key_token_handle" translatable="false">token-handle-key</string>
     <string name="pref_key_escrow_token" translatable="false">escrow-token-key</string>
 
-    <string name="enroll_button">Enroll new token</string>
-    <string name="enroll_scan">Scan to enroll</string>
-    <string name="unlock_button">Unlock</string>
-    <string name="unlock_scan">Scan to unlock</string>
+    <string name="enroll_button" translatable="false">Enroll new token</string>
+    <string name="enroll_scan" translatable="false">Scan to enroll</string>
+    <string name="unlock_button" translatable="false">Unlock</string>
+    <string name="unlock_scan" translatable="false">Scan to unlock</string>
 </resources>
diff --git a/tests/DefaultStorageMonitoringCompanionApp/res/values/strings.xml b/tests/DefaultStorageMonitoringCompanionApp/res/values/strings.xml
index 8c0a9bb..d8048cd 100644
--- a/tests/DefaultStorageMonitoringCompanionApp/res/values/strings.xml
+++ b/tests/DefaultStorageMonitoringCompanionApp/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-  <string name="app_name">Flash Storage Wear Notification</string>
+  <string name="app_name" translatable="false">Flash Storage Wear Notification</string>
 </resources>
diff --git a/tests/DirectRenderingClusterSample/res/values/strings.xml b/tests/DirectRenderingClusterSample/res/values/strings.xml
index e362910..803811b 100644
--- a/tests/DirectRenderingClusterSample/res/values/strings.xml
+++ b/tests/DirectRenderingClusterSample/res/values/strings.xml
@@ -1,23 +1,23 @@
 <resources>
-    <string name="app_name">Fake Cluster Implementation</string>
+    <string name="app_name" translatable="false">Fake Cluster Implementation</string>
 
     <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="hello_blank_fragment" translatable="false">Hello blank fragment</string>
 
     <!-- Message to show when a navigation app hasn't been selected yet. [CHAR LIMIT=100] -->
-    <string name="select_nav_app">Select a navigation app on the main unit.</string>
+    <string name="select_nav_app" translatable="false">Select a navigation app on the main unit.</string>
 
     <!-- Gears texts [CHAR LIMIT=1] -->
-    <string name="gear_parked">P</string>
-    <string name="gear_reverse">R</string>
-    <string name="gear_neutral">N</string>
-    <string name="gear_drive">D</string>
+    <string name="gear_parked" translatable="false">P</string>
+    <string name="gear_reverse" translatable="false">R</string>
+    <string name="gear_neutral" translatable="false">N</string>
+    <string name="gear_drive" translatable="false">D</string>
 
     <!-- Information labels (shown next to driving directions) [CHAR LIMIT=30] -->
-    <string name="info_fuel_label">Fuel</string>
-    <string name="info_speed_label">Speed</string>
-    <string name="info_range_label">Range</string>
-    <string name="info_rpm_label">RPM</string>
-    <string name="info_value_empty">-</string>
+    <string name="info_fuel_label" translatable="false">Fuel</string>
+    <string name="info_speed_label" translatable="false">Speed</string>
+    <string name="info_range_label" translatable="false">Range</string>
+    <string name="info_rpm_label" translatable="false">RPM</string>
+    <string name="info_value_empty" translatable="false">-</string>
 
 </resources>
diff --git a/tests/EmbeddedKitchenSinkApp/res/values/strings.xml b/tests/EmbeddedKitchenSinkApp/res/values/strings.xml
index 15f2afc..5894892 100644
--- a/tests/EmbeddedKitchenSinkApp/res/values/strings.xml
+++ b/tests/EmbeddedKitchenSinkApp/res/values/strings.xml
@@ -14,217 +14,217 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_title">Kitchen Sink</string>
+    <string name="app_title" translatable="false">Kitchen Sink</string>
 
     <!-- alert dialog -->
     <!-- Notification ticker text (shown in the status bar) when a Bluetooth device wants to pair with us -->
-    <string name="bluetooth_notif_ticker">Bluetooth pairing request</string>
+    <string name="bluetooth_notif_ticker" translatable="false">Bluetooth pairing request</string>
     <!-- Bluetooth settings.  Context menu item for a device.  Action will first pair, and then connect to all profiles on the device. -->
-    <string name="bluetooth_device_context_pair_connect">Pair &amp; connect</string>
+    <string name="bluetooth_device_context_pair_connect" translatable="false">Pair &amp; connect</string>
     <!-- Used as setting title (for checkbox) on second screen after selecting Bluetooth settings -->
-    <string name="bluetooth">Bluetooth</string>
+    <string name="bluetooth" translatable="false">Bluetooth</string>
     <!-- Message when bluetooth is informing the user of the pairing key. [CHAR LIMIT=NONE] -->
-    <string name="bluetooth_pairing_key_msg">Bluetooth pairing code</string>
+    <string name="bluetooth_pairing_key_msg" translatable="false">Bluetooth pairing code</string>
     <!-- Checkbox label for alphanumeric PIN entry (default is numeric PIN). [CHAR LIMIT=50] -->
-    <string name="bluetooth_enable_alphanumeric_pin">PIN contains letters or symbols</string>
+    <string name="bluetooth_enable_alphanumeric_pin" translatable="false">PIN contains letters or symbols</string>
     <!-- Message when bluetooth dialog for passkey entry is showing. [CHAR LIMIT=NONE] -->
-    <string name="bluetooth_enter_passkey_msg">Type the pairing code then press Return or Enter</string>
+    <string name="bluetooth_enter_passkey_msg" translatable="false">Type the pairing code then press Return or Enter</string>
     <!-- Title for the dialog to enter PIN. [CHAR LIMIT=40] -->
-    <string name="bluetooth_pairing_request">Pair with <xliff:g id="device_name">%1$s</xliff:g>?</string>
+    <string name="bluetooth_pairing_request" translatable="false">Pair with <xliff:g id="device_name">%1$s</xliff:g>?</string>
     <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
-    <string name="bluetooth_pairing_shares_phonebook">Allow <xliff:g id="device_name">%1$s</xliff:g> to access your contacts and call history</string>
+    <string name="bluetooth_pairing_shares_phonebook" translatable="false">Allow <xliff:g id="device_name">%1$s</xliff:g> to access your contacts and call history</string>
     <!-- Pairing dialog text to remind user to enter the PIN on the other device. [CHAR LIMIT=NONE] -->
-    <string name="bluetooth_enter_pin_other_device">You may also need to type this PIN on the other device.</string>
+    <string name="bluetooth_enter_pin_other_device" translatable="false">You may also need to type this PIN on the other device.</string>
     <!-- Pairing dialog text to remind user to enter the passkey on the other device. [CHAR LIMIT=NONE] -->
-    <string name="bluetooth_enter_passkey_other_device">You may also need to type this passkey on the other device.</string>
+    <string name="bluetooth_enter_passkey_other_device" translatable="false">You may also need to type this passkey on the other device.</string>
     <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
-    <string name="bluetooth_pin_values_hint_16_digits">Must be 16 digits</string>
+    <string name="bluetooth_pin_values_hint_16_digits" translatable="false">Must be 16 digits</string>
     <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
-    <string name="bluetooth_pin_values_hint">Usually 0000 or 1234</string>
+    <string name="bluetooth_pin_values_hint" translatable="false">Usually 0000 or 1234</string>
     <!-- Notification title when a Bluetooth device wants to pair with us -->
-    <string name="bluetooth_notif_title">Pairing request</string>
+    <string name="bluetooth_notif_title" translatable="false">Pairing request</string>
     <!-- Notification message when a Bluetooth device wants to pair with us -->
-    <string name="bluetooth_notif_message">Tap to pair with <xliff:g id="device_name">%1$s</xliff:g>.</string>
+    <string name="bluetooth_notif_message" translatable="false">Tap to pair with <xliff:g id="device_name">%1$s</xliff:g>.</string>
     <!-- Title for BT error dialogs. -->
-    <string name="bluetooth_error_title"></string>
+    <string name="bluetooth_error_title" translatable="false"></string>
 
     <!-- hvac -->
-    <string name="hvac_acOff">AC OFF</string>
-    <string name="hvac_acOn">AC ON</string>
-    <string name="hvac_autoOff">Auto OFF</string>
-    <string name="hvac_autoOn">Auto ON</string>
-    <string name="hvac_defrostFrontOff">Front Defrost OFF</string>
-    <string name="hvac_defrostFrontOn">Front Defrost ON</string>
-    <string name="hvac_defrostRearOff">Rear Defrost OFF</string>
-    <string name="hvac_defrostRearOn">Rear Defrost ON</string>
-    <string name="hvac_dualOff">Dual OFF</string>
-    <string name="hvac_dualOn">Dual ON</string>
-    <string name="hvac_maxAcOff">Max AC OFF</string>
-    <string name="hvac_maxAcOn">Max AC ON</string>
-    <string name="hvac_maxDefrostOff">Max DEF OFF</string>
-    <string name="hvac_maxDefrostOn">Max DEF ON</string>
-    <string name="hvac_outsideTempLabel">Outside Temp:</string>
-    <string name="hvac_positionFace">Face</string>
-    <string name="hvac_positionFloor">Floor</string>
-    <string name="hvac_positionFaceAndFloor">Face+Floor</string>
-    <string name="hvac_positionDefrost">Defrost</string>
-    <string name="hvac_positionDefrostAndFloor">Def+Floor</string>
-    <string name="hvac_fanSpeedDn">Fan Speed Down</string>
-    <string name="hvac_fanSpeedUp">Fan Speed Up</string>
-    <string name="hvac_recircOff">Recirc OFF</string>
-    <string name="hvac_recircOn">Recirc ON</string>
-    <string name="hvac_tempDn">Temp Down</string>
-    <string name="hvac_tempUp">Temp Up</string>
+    <string name="hvac_acOff" translatable="false">AC OFF</string>
+    <string name="hvac_acOn" translatable="false">AC ON</string>
+    <string name="hvac_autoOff" translatable="false">Auto OFF</string>
+    <string name="hvac_autoOn" translatable="false">Auto ON</string>
+    <string name="hvac_defrostFrontOff" translatable="false">Front Defrost OFF</string>
+    <string name="hvac_defrostFrontOn" translatable="false">Front Defrost ON</string>
+    <string name="hvac_defrostRearOff" translatable="false">Rear Defrost OFF</string>
+    <string name="hvac_defrostRearOn" translatable="false">Rear Defrost ON</string>
+    <string name="hvac_dualOff" translatable="false">Dual OFF</string>
+    <string name="hvac_dualOn" translatable="false">Dual ON</string>
+    <string name="hvac_maxAcOff" translatable="false">Max AC OFF</string>
+    <string name="hvac_maxAcOn" translatable="false">Max AC ON</string>
+    <string name="hvac_maxDefrostOff" translatable="false">Max DEF OFF</string>
+    <string name="hvac_maxDefrostOn" translatable="false">Max DEF ON</string>
+    <string name="hvac_outsideTempLabel" translatable="false">Outside Temp:</string>
+    <string name="hvac_positionFace" translatable="false">Face</string>
+    <string name="hvac_positionFloor" translatable="false">Floor</string>
+    <string name="hvac_positionFaceAndFloor" translatable="false">Face+Floor</string>
+    <string name="hvac_positionDefrost" translatable="false">Defrost</string>
+    <string name="hvac_positionDefrostAndFloor" translatable="false">Def+Floor</string>
+    <string name="hvac_fanSpeedDn" translatable="false">Fan Speed Down</string>
+    <string name="hvac_fanSpeedUp" translatable="false">Fan Speed Up</string>
+    <string name="hvac_recircOff" translatable="false">Recirc OFF</string>
+    <string name="hvac_recircOn" translatable="false">Recirc ON</string>
+    <string name="hvac_tempDn" translatable="false">Temp Down</string>
+    <string name="hvac_tempUp" translatable="false">Temp Up</string>
     <!-- camera -->
-    <string name="rvc_getCapabilities">Get Capabilities</string>
-    <string name="rvc_getRvcCrop">Get RVC Crop</string>
-    <string name="rvc_setRvcCrop">Set RVC Crop</string>
-    <string name="rvc_getRvcPos">Get RVC Pos</string>
-    <string name="rvc_setRvcPos">Set RVC Pos</string>
-    <string name="rvc_getCameraState">Get State</string>
-    <string name="rvc_setCameraState">Set State</string>
-    <string name="rvc_state">RVC State</string>
+    <string name="rvc_getCapabilities" translatable="false">Get Capabilities</string>
+    <string name="rvc_getRvcCrop" translatable="false">Get RVC Crop</string>
+    <string name="rvc_setRvcCrop" translatable="false">Set RVC Crop</string>
+    <string name="rvc_getRvcPos" translatable="false">Get RVC Pos</string>
+    <string name="rvc_setRvcPos" translatable="false">Set RVC Pos</string>
+    <string name="rvc_getCameraState" translatable="false">Get State</string>
+    <string name="rvc_setCameraState" translatable="false">Set State</string>
+    <string name="rvc_state" translatable="false">RVC State</string>
     <!--  audio -->
-    <string name="empty"></string>
-    <string name="play">Play</string>
-    <string name="play_pcm_once">Play Once</string>
-    <string name="stop">Stop</string>
-    <string name="play_wav">Play WAV</string>
-    <string name="stop_wav">Stop WAV</string>
-    <string name="audio_focus">Audio Focus</string>
-    <string name="focus_gain">Gain</string>
-    <string name="focus_gain_transient_duck">Gain,Transient,Duck</string>
-    <string name="focus_release">Release</string>
-    <string name="request">request</string>
-    <string name="release">release</string>
-    <string name="media_play">Media Play</string>
-    <string name="nav_play">Nav Play</string>
-    <string name="vr_play">VR Play</string>
-    <string name="system_play">System Play</string>
-    <string name="config_index">Config Index</string>
-    <string name="choose_config">Choose config</string>
-    <string name="audio_stress_title">Audio Stress Test</string>
-    <string name="nav_start">Nav Start</string>
-    <string name="nav_end">Nav End</string>
-    <string name="vr_start">VR Start</string>
-    <string name="vr_end">VR End</string>
-    <string name="radio_start">Radio Start</string>
-    <string name="radio_end">Radio End</string>
-    <string name="speaker_phone_on">Speaker Phone On</string>
-    <string name="speaker_phone_off">Speaker Phone Off</string>
-    <string name="microphone_on">Mic On</string>
-    <string name="microphone_off">Mic Off</string>
-    <string name="mock_audio_on">Audio Mocking On</string>
-    <string name="mock_audio_off">Audio Mocking Off</string>
+    <string name="empty" translatable="false"></string>
+    <string name="play" translatable="false">Play</string>
+    <string name="play_pcm_once" translatable="false">Play Once</string>
+    <string name="stop" translatable="false">Stop</string>
+    <string name="play_wav" translatable="false">Play WAV</string>
+    <string name="stop_wav" translatable="false">Stop WAV</string>
+    <string name="audio_focus" translatable="false">Audio Focus</string>
+    <string name="focus_gain" translatable="false">Gain</string>
+    <string name="focus_gain_transient_duck" translatable="false">Gain,Transient,Duck</string>
+    <string name="focus_release" translatable="false">Release</string>
+    <string name="request" translatable="false">request</string>
+    <string name="release" translatable="false">release</string>
+    <string name="media_play" translatable="false">Media Play</string>
+    <string name="nav_play" translatable="false">Nav Play</string>
+    <string name="vr_play" translatable="false">VR Play</string>
+    <string name="system_play" translatable="false">System Play</string>
+    <string name="config_index" translatable="false">Config Index</string>
+    <string name="choose_config" translatable="false">Choose config</string>
+    <string name="audio_stress_title" translatable="false">Audio Stress Test</string>
+    <string name="nav_start" translatable="false">Nav Start</string>
+    <string name="nav_end" translatable="false">Nav End</string>
+    <string name="vr_start" translatable="false">VR Start</string>
+    <string name="vr_end" translatable="false">VR End</string>
+    <string name="radio_start" translatable="false">Radio Start</string>
+    <string name="radio_end" translatable="false">Radio End</string>
+    <string name="speaker_phone_on" translatable="false">Speaker Phone On</string>
+    <string name="speaker_phone_off" translatable="false">Speaker Phone Off</string>
+    <string name="microphone_on" translatable="false">Mic On</string>
+    <string name="microphone_off" translatable="false">Mic Off</string>
+    <string name="mock_audio_on" translatable="false">Audio Mocking On</string>
+    <string name="mock_audio_off" translatable="false">Audio Mocking Off</string>
 
     <!-- keyboard test fragment -->
-    <string name="keyboard_test_title">Keyboard Test</string>
-    <string name="on_search">OnSearch:</string>
-    <string name="on_edit">onEdit:</string>
-    <string name="open_ime_button">Open IME</string>
-    <string name="close_ime_button">Close IME</string>
-    <string name="open_kb_button">Hide/Show Input</string>
+    <string name="keyboard_test_title" translatable="false">Keyboard Test</string>
+    <string name="on_search" translatable="false">OnSearch:</string>
+    <string name="on_edit" translatable="false">onEdit:</string>
+    <string name="open_ime_button" translatable="false">Open IME</string>
+    <string name="close_ime_button" translatable="false">Close IME</string>
+    <string name="open_kb_button" translatable="false">Hide/Show Input</string>
 
     <!-- instrument cluster -->
-    <string name="cluster_start">Request focus</string>
-    <string name="cluster_start_guidance">Start turn-by-turn</string>
-    <string name="cluster_stop">Abandon focus</string>
-    <string name="cluster_stop_guidance">Stop turn-by-turn</string>
-    <string name="cluster_nav_app_context_loss">Navigation app context lost!</string>
-    <string name="cluster_start_activity">Start Nav Activity</string>
-    <string name="cluster_start_activity_failed">Failed to start activity in cluster</string>
-    <string name="cluster_not_started">Missing navigation focus</string>
+    <string name="cluster_start" translatable="false">Request focus</string>
+    <string name="cluster_start_guidance" translatable="false">Start turn-by-turn</string>
+    <string name="cluster_stop" translatable="false">Abandon focus</string>
+    <string name="cluster_stop_guidance" translatable="false">Stop turn-by-turn</string>
+    <string name="cluster_nav_app_context_loss" translatable="false">Navigation app context lost!</string>
+    <string name="cluster_start_activity" translatable="false">Start Nav Activity</string>
+    <string name="cluster_start_activity_failed" translatable="false">Failed to start activity in cluster</string>
+    <string name="cluster_not_started" translatable="false">Missing navigation focus</string>
 
     <!--  input test -->
-    <string name="volume_up">Volume +</string>
-    <string name="volume_down">Volume -</string>
-    <string name="volume_mute">Mute</string>
-    <string name="voice">Voice</string>
-    <string name="mock_vehicle_hal">Mock HAL</string>
-    <string name="mock_vehicle_hal_off">Mock HAL OFF</string>
-    <string name="mock_vehicle_hal_on">Mock HAL ON</string>
-    <string name="music">Music</string>
-    <string name="call_send">Call</string>
-    <string name="call_end">Call end</string>
-    <string name="home">Home</string>
-    <string name="next_song">Next song</string>
-    <string name="prev_song">Prev song</string>
-    <string name="tune_right">Tune +</string>
-    <string name="tune_left">Tune -</string>
-    <string name="music_play">Play</string>
-    <string name="music_stop">Stop</string>
-    <string name="steering_wheel">Steering Wheel Buttons:</string>
-    <string name="sw_left">Left</string>
-    <string name="sw_right">Right</string>
-    <string name="sw_up">Up</string>
-    <string name="sw_down">Down</string>
-    <string name="sw_center">Center</string>
-    <string name="sw_back">Back</string>
+    <string name="volume_up" translatable="false">Volume +</string>
+    <string name="volume_down" translatable="false">Volume -</string>
+    <string name="volume_mute" translatable="false">Mute</string>
+    <string name="voice" translatable="false">Voice</string>
+    <string name="mock_vehicle_hal" translatable="false">Mock HAL</string>
+    <string name="mock_vehicle_hal_off" translatable="false">Mock HAL OFF</string>
+    <string name="mock_vehicle_hal_on" translatable="false">Mock HAL ON</string>
+    <string name="music" translatable="false">Music</string>
+    <string name="call_send" translatable="false">Call</string>
+    <string name="call_end" translatable="false">Call end</string>
+    <string name="home" translatable="false">Home</string>
+    <string name="next_song" translatable="false">Next song</string>
+    <string name="prev_song" translatable="false">Prev song</string>
+    <string name="tune_right" translatable="false">Tune +</string>
+    <string name="tune_left" translatable="false">Tune -</string>
+    <string name="music_play" translatable="false">Play</string>
+    <string name="music_stop" translatable="false">Stop</string>
+    <string name="steering_wheel" translatable="false">Steering Wheel Buttons:</string>
+    <string name="sw_left" translatable="false">Left</string>
+    <string name="sw_right" translatable="false">Right</string>
+    <string name="sw_up" translatable="false">Up</string>
+    <string name="sw_down" translatable="false">Down</string>
+    <string name="sw_center" translatable="false">Center</string>
+    <string name="sw_back" translatable="false">Back</string>
 
     <!-- power test -->
-    <string name="power_request_shutdown">Request Shutdown</string>
-    <string name="power_shutdown">Shutdown</string>
-    <string name="power_sleep">Sleep</string>
+    <string name="power_request_shutdown" translatable="false">Request Shutdown</string>
+    <string name="power_shutdown" translatable="false">Shutdown</string>
+    <string name="power_sleep" translatable="false">Sleep</string>
 
     <!-- property test -->
-    <string name="property_clear">Clear Log</string>
-    <string name="property_get">Get</string>
-    <string name="property_register">Register</string>
-    <string name="property_set">Set</string>
-    <string name="property_unregister">Unregister</string>
+    <string name="property_clear" translatable="false">Clear Log</string>
+    <string name="property_get" translatable="false">Get</string>
+    <string name="property_register" translatable="false">Register</string>
+    <string name="property_set" translatable="false">Set</string>
+    <string name="property_unregister" translatable="false">Unregister</string>
 
     <!-- radio test -->
-    <string name="radio_open">Open</string>
-    <string name="radio_close">Close</string>
-    <string name="radio_muted">Muted</string>
-    <string name="radio_unmuted">Unmuted</string>
-    <string name="radio_next">Next</string>
-    <string name="radio_prev">Previous</string>
-    <string name="radio_scan_cancel">Cancel scan</string>
-    <string name="radio_tune_to_station">Tune to Station</string>
-    <string name="radio_step_up">Step Up</string>
-    <string name="radio_step_down">Step Down</string>
-    <string name="radio_enter_station_hint">Enter Station Frequency (kHz)</string>
-    <string name="radio_get_program_info">getProgramInformation</string>
-    <string name="radio_am">AM</string>
-    <string name="radio_fm">FM</string>
-    <string name="radio_station_info">Station info: %1$s</string>
-    <string name="radio_channel_info">Channel info: %1$s kHz</string>
-    <string name="radio_song_info">Song info: %1$s</string>
-    <string name="radio_artist_info">Artist info: %1$s</string>
-    <string name="radio_na">N/A</string>
+    <string name="radio_open" translatable="false">Open</string>
+    <string name="radio_close" translatable="false">Close</string>
+    <string name="radio_muted" translatable="false">Muted</string>
+    <string name="radio_unmuted" translatable="false">Unmuted</string>
+    <string name="radio_next" translatable="false">Next</string>
+    <string name="radio_prev" translatable="false">Previous</string>
+    <string name="radio_scan_cancel" translatable="false">Cancel scan</string>
+    <string name="radio_tune_to_station" translatable="false">Tune to Station</string>
+    <string name="radio_step_up" translatable="false">Step Up</string>
+    <string name="radio_step_down" translatable="false">Step Down</string>
+    <string name="radio_enter_station_hint" translatable="false">Enter Station Frequency (kHz)</string>
+    <string name="radio_get_program_info" translatable="false">getProgramInformation</string>
+    <string name="radio_am" translatable="false">AM</string>
+    <string name="radio_fm" translatable="false">FM</string>
+    <string name="radio_station_info" translatable="false">Station info: %1$s</string>
+    <string name="radio_channel_info" translatable="false">Channel info: %1$s kHz</string>
+    <string name="radio_song_info" translatable="false">Song info: %1$s</string>
+    <string name="radio_artist_info" translatable="false">Artist info: %1$s</string>
+    <string name="radio_na" translatable="false">N/A</string>
 
     <!-- sensors test -->
-    <string name="location_title">Location/Orientation:</string>
-    <string name="sensor_title">Car Sensor Data:</string>
-    <string name="sensor_na">N/A</string>
+    <string name="location_title" translatable="false">Location/Orientation:</string>
+    <string name="sensor_title" translatable="false">Car Sensor Data:</string>
+    <string name="sensor_na" translatable="false">N/A</string>
 
-    <string name="sensor_environment">Environment[%1$s]: temperature=%2$s</string>
-    <string name="sensor_night">Night[%1$s]: isNight=%2$s</string>
-    <string name="sensor_gear">Gear[%1$s]: gear=%2$s</string>
-    <string name="sensor_parking_brake">Parking brake[%1$s]: isEngaged=%2$s</string>
-    <string name="sensor_odometer">Odometer[%1$s]: kms=%2$s</string>
-    <string name="sensor_rpm">RPM[%1$s]: rpm=%2$s</string>
-    <string name="sensor_speed">Speed[%1$s]: speed=%2$s</string>
-    <string name="sensor_ignition_status">Ignition status[%1$s]: status=%2$s</string>
-    <string name="sensor_wheel_ticks">Wheel Distance[%1$s]: reset=%2$s, FL=%3$s, FR=%4$s, RL=%5$s, RR=%6$s</string>
-    <string name="sensor_wheel_ticks_cfg">Wheel Distance Config: Wheels=%1$s, FL=%2$s, FR=%3$s, RL=%4$s, RR=%5$s</string>
-    <string name="sensor_abs_is_active">ABS[%1$s]: isActive=%2$s</string>
-    <string name="sensor_traction_control_is_active">Traction Control[%1$s]: isActive=%2$s</string>
-    <string name="sensor_fuel_level">Fuel Level[%1$s]: %2$s</string>
-    <string name="sensor_fuel_door_open">Fuel Door Open[%1$s]: %2$s</string>
-    <string name="sensor_engine_oil_level">Engine Oil Level[%1$s]: %2$s</string>
-    <string name="sensor_engine_is_on">Engine Is On[%1$s]: %2$s</string>
-    <string name="sensor_ev_battery_level">EV Battery Level[%1$s]: %2$s</string>
-    <string name="sensor_ev_charge_port_is_open">EV Charge Port Is Open[%1$s]: %2$s</string>
-    <string name="sensor_ev_charge_port_is_connected">EV Charge Port Is Connected[%1$s]: %2$s</string>
-    <string name="sensor_ev_charge_rate">EV Charge Rate[%1$s]: %2$s</string>
-    <string name="sensor_oil_level">Oil Level[%1$s]: %2$s</string>
+    <string name="sensor_environment" translatable="false">Environment[%1$s]: temperature=%2$s</string>
+    <string name="sensor_night" translatable="false">Night[%1$s]: isNight=%2$s</string>
+    <string name="sensor_gear" translatable="false">Gear[%1$s]: gear=%2$s</string>
+    <string name="sensor_parking_brake" translatable="false">Parking brake[%1$s]: isEngaged=%2$s</string>
+    <string name="sensor_odometer" translatable="false">Odometer[%1$s]: kms=%2$s</string>
+    <string name="sensor_rpm" translatable="false">RPM[%1$s]: rpm=%2$s</string>
+    <string name="sensor_speed" translatable="false">Speed[%1$s]: speed=%2$s</string>
+    <string name="sensor_ignition_status" translatable="false">Ignition status[%1$s]: status=%2$s</string>
+    <string name="sensor_wheel_ticks" translatable="false">Wheel Distance[%1$s]: reset=%2$s, FL=%3$s, FR=%4$s, RL=%5$s, RR=%6$s</string>
+    <string name="sensor_wheel_ticks_cfg" translatable="false">Wheel Distance Config: Wheels=%1$s, FL=%2$s, FR=%3$s, RL=%4$s, RR=%5$s</string>
+    <string name="sensor_abs_is_active" translatable="false">ABS[%1$s]: isActive=%2$s</string>
+    <string name="sensor_traction_control_is_active" translatable="false">Traction Control[%1$s]: isActive=%2$s</string>
+    <string name="sensor_fuel_level" translatable="false">Fuel Level[%1$s]: %2$s</string>
+    <string name="sensor_fuel_door_open" translatable="false">Fuel Door Open[%1$s]: %2$s</string>
+    <string name="sensor_engine_oil_level" translatable="false">Engine Oil Level[%1$s]: %2$s</string>
+    <string name="sensor_engine_is_on" translatable="false">Engine Is On[%1$s]: %2$s</string>
+    <string name="sensor_ev_battery_level" translatable="false">EV Battery Level[%1$s]: %2$s</string>
+    <string name="sensor_ev_charge_port_is_open" translatable="false">EV Charge Port Is Open[%1$s]: %2$s</string>
+    <string name="sensor_ev_charge_port_is_connected" translatable="false">EV Charge Port Is Connected[%1$s]: %2$s</string>
+    <string name="sensor_ev_charge_rate" translatable="false">EV Charge Rate[%1$s]: %2$s</string>
+    <string name="sensor_oil_level" translatable="false">Oil Level[%1$s]: %2$s</string>
 
-    <string name="volume_test">Volume Test</string>
-    <string name="volume_up_logical">Vol +</string>
-    <string name="volume_down_logical">Vol -</string>
-    <string name="refresh_volume">Refresh volumes</string>
+    <string name="volume_test" translatable="false">Volume Test</string>
+    <string name="volume_up_logical" translatable="false">Vol +</string>
+    <string name="volume_down_logical" translatable="false">Vol -</string>
+    <string name="refresh_volume" translatable="false">Refresh volumes</string>
 
     <!-- Bluetooth Tests -->
     <string name="sms_recipient_label" translatable="false">Recipient #</string>
@@ -239,31 +239,31 @@
     <string name="sms_listing_label_count" translatable="false">Count</string>
     <string name="sms_listing_label_offset" translatable="false">Offset</string>
     <string name="sms_activity_label" translatable="false">Bt Sms Tester</string>
-    <string name="sms_enter_tel_num">Enter Tel Num to send msg to</string>
+    <string name="sms_enter_tel_num" translatable="false">Enter Tel Num to send msg to</string>
     <string name="sms_reply_busy" translatable="false">Reply "I'm Busy"</string>
     <string name="sms_reply_sent" translatable="false">Reply Sent</string>
     <string name="sms_reply_delivered" translatable="false">Reply Delivered</string>
-    <string name="bluetooth_profile_connect">Profile connect</string>
-    <string name="bluetooth_profile_disconnect">Profile disconnect</string>
-    <string name="bluetooth_sco_connect">SCO connect</string>
-    <string name="bluetooth_sco_disconnect">SCO disconnect</string>
-    <string name="bluetooth_pick_device">Pick Device</string>
-    <string name="bluetooth_quiet_mode_enable">Quiet Mode</string>
-    <string name="bluetooth_hold_call">Hold call</string>
-    <string name="bluetooth_voice_recognition_enable">Start Voice Recognition</string>
-    <string name="bluetooth_voice_recognition_disable">Stop Voice Recognition</string>
-    <string name="uploading_supported_feature">Uploading_Supported bit value</string>
+    <string name="bluetooth_profile_connect" translatable="false">Profile connect</string>
+    <string name="bluetooth_profile_disconnect" translatable="false">Profile disconnect</string>
+    <string name="bluetooth_sco_connect" translatable="false">SCO connect</string>
+    <string name="bluetooth_sco_disconnect" translatable="false">SCO disconnect</string>
+    <string name="bluetooth_pick_device" translatable="false">Pick Device</string>
+    <string name="bluetooth_quiet_mode_enable" translatable="false">Quiet Mode</string>
+    <string name="bluetooth_hold_call" translatable="false">Hold call</string>
+    <string name="bluetooth_voice_recognition_enable" translatable="false">Start Voice Recognition</string>
+    <string name="bluetooth_voice_recognition_disable" translatable="false">Stop Voice Recognition</string>
+    <string name="uploading_supported_feature" translatable="false">Uploading_Supported bit value</string>
 
     <!--Car Service Settings-->
-    <string name="garage_title">Garage Mode</string>
-    <string name="garage_description">Customize your system maintenance</string>
-    <string name="regular_wake_up">Maintenance time</string>
-    <string name="garage_switch">Enable garage maintenance</string>
-    <string name="garage_enabled">Garage maintenance on</string>
-    <string name="garage_disabled">Garage maintenance off</string>
-    <string name="garage_limit">Maximum garage maintenance window</string>
-    <string name="car_settings">Car Settings</string>
-    <string-array name="garage_limit_keys">
+    <string name="garage_title" translatable="false">Garage Mode</string>
+    <string name="garage_description" translatable="false">Customize your system maintenance</string>
+    <string name="regular_wake_up" translatable="false">Maintenance time</string>
+    <string name="garage_switch" translatable="false">Enable garage maintenance</string>
+    <string name="garage_enabled" translatable="false">Garage maintenance on</string>
+    <string name="garage_disabled" translatable="false">Garage maintenance off</string>
+    <string name="garage_limit" translatable="false">Maximum garage maintenance window</string>
+    <string name="car_settings" translatable="false">Car Settings</string>
+    <string-array name="garage_limit_keys" translatable="false">
         <item>5 Minutes</item>
         <item>10 Minutes</item>
         <item>15 Minutes</item>
@@ -273,29 +273,29 @@
         <item>"10"</item>
         <item>"15"</item>
     </string-array>
-    <string name="garage_time_limit_summary">%d minutes</string>
+    <string name="garage_time_limit_summary" translatable="false">%d minutes</string>
 
-    <string name="portrait_activity">Portrait Activity</string>
-    <string name="landscpae_activity">Landscape Activity</string>
-    <string name="finish">Finish</string>
+    <string name="portrait_activity" translatable="false">Portrait Activity</string>
+    <string name="landscpae_activity" translatable="false">Landscape Activity</string>
+    <string name="finish" translatable="false">Finish</string>
 
     <!-- USB Manager Settings -->
-    <string name="usb_title">USB Devices settings</string>
-    <string name="usb_description">Customize your USB Devices settings</string>
-    <string name="usb_available_devices">Connected devices</string>
-    <string name="usb_saved_devices">Saved devices</string>
-    <string name="usb_pref_delete_title">Remove handling app for USB device</string>
-    <string name="usb_pref_delete_message">Are you sure you wan to delete dafault handling app for %1$s?</string>
-    <string name="usb_pref_delete_yes">Yes</string>
-    <string name="usb_pref_delete_cancel">Cancel</string>
-    <string name="usb_resolving_handlers">Getting supported handlers</string>
+    <string name="usb_title" translatable="false">USB Devices settings</string>
+    <string name="usb_description" translatable="false">Customize your USB Devices settings</string>
+    <string name="usb_available_devices" translatable="false">Connected devices</string>
+    <string name="usb_saved_devices" translatable="false">Saved devices</string>
+    <string name="usb_pref_delete_title" translatable="false">Remove handling app for USB device</string>
+    <string name="usb_pref_delete_message" translatable="false">Are you sure you wan to delete dafault handling app for %1$s?</string>
+    <string name="usb_pref_delete_yes" translatable="false">Yes</string>
+    <string name="usb_pref_delete_cancel" translatable="false">Cancel</string>
+    <string name="usb_resolving_handlers" translatable="false">Getting supported handlers</string>
 
     <!-- Action to start assistant activity -->
     <string name="assistant_activity_action" translatable="false">"com.google.android.demandspace.START"</string>
 
     <!-- Virtual Display -->
-    <string name="av_start_activity">Start Activity</string>
-    <string name="av_resize">Resize</string>
+    <string name="av_start_activity" translatable="false">Start Activity</string>
+    <string name="av_resize" translatable="false">Resize</string>
 
     <string name="weblink_google" translatable="false">www.google.com</string>
     <string name="weblink_nytimes" translatable="false">www.nytimes.com</string>
diff --git a/tests/GarageModeTestApp/res/values/strings.xml b/tests/GarageModeTestApp/res/values/strings.xml
index 4d713c5..59945125 100644
--- a/tests/GarageModeTestApp/res/values/strings.xml
+++ b/tests/GarageModeTestApp/res/values/strings.xml
@@ -14,35 +14,35 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">GarageMode Test App</string>
+  <string name="app_name" translatable="false">GarageMode Test App</string>
 
-  <string name="button_schedule_job">Schedule Job</string>
-  <string name="button_job_info">Job Info</string>
-  <string name="button_enter_garage_mode">Enter GarageMode</string>
-  <string name="button_exit_garage_mode">Exit GarageMode</string>
+  <string name="button_schedule_job" translatable="false">Schedule Job</string>
+  <string name="button_job_info" translatable="false">Job Info</string>
+  <string name="button_enter_garage_mode" translatable="false">Enter GarageMode</string>
+  <string name="button_exit_garage_mode" translatable="false">Exit GarageMode</string>
 
-  <string name="checkbox_require_persisted">Persisted?</string>
-  <string name="checkbox_require_idleness">Require idleness?</string>
-  <string name="checkbox_require_charging">Require charging?</string>
+  <string name="checkbox_require_persisted" translatable="false">Persisted?</string>
+  <string name="checkbox_require_idleness" translatable="false">Require idleness?</string>
+  <string name="checkbox_require_charging" translatable="false">Require charging?</string>
 
-  <string name="no_results">No Results</string>
+  <string name="no_results" translatable="false">No Results</string>
 
-  <string name="section_header_garage_mode_config">GarageMode Settings</string>
-  <string name="section_header_job_configuration">Job Configuration</string>
-  <string name="section_header_jobs_list">Scheduled Jobs</string>
-  <string name="section_header_watchdog">Watchdog</string>
+  <string name="section_header_garage_mode_config" translatable="false">GarageMode Settings</string>
+  <string name="section_header_job_configuration" translatable="false">Job Configuration</string>
+  <string name="section_header_jobs_list" translatable="false">Scheduled Jobs</string>
+  <string name="section_header_watchdog" translatable="false">Watchdog</string>
 
-  <string name="spinner_label_garage_mode_duration">GarageMode max duration:</string>
-  <string name="spinner_label_job_duration">Job duration:</string>
-  <string name="spinner_label_network_type">Network type:</string>
+  <string name="spinner_label_garage_mode_duration" translatable="false">GarageMode max duration:</string>
+  <string name="spinner_label_job_duration" translatable="false">Job duration:</string>
+  <string name="spinner_label_network_type" translatable="false">Network type:</string>
 
-  <string-array name="network_types_list">
+  <string-array name="network_types_list" translatable="false">
     <item>ANY</item>
     <item>NONE</item>
     <item>UNMETERED</item>
   </string-array>
 
-  <string-array name="duration_list">
+  <string-array name="duration_list" translatable="false">
     <item>1 second</item>
     <item>5 seconds</item>
     <item>10 seconds</item>
diff --git a/tests/InstrumentClusterRendererSample/res/values/strings.xml b/tests/InstrumentClusterRendererSample/res/values/strings.xml
index 5c39d53..2666619 100644
--- a/tests/InstrumentClusterRendererSample/res/values/strings.xml
+++ b/tests/InstrumentClusterRendererSample/res/values/strings.xml
@@ -15,47 +15,47 @@
 -->
 
 <resources xmlns:xliff="http://schemas.android.com/tools">
-    <string name="app_name">InstrumentClusterRendererImpl</string>
+    <string name="app_name" translatable="false">InstrumentClusterRendererImpl</string>
 
-    <string name="incoming_call">Incoming call</string>
-    <string name="dialing">Dialing</string>
-    <string name="dummy_call_type">• Mobile</string>
+    <string name="incoming_call" translatable="false">Incoming call</string>
+    <string name="dialing" translatable="false">Dialing</string>
+    <string name="dummy_call_type" translatable="false">• Mobile</string>
 
-    <string name="font_family_primary">sans-serif-medium</string>
-    <string name="font_family_secondary">sans-serif-regular</string>
+    <string name="font_family_primary" translatable="false">sans-serif-medium</string>
+    <string name="font_family_secondary" translatable="false">sans-serif-regular</string>
 
-    <string name="dummy_weather_forecast">Partly cloudy</string>
-    <string name="dummy_weather_location">Mountain View, CA</string>
-    <string name="dummy_weather_temperature">82°</string>
+    <string name="dummy_weather_forecast" translatable="false">Partly cloudy</string>
+    <string name="dummy_weather_location" translatable="false">Mountain View, CA</string>
+    <string name="dummy_weather_temperature" translatable="false">82°</string>
 
-    <string name="nav_distance_units_ft">ft</string>
-    <string name="nav_distance_units_meters">m</string>
-    <string name="nav_distance_units_kilometers">km</string>
-    <string name="nav_distance_units_miles">mi</string>
-    <string name="nav_distance_units_yards">yd</string>
+    <string name="nav_distance_units_ft" translatable="false">ft</string>
+    <string name="nav_distance_units_meters" translatable="false">m</string>
+    <string name="nav_distance_units_kilometers" translatable="false">km</string>
+    <string name="nav_distance_units_miles" translatable="false">mi</string>
+    <string name="nav_distance_units_yards" translatable="false">yd</string>
 
-    <string name="incoming_message">Incoming message</string>
+    <string name="incoming_message" translatable="false">Incoming message</string>
 
-    <string name="unknown">Unknown</string>
-    <string name="voicemail">Voicemail</string>
-    <string name="phone_label_with_info">
+    <string name="unknown" translatable="false">Unknown</string>
+    <string name="voicemail" translatable="false">Voicemail</string>
+    <string name="phone_label_with_info" translatable="false">
         <xliff:g id="label" example="Mobile">%1$s</xliff:g>
         " \u00B7 "
         <xliff:g id="duration" example="1:20">%2$s</xliff:g>
     </string>
     <!-- Status label for phone state [CHAR LIMIT=20] -->
-    <string name="call_state_connecting">Connecting</string>
+    <string name="call_state_connecting" translatable="false">Connecting</string>
     <!-- Status label for phone state [CHAR LIMIT=20] -->
-    <string name="call_state_dialing">Dialing</string>
+    <string name="call_state_dialing" translatable="false">Dialing</string>
     <!-- Status label for phone state [CHAR LIMIT=20] -->
-    <string name="call_state_hold">On Hold</string>
+    <string name="call_state_hold" translatable="false">On Hold</string>
     <!-- Status label for phone state [CHAR LIMIT=20] -->
-    <string name="call_state_call_ended">Call Ended</string>
+    <string name="call_state_call_ended" translatable="false">Call Ended</string>
     <!-- Status label for phone state [CHAR LIMIT=20] -->
-    <string name="call_state_call_active">Connected</string>
+    <string name="call_state_call_active" translatable="false">Connected</string>
     <!-- Status label for phone state [CHAR LIMIT=20] -->
-    <string name="call_state_call_ringing">Ringing</string>
+    <string name="call_state_call_ringing" translatable="false">Ringing</string>
     <!-- Status label for phone state [CHAR LIMIT=20] -->
-    <string name="call_state_call_ending">Disconnecting</string>
+    <string name="call_state_call_ending" translatable="false">Disconnecting</string>
 
 </resources>
diff --git a/tests/UxRestrictionsSample/res/values/strings.xml b/tests/UxRestrictionsSample/res/values/strings.xml
index 3b0b69b..aa32ff4 100644
--- a/tests/UxRestrictionsSample/res/values/strings.xml
+++ b/tests/UxRestrictionsSample/res/values/strings.xml
@@ -14,20 +14,20 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name">UxRestrictionsSample</string>
-    <string name="title_activity_main">MainActivity</string>
-    <string name="status_header"><u>Current Status</u></string>
-    <string name="driving_state">Driving State: </string>
-    <string name="is_do_reqd">Distraction Optimization Required? </string>
-    <string name="active_restrictions">Active UX Restrictions: </string>
-    <string name="action_header"><u>Available Actions</u></string>
-    <string name="disable_uxr">Disable Ux Restriction Engine</string>
-    <string name="sample_header"><u>Sample Activities</u></string>
-    <string name="sample_msg_activity">Sample Message Activity</string>
-    <string name="return_home"><u>Return Home</u></string>
-    <string name="save_uxr_config_header"><u>Save UX Restrictions For Next Boot</u></string>
-    <string name="save_uxr_config">Save UX Restrictions</string>
-    <string name="set_uxr_config_dialog_title">Select restrictions for IDLING/MOVING</string>
-    <string name="set_uxr_config_dialog_negative_button">Cancel</string>
-    <string name="set_uxr_config_dialog_positive_button">Save UXR Config</string>
+    <string name="app_name" translatable="false">UxRestrictionsSample</string>
+    <string name="title_activity_main" translatable="false">MainActivity</string>
+    <string name="status_header" translatable="false"><u>Current Status</u></string>
+    <string name="driving_state" translatable="false">Driving State: </string>
+    <string name="is_do_reqd" translatable="false">Distraction Optimization Required? </string>
+    <string name="active_restrictions" translatable="false">Active UX Restrictions: </string>
+    <string name="action_header" translatable="false"><u>Available Actions</u></string>
+    <string name="disable_uxr" translatable="false">Disable Ux Restriction Engine</string>
+    <string name="sample_header" translatable="false"><u>Sample Activities</u></string>
+    <string name="sample_msg_activity" translatable="false">Sample Message Activity</string>
+    <string name="return_home" translatable="false"><u>Return Home</u></string>
+    <string name="save_uxr_config_header" translatable="false"><u>Save UX Restrictions For Next Boot</u></string>
+    <string name="save_uxr_config" translatable="false">Save UX Restrictions</string>
+    <string name="set_uxr_config_dialog_title" translatable="false">Select restrictions for IDLING/MOVING</string>
+    <string name="set_uxr_config_dialog_negative_button" translatable="false">Cancel</string>
+    <string name="set_uxr_config_dialog_positive_button" translatable="false">Save UXR Config</string>
 </resources>
diff --git a/tests/VmsPublisherClientSample/res/values/strings.xml b/tests/VmsPublisherClientSample/res/values/strings.xml
index df8bf05..9d548e4 100644
--- a/tests/VmsPublisherClientSample/res/values/strings.xml
+++ b/tests/VmsPublisherClientSample/res/values/strings.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <resources>
-  <string name="app_name">VmsPublisherClientSample</string>
+  <string name="app_name" translatable="false">VmsPublisherClientSample</string>
 </resources>
diff --git a/tests/VmsSubscriberClientSample/res/values/strings.xml b/tests/VmsSubscriberClientSample/res/values/strings.xml
index 24df55e..64b8482 100644
--- a/tests/VmsSubscriberClientSample/res/values/strings.xml
+++ b/tests/VmsSubscriberClientSample/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-  <string name="app_name">VmsSubscriberClientSample</string>
+  <string name="app_name" translatable="false">VmsSubscriberClientSample</string>
 </resources>
diff --git a/tests/obd2_app/res/values/strings.xml b/tests/obd2_app/res/values/strings.xml
index c615c4f..28db929 100644
--- a/tests/obd2_app/res/values/strings.xml
+++ b/tests/obd2_app/res/values/strings.xml
@@ -14,39 +14,39 @@
      limitations under the License.
 -->
 <resources>
-  <string name="app_name">Obd2App</string>
-  <string name="title_activity_settings">Settings</string>
+  <string name="app_name" translatable="false">Obd2App</string>
+  <string name="title_activity_settings" translatable="false">Settings</string>
 
   <!-- Strings related to Settings -->
 
   <!-- Example General settings -->
-  <string name="pref_header_general">General</string>
+  <string name="pref_header_general" translatable="false">General</string>
 
-  <string name="pref_title_social_recommendations">Enable social recommendations</string>
-  <string name="pref_description_social_recommendations">Recommendations for people to contact based
+  <string name="pref_title_social_recommendations" translatable="false">Enable social recommendations</string>
+  <string name="pref_description_social_recommendations" translatable="false">Recommendations for people to contact based
     on your message history
   </string>
 
-  <string name="pref_title_display_name">Display name</string>
-  <string name="pref_default_display_name">John Smith</string>
+  <string name="pref_title_display_name" translatable="false">Display name</string>
+  <string name="pref_default_display_name" translatable="false">John Smith</string>
 
-  <string name="pref_title_add_friends_to_messages">Add friends to messages</string>
-  <string-array name="pref_example_list_titles">
+  <string name="pref_title_add_friends_to_messages" translatable="false">Add friends to messages</string>
+  <string-array name="pref_example_list_titles" translatable="false">
     <item>Always</item>
     <item>When possible</item>
     <item>Never</item>
   </string-array>
-  <string-array name="pref_example_list_values">
+  <string-array name="pref_example_list_values" translatable="false">
     <item>1</item>
     <item>0</item>
     <item>-1</item>
   </string-array>
 
   <!-- Example settings for Data & Sync -->
-  <string name="pref_header_data_sync">Data &amp; sync</string>
+  <string name="pref_header_data_sync" translatable="false">Data &amp; sync</string>
 
-  <string name="pref_title_sync_frequency">Sync frequency</string>
-  <string-array name="pref_sync_frequency_titles">
+  <string name="pref_title_sync_frequency" translatable="false">Sync frequency</string>
+  <string-array name="pref_sync_frequency_titles" translatable="false">
     <item>15 minutes</item>
     <item>30 minutes</item>
     <item>1 hour</item>
@@ -54,7 +54,7 @@
     <item>6 hours</item>
     <item>Never</item>
   </string-array>
-  <string-array name="pref_sync_frequency_values">
+  <string-array name="pref_sync_frequency_values" translatable="false">
     <item>15</item>
     <item>30</item>
     <item>60</item>
@@ -63,13 +63,13 @@
     <item>-1</item>
   </string-array>
 
-  <string-array name="list_preference_entries">
+  <string-array name="list_preference_entries" translatable="false">
     <item>Entry 1</item>
     <item>Entry 2</item>
     <item>Entry 3</item>
   </string-array>
 
-  <string-array name="list_preference_entry_values">
+  <string-array name="list_preference_entry_values" translatable="false">
     <item>1</item>
     <item>2</item>
     <item>3</item>
@@ -77,15 +77,15 @@
 
   <string-array name="multi_select_list_preference_default_value"/>
 
-  <string name="pref_title_system_sync_settings">System sync settings</string>
+  <string name="pref_title_system_sync_settings" translatable="false">System sync settings</string>
 
   <!-- Example settings for Notifications -->
-  <string name="pref_header_notifications">Notifications</string>
+  <string name="pref_header_notifications" translatable="false">Notifications</string>
 
-  <string name="pref_title_new_message_notifications">New message notifications</string>
+  <string name="pref_title_new_message_notifications" translatable="false">New message notifications</string>
 
-  <string name="pref_title_ringtone">Ringtone</string>
-  <string name="pref_ringtone_silent">Silent</string>
+  <string name="pref_title_ringtone" translatable="false">Ringtone</string>
+  <string name="pref_ringtone_silent" translatable="false">Silent</string>
 
-  <string name="pref_title_vibrate">Vibrate</string>
+  <string name="pref_title_vibrate" translatable="false">Vibrate</string>
 </resources>
diff --git a/tests/usb/AoapHostApp/res/values/strings.xml b/tests/usb/AoapHostApp/res/values/strings.xml
index f2caeb3..1643b19 100644
--- a/tests/usb/AoapHostApp/res/values/strings.xml
+++ b/tests/usb/AoapHostApp/res/values/strings.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 <resources>
-  <string name="app_title">AOAP Test Host App</string>
-  <string name="exit">Exit</string>
+  <string name="app_title" translatable="false">AOAP Test Host App</string>
+  <string name="exit" translatable="false">Exit</string>
 </resources>
diff --git a/tests/usb/AoapPhoneCompanionApp/res/values/strings.xml b/tests/usb/AoapPhoneCompanionApp/res/values/strings.xml
index bea6654..9b98c9b 100644
--- a/tests/usb/AoapPhoneCompanionApp/res/values/strings.xml
+++ b/tests/usb/AoapPhoneCompanionApp/res/values/strings.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 <resources>
-  <string name="app_title">AOAP Test Companion App</string>
-  <string name="exit">Exit</string>
+  <string name="app_title" translatable="false">AOAP Test Companion App</string>
+  <string name="exit" translatable="false">Exit</string>
 </resources>