diff --git a/Android.bp b/Android.bp
index 4eadaef..8d3c8f9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,34 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    default_applicable_licenses: ["packages_apps_DocumentsUI_license"],
-}
-
-// Added automatically by a large-scale-change that took the approach of
-// 'apply every license found to every target'. While this makes sure we respect
-// every license restriction, it may not be entirely correct.
-//
-// e.g. GPL in an MIT project might only apply to the contrib/ directory.
-//
-// Please consider splitting the single license below into multiple licenses,
-// taking care not to lose any license_kind information, and overriding the
-// default license using the 'licenses: [...]' property on targets as needed.
-//
-// For unused files, consider creating a 'fileGroup' with "//visibility:private"
-// to attach the license to, and including a comment whether the files may be
-// used in the current project.
-// See: http://go/android-license-faq
-license {
-    name: "packages_apps_DocumentsUI_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "legacy_unencumbered",
-    ],
-    // large-scale-change unable to identify any license_text files
-}
-
 java_defaults {
     name: "documentsui_defaults",
 
@@ -75,7 +47,6 @@
     plugins: [
         "java_api_finder",
     ],
-    lint: { strict_updatability_linting: true }
 }
 
 platform_compat_config {
@@ -96,14 +67,12 @@
     srcs: [
         ":statslog-docsui-java-gen",
     ],
-    lint: { strict_updatability_linting: true }
 }
 
 genrule {
     name: "statslog-docsui-java-gen",
     tools: ["stats-log-api-gen"],
-    cmd: "$(location stats-log-api-gen) --java $(out) --module docsui" +
-         " --javaPackage com.android.documentsui --javaClass DocumentsStatsLog --minApiLevel 29",
+    cmd: "$(location stats-log-api-gen) --java $(out) --module docsui --javaPackage com.android.documentsui --javaClass DocumentsStatsLog --supportQ",
     out: ["com/android/documentsui/DocumentsStatsLog.java"],
 }
 
@@ -128,7 +97,6 @@
     sdk_version: "system_current",
     target_sdk_version: "30",
     min_sdk_version: "29",
-    lint: { strict_updatability_linting: true }
 }
 
 android_library {
@@ -152,7 +120,6 @@
     sdk_version: "system_current",
     target_sdk_version: "30",
     min_sdk_version: "29",
-    lint: { strict_updatability_linting: true }
 }
 
 android_app {
@@ -174,6 +141,4 @@
 
     target_sdk_version: "30",
     min_sdk_version: "29",
-    lint: { strict_updatability_linting: true }
 }
-
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8b86feb..3dc2109 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -36,8 +36,6 @@
     <uses-permission android:name="android.permission.LOG_COMPAT_CHANGE"/>
     <uses-permission android:name="android.permission.READ_COMPAT_CHANGE_CONFIG"/>
 
-    <uses-permission android:name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>
-
     <application
         android:name=".DocumentsApplication"
         android:label="@string/app_label"
@@ -171,8 +169,7 @@
             </intent-filter>
         </provider>
 
-        <receiver android:name=".PackageReceiver"
-            android:exported="true">
+        <receiver android:name=".PackageReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
                 <action android:name="android.intent.action.PACKAGE_DATA_CLEARED" />
@@ -180,15 +177,13 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".roots.BootReceiver" android:enabled="false"
-            android:exported="true">
+        <receiver android:name=".roots.BootReceiver" android:enabled="false">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".PreBootReceiver"
-            android:exported="true">
+        <receiver android:name=".PreBootReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.PRE_BOOT_COMPLETED" />
             </intent-filter>
@@ -206,7 +201,6 @@
         <activity
             android:name=".selection.demo.SelectionDemoActivity"
             android:label="Selection Demo"
-            android:exported="true"
             android:theme="@style/DocumentsTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_APACHE2
diff --git a/app-perf-tests/Android.bp b/app-perf-tests/Android.bp
index f753ac5..5c21977 100644
--- a/app-perf-tests/Android.bp
+++ b/app-perf-tests/Android.bp
@@ -1,7 +1,3 @@
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
 android_test {
     name: "DocumentsUIAppPerfTests",
 
@@ -18,9 +14,9 @@
 
     static_libs: [
         "androidx.legacy_legacy-support-v4",
-        "collector-device-lib",
         "mockito-target",
         "ub-uiautomator",
+	      "collector-device-lib",
     ],
 
     platform_apis: true,
diff --git a/app-perf-tests/AndroidManifest.xml b/app-perf-tests/AndroidManifest.xml
index 0ed5e45..0013b6b 100644
--- a/app-perf-tests/AndroidManifest.xml
+++ b/app-perf-tests/AndroidManifest.xml
@@ -13,7 +13,7 @@
 
     <!-- This package instrumentates itself, so the DocumentsUI process can be killed without
          killing the testing package. -->
-    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+    <instrumentation android:name="android.test.InstrumentationTestRunner"
         android:targetPackage="com.android.documentsui.appperftests"
         android:label="App performance tests for DocumentsUI" />
 
diff --git a/app-perf-tests/AndroidTest.xml b/app-perf-tests/AndroidTest.xml
index a553226..c8dd9a1 100644
--- a/app-perf-tests/AndroidTest.xml
+++ b/app-perf-tests/AndroidTest.xml
@@ -22,7 +22,7 @@
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
-        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
+        <option name="runner" value="android.test.InstrumentationTestRunner" />
         <option name="package" value="com.android.documentsui.appperftests" />
     </test>
 </configuration>
diff --git a/app-perf-tests/src/com/android/documentsui/FilesAppPerfTest.java b/app-perf-tests/src/com/android/documentsui/FilesAppPerfTest.java
index 670391e..d39b49c 100644
--- a/app-perf-tests/src/com/android/documentsui/FilesAppPerfTest.java
+++ b/app-perf-tests/src/com/android/documentsui/FilesAppPerfTest.java
@@ -28,19 +28,12 @@
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
 
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
-@RunWith(AndroidJUnit4.class)
-public class FilesAppPerfTest {
+@LargeTest
+public class FilesAppPerfTest extends InstrumentationTestCase {
 
     // Keys used to report metrics to APCT.
     private static final String KEY_FILES_COLD_START_PERFORMANCE_MEDIAN =
@@ -53,19 +46,17 @@
     private static final int NUM_MEASUREMENTS = 10;
 
     private LauncherActivity mActivity;
-    private static UiDevice mDevice;
+    private UiDevice mDevice;
 
-    @BeforeClass
-    public static void setUp() {
-        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+    @Override
+    public void setUp() {
+        mDevice = UiDevice.getInstance(getInstrumentation());
     }
 
-    @Test
     public void testFilesColdStartPerformance() throws Exception {
         runFilesStartPerformanceTest(true);
     }
 
-    @Test
     public void testFilesWarmStartPerformance() throws Exception {
         runFilesStartPerformanceTest(false);
     }
@@ -81,9 +72,7 @@
             mDevice.waitForIdle();
 
             LauncherActivity.testCaseLatch = new CountDownLatch(1);
-            mActivity = launchActivity(
-                    InstrumentationRegistry.getInstrumentation().getTargetContext()
-                            .getPackageName(),
+            mActivity = launchActivity(getInstrumentation().getTargetContext().getPackageName(),
                     LauncherActivity.class, null);
             LauncherActivity.testCaseLatch.await();
             measurements[i] = LauncherActivity.measurement;
@@ -97,13 +86,13 @@
         final Bundle status = new Bundle();
         Arrays.sort(measurements);
         final long median = measurements[NUM_MEASUREMENTS / 2 - 1];
-        status.putDouble(key + "(ms)", median);
+        status.putDouble(key, median);
 
-        InstrumentationRegistry.getInstrumentation().sendStatus(Activity.RESULT_OK, status);
+        getInstrumentation().sendStatus(Activity.RESULT_OK, status);
     }
 
     private void killProviders() throws Exception {
-        final Context context = InstrumentationRegistry.getInstrumentation().getContext();
+        final Context context = getInstrumentation().getContext();
         final PackageManager pm = context.getPackageManager();
         final ActivityManager am = (ActivityManager) context.getSystemService(
                 Context.ACTIVITY_SERVICE);
@@ -114,26 +103,4 @@
             am.killBackgroundProcesses(packageName);
         }
     }
-
-    private final <T extends Activity> T launchActivity(
-            String pkg,
-            Class<T> activityCls,
-            Bundle extras) {
-        Intent intent = new Intent(Intent.ACTION_MAIN);
-        if (extras != null) {
-            intent.putExtras(extras);
-        }
-        return launchActivityWithIntent(pkg, activityCls, intent);
-    }
-
-    private final <T extends Activity> T launchActivityWithIntent(
-            String pkg,
-            Class<T> activityCls,
-            Intent intent) {
-        intent.setClassName(pkg, activityCls.getName());
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        T activity = (T) InstrumentationRegistry.getInstrumentation().startActivitySync(intent);
-        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
-        return activity;
-    }
 }
diff --git a/perf-tests/Android.bp b/perf-tests/Android.bp
index 955b1c0..e745fdf 100644
--- a/perf-tests/Android.bp
+++ b/perf-tests/Android.bp
@@ -1,7 +1,3 @@
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
 android_test {
     name: "DocumentsUIPerfTests",
 
diff --git a/res/color/fragment_pick_button_background_color.xml b/res/color/fragment_pick_button_background_color.xml
deleted file mode 100644
index cf6d480..0000000
--- a/res/color/fragment_pick_button_background_color.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="@color/fragment_pick_active_button_color" android:state_enabled="true" />
-  <item android:color="@color/fragment_pick_inactive_button_color" android:state_enabled="false" />
-</selector>
\ No newline at end of file
diff --git a/res/color/fragment_pick_button_text_color.xml b/res/color/fragment_pick_button_text_color.xml
deleted file mode 100644
index e4e1edc..0000000
--- a/res/color/fragment_pick_button_text_color.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="@color/fragment_pick_active_text_color" android:state_enabled="true" />
-  <item android:color="@color/fragment_pick_inactive_text_color" android:state_enabled="false" />
-</selector>
\ No newline at end of file
diff --git a/res/color/profile_tab_selector.xml b/res/color/profile_tab_selector.xml
deleted file mode 100644
index 53aef1f..0000000
--- a/res/color/profile_tab_selector.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_selected="true"
-        android:color="@color/profile_tab_selected_color"/>
-    <item
-        android:color="@color/profile_tab_default_color"/>
-</selector>
diff --git a/res/drawable/tab_border_rounded.xml b/res/drawable/tab_border_rounded.xml
deleted file mode 100644
index dfff1d4..0000000
--- a/res/drawable/tab_border_rounded.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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.
--->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-   <solid
-       android:color="@color/profile_tab_selector"/>
-   <corners android:radius="12dp"/>
-</shape>
diff --git a/res/layout-sw720dp/item_doc_list.xml b/res/layout-sw720dp/item_doc_list.xml
index da91796..5849a31 100644
--- a/res/layout-sw720dp/item_doc_list.xml
+++ b/res/layout-sw720dp/item_doc_list.xml
@@ -110,7 +110,7 @@
                     android:ellipsize="middle"
                     android:singleLine="true"
                     android:textAlignment="viewStart"
-                    android:textAppearance="@style/Subhead"
+                    android:textAppearance="@android:style/TextAppearance.Material.Subhead"
                     android:textColor="?android:attr/textColorPrimary"/>
             </LinearLayout>
 
@@ -123,7 +123,7 @@
                 android:ellipsize="end"
                 android:singleLine="true"
                 android:textAlignment="viewStart"
-                android:textAppearance="@style/Body1"
+                android:textAppearance="@android:style/TextAppearance.Material.Body1"
                 android:textColor="?android:attr/textColorSecondary" />
 
             <TextView
@@ -136,7 +136,7 @@
                 android:minWidth="70dp"
                 android:singleLine="true"
                 android:textAlignment="viewEnd"
-                android:textAppearance="@style/Body1"
+                android:textAppearance="@android:style/TextAppearance.Material.Body1"
                 android:textColor="?android:attr/textColorSecondary" />
 
             <TextView
@@ -149,7 +149,7 @@
                 android:minWidth="70dp"
                 android:singleLine="true"
                 android:textAlignment="viewEnd"
-                android:textAppearance="@style/Body1"
+                android:textAppearance="@android:style/TextAppearance.Material.Body1"
                 android:textColor="?android:attr/textColorSecondary" />
         </LinearLayout>
 
diff --git a/res/layout-sw720dp/shared_cell_content.xml b/res/layout-sw720dp/shared_cell_content.xml
index 9346933..2a811f9 100644
--- a/res/layout-sw720dp/shared_cell_content.xml
+++ b/res/layout-sw720dp/shared_cell_content.xml
@@ -23,7 +23,7 @@
         android:ellipsize="end"
         android:singleLine="true"
         android:textAlignment="viewStart"
-        android:textAppearance="@style/Subhead"
+        android:textAppearance="@style/android:TextAppearance.Material.Subhead"
         android:textColor="?android:attr/textColorSecondary"/>
 
     <ImageView
diff --git a/res/layout/dialog_delete_confirmation.xml b/res/layout/dialog_delete_confirmation.xml
index 80879ad..501736c 100644
--- a/res/layout/dialog_delete_confirmation.xml
+++ b/res/layout/dialog_delete_confirmation.xml
@@ -21,5 +21,5 @@
     android:paddingTop="24dp"
     android:paddingStart="24dp"
     android:paddingEnd="24dp"
-    android:textAppearance="@style/Subhead">
+    android:textAppearance="@android:style/TextAppearance.Material.Subhead">
 </TextView>
diff --git a/res/layout/directory_header.xml b/res/layout/directory_header.xml
index 4d602ac..6a222d5 100644
--- a/res/layout/directory_header.xml
+++ b/res/layout/directory_header.xml
@@ -36,8 +36,6 @@
         android:clipChildren="true"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingLeft="@dimen/profile_tab_padding"
-        android:paddingRight="@dimen/profile_tab_padding"
         android:orientation="vertical">
 
         <com.google.android.material.tabs.TabLayout
@@ -49,12 +47,11 @@
             app:tabGravity="fill"
             app:tabMode="fixed"
             app:tabIndicatorColor="?android:attr/colorAccent"
-            app:tabIndicatorHeight="@dimen/tab_selector_indicator_height"
-            app:tabSelectedTextColor="@color/tab_selected_text_color"
+            app:tabSelectedTextColor="?android:attr/colorAccent"
             app:tabTextAppearance="@style/TabTextAppearance"
-            app:tabTextColor="@color/tab_unselected_text_color"/>
+            app:tabTextColor="?android:attr/textColorSecondary"/>
+
         <View
-            android:id="@+id/tab_separator"
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:background="?android:attr/listDivider"/>
@@ -64,7 +61,6 @@
     <include layout="@layout/apps_row"/>
 
     <LinearLayout
-        android:id="@+id/header_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/root_info_header_horizontal_padding"
@@ -76,7 +72,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:textAppearance="@style/SectionHeader"
+            android:textAppearance="@style/SortTitle"
+            android:textAllCaps="true"
             android:maxLines="1"
             android:ellipsize="end"
             android:gravity="start|center_vertical"/>
diff --git a/res/layout/drag_shadow_layout.xml b/res/layout/drag_shadow_layout.xml
index 591e813..f424742 100644
--- a/res/layout/drag_shadow_layout.xml
+++ b/res/layout/drag_shadow_layout.xml
@@ -40,7 +40,7 @@
             android:maxLines="1"
             android:ellipsize="end"
             android:textAlignment="viewStart"
-            android:textAppearance="@style/Subhead"
+            android:textAppearance="@android:style/TextAppearance.Material.Subhead"
             android:paddingStart="6dp"
             android:paddingBottom="1dp"/>
 
diff --git a/res/layout/drawer_layout.xml b/res/layout/drawer_layout.xml
index d08c17d..b5bfc66 100644
--- a/res/layout/drawer_layout.xml
+++ b/res/layout/drawer_layout.xml
@@ -51,8 +51,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent" />
 
-                <!-- Drawer edge is a placeholder view used to capture hovering
-                     event on view edge to open the drawer. (b/28345294) -->
+                <!-- Drawer edge is a dummy view used to capture hovering event
+                     on view edge to open the drawer. (b/28345294) -->
                 <View
                     android:id="@+id/drawer_edge"
                     android:background="@android:color/transparent"
diff --git a/res/layout/fragment_pick.xml b/res/layout/fragment_pick.xml
index cba4ecb..88c28bd 100644
--- a/res/layout/fragment_pick.xml
+++ b/res/layout/fragment_pick.xml
@@ -14,7 +14,6 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
@@ -26,7 +25,6 @@
     <com.google.android.material.button.MaterialButton
         android:id="@android:id/button2"
         style="?attr/materialButtonOutlinedStyle"
-        app:cornerRadius="@dimen/button_corner_radius"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
@@ -40,12 +38,9 @@
         <com.google.android.material.button.MaterialButton
             android:id="@android:id/button1"
             style="?attr/materialButtonStyle"
-            app:cornerRadius="@dimen/button_corner_radius"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
-            android:backgroundTint="@color/fragment_pick_button_background_color"
-            android:textColor="@color/fragment_pick_button_text_color"
             android:layout_marginEnd="4dp" />
 
         <!-- Handles touch events when button1 is disabled. -->
diff --git a/res/layout/fragment_save.xml b/res/layout/fragment_save.xml
index 0f46b2a..b3f3c0b 100644
--- a/res/layout/fragment_save.xml
+++ b/res/layout/fragment_save.xml
@@ -15,7 +15,6 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingStart="@dimen/list_item_padding"
@@ -54,7 +53,6 @@
         <com.google.android.material.button.MaterialButton
             android:id="@android:id/button1"
             style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
-            app:cornerRadius="@dimen/button_corner_radius"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
diff --git a/res/layout/item_doc_grid.xml b/res/layout/item_doc_grid.xml
index 5e2e938..0b81980 100644
--- a/res/layout/item_doc_grid.xml
+++ b/res/layout/item_doc_grid.xml
@@ -176,7 +176,7 @@
                         android:singleLine="true"
                         android:ellipsize="end"
                         android:textAlignment="viewStart"
-                        android:textAppearance="@style/ItemCaptionText" />
+                        android:textAppearance="@android:style/TextAppearance.Material.Caption"/>
 
                     <TextView
                         android:id="@+id/date"
@@ -187,7 +187,7 @@
                         android:singleLine="true"
                         android:ellipsize="end"
                         android:textAlignment="viewStart"
-                        android:textAppearance="@style/ItemCaptionText" />
+                        android:textAppearance="@android:style/TextAppearance.Material.Caption"/>
 
                 </RelativeLayout>
 
diff --git a/res/layout/item_doc_inflated_message_cross_profile.xml b/res/layout/item_doc_inflated_message_cross_profile.xml
index 3cc0d7c..ad5c8c1 100644
--- a/res/layout/item_doc_inflated_message_cross_profile.xml
+++ b/res/layout/item_doc_inflated_message_cross_profile.xml
@@ -17,7 +17,6 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -55,7 +54,7 @@
             android:textAppearance="@style/EmptyStateTitleText"/>
         <TextView
             android:id="@+id/message"
-            android:layout_marginTop="@dimen/cross_profile_button_message_margin_top"
+            android:layout_marginTop="4dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
@@ -65,9 +64,6 @@
             android:layout_marginTop="16dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:cornerRadius="@dimen/cross_profile_button_corner_radius"
-            app:strokeWidth="@dimen/cross_profile_button_stroke_width"
-            app:strokeColor="@color/work_profile_button_stroke_color"
             style="@style/EmptyStateButton"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/item_doc_list.xml b/res/layout/item_doc_list.xml
index 0942c4b..bcc6248 100644
--- a/res/layout/item_doc_list.xml
+++ b/res/layout/item_doc_list.xml
@@ -126,7 +126,7 @@
               android:layout_height="wrap_content"
               android:ellipsize="end"
               android:singleLine="true"
-              android:textAppearance="@style/ItemCaptionText" />
+              android:textAppearance="@style/ItemDocListCaptionText" />
 
         </LinearLayout>
 
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 75b63a6..b045e90 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Kon nie dokument stoor nie"</string>
     <string name="create_error" msgid="3092144450044861994">"Kon nie vouer skep nie"</string>
     <string name="query_error" msgid="6625421453613879336">"Kan op die oomblik nie inhoud laai nie"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Werkprogramme is onderbreek"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Skakel werkprogramme aan"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Werkprofiel is onderbreek"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Skakel aan"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Kan nie werklêers kies nie"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Jou IT-administrateur laat jou nie toe om van \'n persoonlike program af by werklêers in te gaan nie"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Kan nie persoonlike lêers kies nie"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 6c39b8e..27905d5 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"ሰነድን ማስቀመጥ አልተሳካም"</string>
     <string name="create_error" msgid="3092144450044861994">"አቃፊን መፍጠር አልተሳካም"</string>
     <string name="query_error" msgid="6625421453613879336">"አሁን ይዘትን መጫን አልተቻለም"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"የስራ መተግበሪያዎች ባሉበት ቆመዋል"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"የሥራ መተግበሪያዎችን አብራ"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"የሥራ መገለጫ ባለበት ቆሟል"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"አብራ"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"የሥራ ፋይሎችን መምረጥ አይቻልም"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"የእርስዎ አይቲ አስተዳዳሪ ከግል መተግበሪያ የሥራ ፋይሎችን እንዲደርሱ አይፈቅዱልዎትም"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"የግል ፋይሎችን መምረጥ አይቻልም"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 73fff3c..a411825 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"تعذّر حفظ المستند"</string>
     <string name="create_error" msgid="3092144450044861994">"تعذّر إنشاء المجلد"</string>
     <string name="query_error" msgid="6625421453613879336">"يتعذر تحميل المحتوى في الوقت الحالي"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"تطبيقات العمل متوقفة مؤقتًا"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"تفعيل تطبيقات العمل"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"تم إيقاف الملف الشخصي للعمل مؤقتًا"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"تفعيل"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"لا يمكن اختيار ملفات العمل"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"لا يسمح لك مشرف تكنولوجيا المعلومات بالوصول إلى ملفات العمل من تطبيق شخصي."</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"لا يمكن اختيار ملفات شخصية"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 0c0908b..6e4e8cf 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -30,7 +30,7 @@
     <string name="menu_grid" msgid="1453636521731880680">"গ্ৰিড হিচাপে চোৱাৰ সুবিধা"</string>
     <string name="menu_list" msgid="6714267452146410402">"সূচী অনুসৰি চোৱাৰ সুবিধা"</string>
     <string name="menu_search" msgid="1876699106790719849">"সন্ধান কৰক"</string>
-    <string name="menu_settings" msgid="6520844520117939047">"ষ্ট\'ৰেজৰ ছেটিং"</string>
+    <string name="menu_settings" msgid="6520844520117939047">"সঞ্চয়াগাৰৰ ছেটিংসমূহ"</string>
     <string name="menu_open" msgid="9092138100049759315">"খোলক"</string>
     <string name="menu_open_with" msgid="5507647065467520229">"ইয়াৰ জৰিয়তে খোলক"</string>
     <string name="menu_open_in_new_window" msgid="6686563636123311276">"নতুন ৱিণ্ড\'ত খোলক"</string>
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"নথি-পত্ৰ ছেভ কৰিব পৰা নগ\'ল"</string>
     <string name="create_error" msgid="3092144450044861994">"ফ\'ল্ডাৰ সৃষ্টি কৰিব পৰা নগ\'ল"</string>
     <string name="query_error" msgid="6625421453613879336">"এই মুহূৰ্তত সমল ল\'ড কৰিব নোৱাৰি"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"কৰ্মস্থানৰ এপ্‌সমূহ পজ কৰা আছে"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"কৰ্মস্থানৰ এপ্‌সমূহ অন কৰক"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"কৰ্মস্থানৰ প্ৰ\'ফাইলটো পজ কৰা আছে"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"অন কৰক"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"কৰ্মস্থানৰ ফাইলসমূহ বাছনি কৰিব নোৱাৰি"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"আপোনাৰ আইটি প্ৰশাসকে আপোনাক কোনো ব্যক্তিগত এপৰ পৰা কর্মস্থানৰ ফাইলসমূহলৈ এক্সেছ কৰিবলৈ অনুমতি নিদিয়ে"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"ব্যক্তিগত ফাইলসমূহ বাছনি কৰিব নোৱাৰি"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 440a310..c02a692 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Sənədi yadda saxlaya bilmədi"</string>
     <string name="create_error" msgid="3092144450044861994">"Qovluq yaradıla bilmədi"</string>
     <string name="query_error" msgid="6625421453613879336">"Məzmun hazırda yüklənmir"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"İş tətbiqləri durdurulub"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"İş tətbiqlərini aktiv edin"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"İş profilinə fasilə verilib"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Aktiv edin"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"İş faylları seçmək olmur"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"IT admininiz şəxsi tətbiqdən iş fayllarına giriş icazəsi vermir"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Şəxsi faylları seçmək olmur"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index d0c07ef..643e401 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Čuvanje dokumenta nije uspelo"</string>
     <string name="create_error" msgid="3092144450044861994">"Pravljenje foldera nije uspelo"</string>
     <string name="query_error" msgid="6625421453613879336">"Učitavanje sadržaja trenutno nije moguće"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Poslovne aplikacije su pauzirane"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Uključi poslovne aplikacije"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Poslovni profil je pauziran"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Uključi"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Ne možete da izaberete poslovne fajlove"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"IT administrator vam ne dozvoljava da pristupate datotekama za posao iz lične aplikacije"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Izbor ličnih datoteka nije uspeo"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 3443572..256e14c 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Не атрымалася захаваць дакумент"</string>
     <string name="create_error" msgid="3092144450044861994">"Не атрымалася стварыць папку"</string>
     <string name="query_error" msgid="6625421453613879336">"Зараз немагчыма загрузіць змесціва"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Працоўныя праграмы прыпынены"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Уключыць працоўныя праграмы"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Працоўны профіль прыпынены"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Уключыць"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Не ўдалося выбраць працоўныя файлы"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Ваш ІТ-адміністратар забараняе мець доступ да працоўных файлаў з асабістай праграмы"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Не ўдалося выбраць асабістыя файлы"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 8f9ae67..cf4f2fc 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Запазването на документа не бе успешно"</string>
     <string name="create_error" msgid="3092144450044861994">"Създаването на папката не бе успешно"</string>
     <string name="query_error" msgid="6625421453613879336">"Понастоящем съдържанието не може да се зареди"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Служебните приложения са поставени на пауза"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Включване на служебните приложения"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Служебният потребителски профил е поставен на пауза"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Включване"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Избирането на служебни файлове не е възможно"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Системният ви администратор не разрешава достъпа до служебните ви файлове от лично приложение"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Избирането на лични файлове не е възможно"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 9cb1344..23f33db 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"দস্তাবেজ সংরক্ষণ করা গেল না"</string>
     <string name="create_error" msgid="3092144450044861994">"ফোল্ডার তৈরি করা গেল না"</string>
     <string name="query_error" msgid="6625421453613879336">"এই মুহূর্তে কন্টেন্ট লোড করা যাবে না"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"অফিসের অ্যাপ পজ করা আছে"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"অফিসের অ্যাপ চালু করুন"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"অফিস প্রোফাইল বন্ধ করা আছে"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"চালু করুন"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"অফিসের ফাইল বেছে নেওয়া যাচ্ছে না"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"আপনার আইটি অ্যাডমিন আপনাকে ব্যক্তিগত অ্যাপ থেকে অফিসের ফাইল অ্যাক্সেস করতে দেয় না"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"ব্যক্তিগত ফাইল বেছে নেওয়া যাচ্ছে না"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 734f269..a15458b 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Dokument nije pohranjen"</string>
     <string name="create_error" msgid="3092144450044861994">"Folder nije kreiran"</string>
     <string name="query_error" msgid="6625421453613879336">"Trenutno nije moguće učitati sadržaj"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Poslovne aplikacije su pauzirane"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Uključi poslovne aplikacije"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Radni profil je pauziran"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Uključi"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Nije moguće odabrati poslovne fajlove"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"IT administrator vam ne dozvoljava da pristupate poslovnim fajlovima iz lične aplikacije"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Nije moguće odabrati lične fajlove"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 846bbdc..290c908 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"No s\'ha pogut desar el document"</string>
     <string name="create_error" msgid="3092144450044861994">"No s\'ha pogut crear la carpeta"</string>
     <string name="query_error" msgid="6625421453613879336">"En aquest moment no es pot carregar el contingut"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Les aplicacions de treball estan en pausa"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Activa les aplicacions de treball"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"El perfil de treball està en pausa"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Activa"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"No es poden seleccionar els fitxers de treball"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"L\'administrador de TI no et permet accedir als fitxers de treball des de l\'aplicació personal"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"No es poden seleccionar els fitxers personals"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 27aba7e..b48603c 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Uložení dokumentu se nezdařilo"</string>
     <string name="create_error" msgid="3092144450044861994">"Složku se nepodařilo vytvořit"</string>
     <string name="query_error" msgid="6625421453613879336">"Obsah teď nelze načíst"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Pracovní aplikace jsou pozastaveny"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Zapnout pracovní aplikace"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Pracovní profil je pozastaven"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Zapnout"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Pracovní soubory nelze vybrat"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Administrátor IT nepovoluje otevírat pracovní soubory pomocí osobní aplikace"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Osobní soubory nelze vybrat"</string>
diff --git a/res/values-da/inspector_strings.xml b/res/values-da/inspector_strings.xml
index 7738250..30cb4a5 100644
--- a/res/values-da/inspector_strings.xml
+++ b/res/values-da/inspector_strings.xml
@@ -43,5 +43,5 @@
     <string name="metadata_artist" msgid="8972421485694988540">"Kunstner"</string>
     <string name="metadata_composer" msgid="4696926808308256056">"Komponist"</string>
     <string name="metadata_album" msgid="1661699531214720236">"Album"</string>
-    <string name="metadata_address" msgid="1849921023707744640">"Lokation"</string>
+    <string name="metadata_address" msgid="1849921023707744640">"Placering"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c3de830..6e33dd8 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Dokumentet kunne ikke gemmes"</string>
     <string name="create_error" msgid="3092144450044861994">"Mappen kunne ikke oprettes"</string>
     <string name="query_error" msgid="6625421453613879336">"Der kan ikke indlæses indhold i øjeblikket"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Dine arbejdsapps er sat på pause"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Aktivér arbejdsapps"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Arbejdsprofilen er sat på pause"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Aktivér"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Arbejdsfiler kan ikke vælges"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Din it-administrator har ikke givet dig tilladelse til at åbne arbejdsfiler fra en personlig app"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Personlige filer kan ikke vælges"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 978822d..c54f373 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Dokument konnte nicht gespeichert werden"</string>
     <string name="create_error" msgid="3092144450044861994">"Ordner konnte nicht erstellt werden"</string>
     <string name="query_error" msgid="6625421453613879336">"Inhalte können momentan nicht geladen werden"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Geschäftliche Apps sind pausiert"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Geschäftliche Apps aktivieren"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Arbeitsprofil pausiert"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Aktivieren"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Auswahl geschäftlicher Dateien nicht möglich"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Dein IT-Administrator hat festgelegt, dass du geschäftliche Dateien nicht mit einer privaten App aufrufen darfst"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Auswahl persönlicher Dateien nicht möglich"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 328f976..105c41e 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Αποτυχία αποθήκευσης εγγράφου"</string>
     <string name="create_error" msgid="3092144450044861994">"Αποτυχία δημιουργίας φακέλου"</string>
     <string name="query_error" msgid="6625421453613879336">"Δεν είναι δυνατή η φόρτωση περιεχομένου τώρα"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Οι εφαρμογές εργασίας τέθηκαν σε παύση"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Ενεργοποίηση εφαρμογών εργασιών"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Το προφίλ εργασίας σας έχει τεθεί σε παύση."</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Ενεργοποίηση"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Δεν είναι δυνατή η επιλογή αρχείων εργασίας."</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Ο διαχειριστής δεν επιτρέπει την πρόσβαση σε αρχεία εργασίας από μια προσωπική εφαρμογή."</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Δεν είναι δυνατή η επιλογή προσωπικών αρχείων."</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index c05071b..d9e94f4 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Failed to save document"</string>
     <string name="create_error" msgid="3092144450044861994">"Failed to create folder"</string>
     <string name="query_error" msgid="6625421453613879336">"Can’t load content at the moment"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Work apps are paused"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Turn on work apps"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Work profile is paused"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Turn on"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Can’t select work files"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Your IT admin doesn’t allow you to access work files from a personal app"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Can’t select personal files"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index c05071b..d9e94f4 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Failed to save document"</string>
     <string name="create_error" msgid="3092144450044861994">"Failed to create folder"</string>
     <string name="query_error" msgid="6625421453613879336">"Can’t load content at the moment"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Work apps are paused"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Turn on work apps"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Work profile is paused"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Turn on"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Can’t select work files"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Your IT admin doesn’t allow you to access work files from a personal app"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Can’t select personal files"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c05071b..d9e94f4 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Failed to save document"</string>
     <string name="create_error" msgid="3092144450044861994">"Failed to create folder"</string>
     <string name="query_error" msgid="6625421453613879336">"Can’t load content at the moment"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Work apps are paused"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Turn on work apps"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Work profile is paused"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Turn on"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Can’t select work files"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Your IT admin doesn’t allow you to access work files from a personal app"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Can’t select personal files"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index c05071b..d9e94f4 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Failed to save document"</string>
     <string name="create_error" msgid="3092144450044861994">"Failed to create folder"</string>
     <string name="query_error" msgid="6625421453613879336">"Can’t load content at the moment"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Work apps are paused"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Turn on work apps"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Work profile is paused"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Turn on"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Can’t select work files"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Your IT admin doesn’t allow you to access work files from a personal app"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Can’t select personal files"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index f408932..5090b9a 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‎‎‏‏‎‎‏‎‎‏‎‎‏‎‎‎‎‏‏‎‏‎‎‏‏‎‎Failed to save document‎‏‎‎‏‎"</string>
     <string name="create_error" msgid="3092144450044861994">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‏‎‏‎‎‏‏‎‎‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‏‎‏‎‏‎‎Failed to create folder‎‏‎‎‏‎"</string>
     <string name="query_error" msgid="6625421453613879336">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎Can’t load content at the moment‎‏‎‎‏‎"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎Work apps are paused‎‏‎‎‏‎"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‏‎‏‏‏‎‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎Turn on work apps‎‏‎‎‏‎"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‏‎‎‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‎‎‎‏‎‏‏‎Work profile is paused‎‏‎‎‏‎"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎Turn on‎‏‎‎‏‎"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‎‏‏‎‎‎‎‎‎‎‏‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‏‎‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎Can’t select work files‎‏‎‎‏‎"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‎‎‎‏‏‎‎‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‎‎‏‎Your IT admin doesn’t allow you to access work files from a personal app‎‏‎‎‏‎"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‏‏‎‎‏‎‏‎‎‏‎‎‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎Can’t select personal files‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 71cd4c9..ce32f47 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Error al guardar el documento"</string>
     <string name="create_error" msgid="3092144450044861994">"Error al crear la carpeta"</string>
     <string name="query_error" msgid="6625421453613879336">"No se puede cargar el contenido en este momento"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Las apps de trabajo están detenidas"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Activa las apps de trabajo"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Se pausó el perfil de trabajo"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Activar"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"No se pueden seleccionar archivos de trabajo"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Tu administrador de TI no te permite acceder a archivos de trabajo desde una app personal."</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"No se pueden seleccionar archivos personales"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 0746f2b..c9f5092 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"No se ha podido guardar el documento"</string>
     <string name="create_error" msgid="3092144450044861994">"No se ha podido crear la carpeta"</string>
     <string name="query_error" msgid="6625421453613879336">"No se puede cargar contenido en este momento"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Las aplicaciones de trabajo están en pausa"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Activar aplicaciones de trabajo"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"El perfil de trabajo está en pausa"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Activar"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"No se pueden seleccionar archivos de trabajo"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Tu administrador de TI no te permite acceder a archivos de trabajo desde una aplicación personal"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"No se pueden seleccionar archivos personales"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index b90ceb7..85abd42 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Dokumendi salvestamine ebaõnnestus"</string>
     <string name="create_error" msgid="3092144450044861994">"Kausta loomine ebaõnnestus"</string>
     <string name="query_error" msgid="6625421453613879336">"Sisu ei saa praegu laadida"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Töörakendused on peatatud"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Lülita töörakendused sisse"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Tööprofiil on peatatud"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Lülita sisse"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Tööfaile ei saa valida"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Teie IT-administraator ei luba teil isikliku rakenduse kaudu tööfailidele juurde pääseda"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Isiklikke faile ei saa valida"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 868d143..c8c6f68 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Ezin izan da gorde dokumentua"</string>
     <string name="create_error" msgid="3092144450044861994">"Ezin izan da sortu karpeta"</string>
     <string name="query_error" msgid="6625421453613879336">"Une honetan ezin da kargatu edukia"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Pausatu egin dira laneko aplikazioak"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Aktibatu laneko aplikazioak"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Pausatu egin da laneko profila"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Aktibatu"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Ezin dira hautatu laneko fitxategiak"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"IKT saileko administratzaileak ez dizu ematen baimenik laneko fitxategiak aplikazio pertsonal batetik atzitzeko"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Ezin dira hautatu fitxategi pertsonalak"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 62bdc32..9bc82b0 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"سند ذخیره نشد"</string>
     <string name="create_error" msgid="3092144450044861994">"ایجاد پوشه انجام نشد"</string>
     <string name="query_error" msgid="6625421453613879336">"محتوا درحال حاضر بار نمی‌شود"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"برنامه‌های کاری موقتاً متوقف شده‌اند."</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"روشن کردن برنامه‌های کاری"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"نمایه کاری موقتاً متوقف شده است"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"روشن کردن"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"انتخاب فایل‌های کاری ممکن نیست"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"سرپرست فناوری اطلاعات اجازه نمی‌دهد از برنامه شخصی به فایل‌های کاری دسترسی پیدا کنید"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"انتخاب فایل‌های شخصی ممکن نیست"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index d7c8e3d..9903b55 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Dokumentin tallennus epäonnistui."</string>
     <string name="create_error" msgid="3092144450044861994">"Kansion luominen epäonnistui."</string>
     <string name="query_error" msgid="6625421453613879336">"Sisällön lataaminen epäonnistui."</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Työsovellukset on keskeytetty"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Laita työsovellukset päälle"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Työprofiilin käyttö on keskeytetty"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Laita päälle"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Työtiedostot eivät käytettävissä"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"IT-järjestelmänvalvoja ei salli sinulle pääsyä työtiedostoihin henkilökohtaisesta sovelluksesta"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Ei voi valita henkilökohtaisia tiedostoja"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index ec8b37a..f080d9c 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Échec de l\'enregistrement du document"</string>
     <string name="create_error" msgid="3092144450044861994">"Échec de la création du dossier"</string>
     <string name="query_error" msgid="6625421453613879336">"Impossible de charger le contenu pour le moment"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Les applications professionnelles sont interrompues"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Activer les applications professionnelles"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Le profil professionnel est interrompu"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Activer"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Impossible de sélectionner des fichiers professionnels"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Votre administrateur informatique ne vous autorise pas à accéder à des fichiers professionnels à partir d\'une application personnelle"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Impossible de sélectionner des fichiers personnels"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 035ee2d..926d34c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Échec de l\'enregistrement du document"</string>
     <string name="create_error" msgid="3092144450044861994">"Échec de la création du dossier"</string>
     <string name="query_error" msgid="6625421453613879336">"Impossible de charger le contenu pour le moment"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Applis professionnelles en veille"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Activer les applis professionnelles"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Profil professionnel en pause"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Activer"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Impossible de sélectionner des fichiers professionnels"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Votre administrateur informatique ne vous autorise pas à accéder à des fichiers professionnels depuis une application personnelle"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Impossible de sélectionner des fichiers personnels"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index ac53e2f..a852abe 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Non se puido gardar o documento"</string>
     <string name="create_error" msgid="3092144450044861994">"Non se puido crear o cartafol"</string>
     <string name="query_error" msgid="6625421453613879336">"Non se pode cargar o contido neste momento"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Puxéronse en pausa as aplicacións do traballo"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Activar aplicacións do traballo"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"O perfil de traballo está en pausa"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Activar"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Non se puideron seleccionar os ficheiros de traballo"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"O teu administrador de TI non permite acceder aos ficheiros do traballo desde unha aplicación persoal"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Non se puideron seleccionar os ficheiros persoais"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index b070027..653c982 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"દસ્તાવેજ સાચવવામાં નિષ્ફળ થયાં"</string>
     <string name="create_error" msgid="3092144450044861994">"ફોલ્ડર બનાવવામાં નિષ્ફળ થયાં"</string>
     <string name="query_error" msgid="6625421453613879336">"આ પળે સામગ્રી લોડ કરી શકતાં નથી"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"ઑફિસ માટેની ઍપ થોભાવવામાં આવી છે"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"ઑફિસ માટેની ઍપ ચાલુ કરો"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"ઑફિસની પ્રોફાઇલ થોભાવી છે"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"ચાલુ કરો"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"ઑફિસની ફાઇલોને પસંદ કરી શકતા નથી"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"તમારા IT વ્યવસ્થાપક તમને વ્યક્તિગત ઍપ પરથી ઑફિસની ફાઇલોને ઍક્સેસ કરવાની મંજૂરી આપતા નથી"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"વ્યક્તિગત ફાઇલોને પસંદ કરી શકતા નથી"</string>
diff --git a/res/values-h600dp-v31/dimens.xml b/res/values-h600dp-v31/dimens.xml
deleted file mode 100644
index 6da5291..0000000
--- a/res/values-h600dp-v31/dimens.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2020 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<resources>
-    <dimen name="item_doc_inflated_message_padding_top">30dp</dimen>
-</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index dde3393..0d0feb7 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"दस्तावेज़ सहेजने में विफल रहा"</string>
     <string name="create_error" msgid="3092144450044861994">"फ़ोल्डर बनाने में विफल रहा"</string>
     <string name="query_error" msgid="6625421453613879336">"इस समय सामग्री लोड नहीं की जा सकती"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन रोक दिए गए हैं"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन चालू करें"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"वर्क प्रोफ़ाइल रोक दी गई है"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"चालू करें"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"दफ़्तर की फ़ाइलें नहीं चुनी जा सकतीं"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"आपका आईटी एडमिन आपको किसी निजी ऐप्लिकेशन से दफ़्तर की फ़ाइलें ऐक्सेस करने की मंज़ूरी नहीं देता"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"निजी फ़ाइलें नहीं चुनी जा सकतीं"</string>
@@ -218,7 +218,7 @@
     <string name="delete_filename_confirmation_message" msgid="8338069763240613258">"\"<xliff:g id="NAME">%1$s</xliff:g>\" को हटाना चाहते हैं?"</string>
     <string name="delete_foldername_confirmation_message" msgid="9084085260877704140">"फ़ोल्डर \"<xliff:g id="NAME">%1$s</xliff:g>\" और उसकी सामग्रियों को हटाना चाहते हैं?"</string>
     <plurals name="delete_files_confirmation_message" formatted="false" msgid="4866664063250034142">
-      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइल मिटाएं?</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलें मिटाएं?</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलें मिटाएं?</item>
     </plurals>
     <plurals name="delete_folders_confirmation_message" formatted="false" msgid="1028946402799686388">
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 3837d64..95476a1 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Nije uspjelo spremanje dokumenta"</string>
     <string name="create_error" msgid="3092144450044861994">"Izrada mape nije uspjela"</string>
     <string name="query_error" msgid="6625421453613879336">"Sadržaj se trenutačno ne može učitati"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Poslovne aplikacije su pauzirane"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Uključi poslovne aplikacije"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Poslovni profil je pauziran"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Uključi"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Nije moguće odabrati poslovne datoteke"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Vaš IT administrator ne dopušta vam pristupanje poslovnim datotekama iz osobne aplikacije"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Nije moguće odabrati osobne datoteke"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 21b3a6c..7f8676d 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Nem sikerült menteni a dokumentumot"</string>
     <string name="create_error" msgid="3092144450044861994">"Nem sikerült létrehozni a mappát"</string>
     <string name="query_error" msgid="6625421453613879336">"Jelenleg nem lehet tartalmat betölteni"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"A munkahelyi alkalmazások szüneteltetve vannak"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Munkahelyi alkalmazások bekapcsolása"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"A munkaprofil használata szünetel"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Bekapcsolás"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Nem választhatók ki munkafájlok"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Rendszergazdája nem engedélyezi, hogy munkafájlokhoz férjen hozzá személyes alkalmazásból"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Nem választhatók ki személyes fájlok"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 5039127..9e9b42e 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Չհաջողվեց պահել փաստաթուղթը"</string>
     <string name="create_error" msgid="3092144450044861994">"Չհաջողվեց ստեղծել պանակը"</string>
     <string name="query_error" msgid="6625421453613879336">"Այս պահին հնարավոր չէ բեռնել բովանդակությունը"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Աշխատանքային հավելվածները դադարեցված են"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Միացնել աշխատանքային հավելվածները"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Աշխատանքային պրոֆիլը դադարեցված է"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Միացնել"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Հնարավոր չէ աշխատանքային ֆայլեր ընտրել"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Ձեր ՏՏ ադմինիստրատորը չի թույլատրում աշխատանքային ֆայլերի օգտագործումը անձնական հավելվածներից"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Հնարավոր չէ անձնական ֆայլեր ընտրել"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index b149b2a..d08fc73 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Gagal menyimpan dokumen"</string>
     <string name="create_error" msgid="3092144450044861994">"Gagal membuat folder"</string>
     <string name="query_error" msgid="6625421453613879336">"Tidak dapat memuat konten saat ini"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Aplikasi kerja dijeda"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Aktifkan aplikasi kerja"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Profil kerja dijeda"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Aktifkan"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Tidak dapat memilih file kerja"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Admin IT tidak mengizinkan Anda mengakses file kerja dari aplikasi pribadi"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Tidak dapat memilih file pribadi"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 6498186..f8b8ed9 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Ekki tókst að vista skjalið"</string>
     <string name="create_error" msgid="3092144450044861994">"Ekki tókst að búa til möppu"</string>
     <string name="query_error" msgid="6625421453613879336">"Ekki hægt að hlaða efni í augnablikinu"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Hlé gert á vinnuforritum"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Kveikja á vinnuforritum"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Hlé gert á vinnusniði"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Kveikja"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Ekki er hægt að velja vinnuskrár"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Kerfisstjórinn þinn leyfir þér ekki að opna vinnuskrár í forritum til einkanota"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Ekki er hægt að velja einkaskrár"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 9934519..592a37a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Impossibile salvare il documento."</string>
     <string name="create_error" msgid="3092144450044861994">"Impossibile creare la cartella."</string>
     <string name="query_error" msgid="6625421453613879336">"Impossibile caricare i contenuti al momento."</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Le app di lavoro sono in pausa"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Attiva app di lavoro"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Profilo di lavoro in pausa"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Attiva"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Impossibile selezionare file di lavoro"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"L\'amministratore IT non consente l\'accesso ai file di lavoro da un\'app personale"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Impossibile selezionare file personali"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index afb473b..29e8922 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"לא ניתן לשמור את המסמך"</string>
     <string name="create_error" msgid="3092144450044861994">"לא ניתן היה ליצור את התיקייה"</string>
     <string name="query_error" msgid="6625421453613879336">"לא ניתן כרגע לטעון תוכן"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"האפליקציות לעבודה מושהות"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"הפעלה של אפליקציות לעבודה"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"פרופיל העבודה מושהה"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"הפעלה"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"לא ניתן לבחור קובצי עבודה"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"‏מנהל ה-IT לא מאפשר לגשת לקובצי עבודה מאפליקציה לשימוש אישי"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"לא ניתן לבחור קבצים אישיים"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index f61bbb8..7abf91f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"ドキュメントを保存できませんでした"</string>
     <string name="create_error" msgid="3092144450044861994">"フォルダを作成できませんでした"</string>
     <string name="query_error" msgid="6625421453613879336">"現在、コンテンツを読み込むことができません"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"仕事用アプリは一時停止されています"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"仕事用アプリをオンにする"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"仕事用プロファイルが一時停止しています"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"ON にする"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"仕事用ファイルは選択できません"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"IT 管理者は、個人用アプリから仕事用ファイルにアクセスすることを許可していません"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"個人用ファイルは選択できません"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index b4a85f4..5b67b55 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"დოკუმენტის შენახვა ვერ მოხერხდა"</string>
     <string name="create_error" msgid="3092144450044861994">"საქაღალდის შექმნა ვერ მოხერხდა"</string>
     <string name="query_error" msgid="6625421453613879336">"კონტენტის ჩატვირთვა ამჟამად ვერ ხერხდება"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"სამსახურის აპები დაპაუზებულია"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"სამსახურის აპების ჩართვა"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"სამსახურის პროფილი დაპაუზებულია"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"ჩართვა"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"სამსახურის ფაილების არჩევა ვერ მოხერხდება"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"თქვენი IT ადმინისტრატორი გიკრძალავთ სამსახურის ფაილებზე პერსონალური აპით წვდომას"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"პერსონალური ფაილების არჩევა ვერ მოხერხდება"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 8189202..b97968c 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Құжат сақталмады"</string>
     <string name="create_error" msgid="3092144450044861994">"Қалта жасалмады"</string>
     <string name="query_error" msgid="6625421453613879336">"Мазмұн қазір жүктелмейді"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Жұмыс қолданбалары кідіртілді"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Жұмыс қолданбаларын қосу"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Жұмыс профилі кідіртілді"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Қосу"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Жұмыс файлдарын таңдау мүмкін емес"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Әкімші жұмыс файлдарына жеке қолданбадан кіруге рұқсат етпейді."</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Жеке файлдарды сақтау мүмкін емес"</string>
@@ -232,7 +232,7 @@
     <string name="images_shortcut_label" msgid="2545168016070493574">"Кескіндер"</string>
     <string name="archive_loading_failed" msgid="7243436722828766996">"Мұрағат жүктелмеді. Файл бүлінген немесе форматына қолдау көрсетілмейді."</string>
     <string name="name_conflict" msgid="28407269328862986">"Мұндай атаулы файл бұрыннан бар."</string>
-    <string name="authentication_required" msgid="8030880723643436099">"Бұл каталогті көру үшін <xliff:g id="NAME">%1$s</xliff:g> аккаунтына кіріңіз"</string>
+    <string name="authentication_required" msgid="8030880723643436099">"Бұл каталогті көру үшін <xliff:g id="NAME">%1$s</xliff:g> есептік жазбасына кіріңіз"</string>
     <string name="cant_display_content" msgid="8633226333229417237">"Мазмұны көрсетілмейді"</string>
     <string name="sign_in" msgid="6253762676723505592">"Жүйеге кіру"</string>
     <string name="new_archive_file_name" msgid="1604650338077249838">"archive<xliff:g id="EXTENSION">%s</xliff:g>"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index c190cee..d842441 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"បានបរាជ័យក្នុងការរក្សាទុកឯកសារ"</string>
     <string name="create_error" msgid="3092144450044861994">"បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត​ថត"</string>
     <string name="query_error" msgid="6625421453613879336">"មិនអាចដំណើរការមាតិកាបានទេនៅពេលនេះ"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"កម្មវិធី​ការងារ​ត្រូវបានផ្អាក"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"បើក​កម្មវិធី​ការងារ"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"កម្រងព័ត៌មាន​ការងារ​ត្រូវបាន​ផ្អាក"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"បើក"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"មិនអាច​ជ្រើសរើស​ឯកសារ​ការងារ​បានទេ"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"អ្នកគ្រប់គ្រង​ផ្នែក​ព័ត៌មានវិទ្យា​របស់អ្នក​មិនអនុញ្ញាត​ឱ្យអ្នក​ចូលប្រើ​ឯកសារ​ការងារ​ពីកម្មវិធី​ផ្ទាល់ខ្លួនទេ"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"មិនអាច​ជ្រើសរើស​ឯកសារ​ផ្ទាល់ខ្លួន​បានទេ"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 2e12c06..e1bbea8 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"ಡಾಕ್ಯುಮೆಂಟ್ ಉಳಿಸಲು ವಿಫಲವಾಗಿದೆ"</string>
     <string name="create_error" msgid="3092144450044861994">"ಫೋಲ್ಡರ್ ರಚಿಸಲು ವಿಫಲವಾಗಿದೆ"</string>
     <string name="query_error" msgid="6625421453613879336">"ಈ ಕ್ಷಣದಲ್ಲಿ ವಿಷಯವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ವಿರಾಮಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಆನ್ ಮಾಡಿ"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್‌ ಅನ್ನು ವಿರಾಮಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"ಆನ್ ಮಾಡಿ"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"ಉದ್ಯೋಗದ ಫೈಲ್‌ಗಳನ್ನು ಆಯ್ಕೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"ವೈಯಕ್ತಿಕ ಆ್ಯಪ್ ಒಂದರಿಂದ ಉದ್ಯೋಗದ ಫೈಲ್‌ಗಳನ್ನು ಪ್ರವೇಶಿಸಲು ನಿಮ್ಮ ಐಟಿ ನಿರ್ವಾಹಕರು ನಿಮಗೆ ಅನುಮತಿಸುವುದಿಲ್ಲ"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"ವೈಯಕ್ತಿಕ ಫೈಲ್‌ಗಳನ್ನು ಆಯ್ಕೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index ae44b2d..e0166c6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"문서를 저장하지 못했습니다."</string>
     <string name="create_error" msgid="3092144450044861994">"폴더를 만들지 못했습니다."</string>
     <string name="query_error" msgid="6625421453613879336">"현재 콘텐츠를 로드할 수 없습니다."</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"직장 앱이 일시중지됨"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"직장 앱 사용 설정"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"직장 프로필이 일시중지됨"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"사용 설정"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"직장 파일을 선택할 수 없음"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"IT 관리자가 개인 앱에서 직장 파일에 액세스하도록 허용하지 않습니다."</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"개인 파일을 선택할 수 없음"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 2e01d47..c5ab511 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Документтер сакталбай калды"</string>
     <string name="create_error" msgid="3092144450044861994">"Папка түзүлбөй калды"</string>
     <string name="query_error" msgid="6625421453613879336">"Учурда мазмун жүктөлбөй жатат"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Жумуш колдонмолору тындырылды"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Жумуш колдонмолорун күйгүзүү"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Жумуш профили тындырылган"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Күйгүзүү"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Жумуш файлдарын тандоого болбойт"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"IT администраторуңуз жумуш файлдарына жеке колдонмодон кирүүгө тыюу салды"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Жеке файлдарды тандоого болбойт"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 75f35dc..5b9ce87 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"ການບັນທຶກເອກະສານບໍ່ສຳເລັດ"</string>
     <string name="create_error" msgid="3092144450044861994">"ສ້າງໂຟນເດີບໍ່ສຳເລັດ"</string>
     <string name="query_error" msgid="6625421453613879336">"ບໍ່ສາມາດໂຫຼດເນື້ອຫາໄດ້ໃນຂະນະນີ້"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"ຢຸດແອັບບ່ອນເຮັດວຽກຊົ່ວຄາວແລ້ວ"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"ເປີດໃຊ້ແອັບບ່ອນເຮັດວຽກ"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"ຢຸດໂປຣໄຟລ໌ວຽກໄວ້ຊົ່ວຄາວແລ້ວ"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"ເປີດໃຊ້"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"ບໍ່ສາມາດເລືອກໄຟລ໌ວຽກໄດ້"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"ຜູ້ເບິ່ງແຍງໄອທີຂອງທ່ານບໍ່ອະນຸຍາດໃຫ້ເຂົ້າເຖິງໄຟລ໌ວຽກຈາກແອັບສ່ວນຕົວໄດ້"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"ບໍ່ສາມາດເລືອກໄຟລ໌ສ່ວນຕົວໄດ້"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index e21563f..17554c2 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Nepavyko išsaugoti dokumento"</string>
     <string name="create_error" msgid="3092144450044861994">"Nepavyko sukurti aplanko"</string>
     <string name="query_error" msgid="6625421453613879336">"Šiuo metu nepavyksta įkelti turinio"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Darbo programos pristabdytos"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Įjungti darbo programas"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Darbo profilis pristabdytas"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Įjungti"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Negalima pasirinkti darbo failų"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"IT administratorius neleidžia pasiekti darbo failų iš asmeninės programos"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Negalima pasirinkti asmeninių failų"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index c410d68..03fcd89 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Neizdevās saglabāt dokumentu."</string>
     <string name="create_error" msgid="3092144450044861994">"Neizdevās izveidot mapi."</string>
     <string name="query_error" msgid="6625421453613879336">"Pašlaik nevar ielādēt saturu."</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Darba lietotnes ir apturētas"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Ieslēgt darba lietotnes"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Darba profila darbība ir apturēta."</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Ieslēgt"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Nevar atlasīt darba failus"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Jūsu IT administrators neatļauj piekļūt darba failiem no personīgās lietotnes"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Nevar atlasīt personīgos failus"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index a23704c..b10dd11 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Документот не успеа да се зачува"</string>
     <string name="create_error" msgid="3092144450044861994">"Папката не успеа да се создаде"</string>
     <string name="query_error" msgid="6625421453613879336">"Во моментов не може да се вчита содржината."</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Работните апликации се паузирани"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Вклучете ги работните апликации"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Работниот профил е паузиран"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Вклучи"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Не може да се изберат работни датотеки"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"IT-администраторот не ви дозволува да пристапувате до работни датотеки од лична апликација"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Не може да се изберат лични датотеки"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 4f9ec99..2bf05b6 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"പ്രമാണം സംരക്ഷിക്കുന്നതിൽ പരാജയപ്പെട്ടു"</string>
     <string name="create_error" msgid="3092144450044861994">"ഫോൾഡർ സൃഷ്‌ടിക്കുന്നതിൽ പരാജയപ്പെട്ടു"</string>
     <string name="query_error" msgid="6625421453613879336">"ഇപ്പോൾ ഉള്ളടക്കം ലോഡുചെയ്യാൻ കഴിയില്ല"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"ഔദ്യോഗിക ആപ്പുകൾ തൽക്കാലം നിർത്തിയിരിക്കുന്നു"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"ഔദ്യോഗിക ആപ്പുകൾ ഓണാക്കുക"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"ഔദ്യോഗിക പ്രൊഫൈൽ തൽക്കാലം നിർത്തിയിരിക്കുന്നു"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"ഓണാക്കുക"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"ഔദ്യോഗിക ഫയലുകൾ തിരഞ്ഞെടുക്കാനാവില്ല"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"വ്യക്തിപരമായ ആപ്പിൽ നിന്ന് ഔദ്യോഗിക ഫയലുകൾ ആക്സസ് ചെയ്യാൻ നിങ്ങളുടെ ഐടി അഡ്മിൻ അനുവദിക്കുന്നില്ല"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"വ്യക്തിപര ഫയലുകൾ തിരഞ്ഞെടുക്കാനാവില്ല"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index f86cbfd..4526f06 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Документыг хадгалж чадсангүй"</string>
     <string name="create_error" msgid="3092144450044861994">"Фолдер үүсгэж чадсангүй"</string>
     <string name="query_error" msgid="6625421453613879336">"Агуулгыг ачаалах боломжгүй байна"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Ажлын аппуудыг түр зогсоосон"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Ажлын аппуудыг асаах"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Ажлын профайлыг түр зогсоосон"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Асаах"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Ажлын файлуудыг сонгох боломжгүй байна"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Таны мэдээлэл технологийн админ танд хувийн аппаас ажлын файлуудад хандахыг зөвшөөрөөгүй байна"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Хувийн файлуудыг сонгох боломжгүй байна"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index deca6dc..420b5b4 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"दस्तऐवज सेव्ह करणे अयशस्वी झाले"</string>
     <string name="create_error" msgid="3092144450044861994">"फोल्डर तयार करण्यात अयशस्वी झाले"</string>
     <string name="query_error" msgid="6625421453613879336">"याक्षणी आशय लोड करू शकत नाही"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"कामाशी संबंधित अ‍ॅप्स थांबवली आहेत"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"कामाशी संबंधित अ‍ॅप्स सुरू करा"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"कार्य प्रोफाइल थांबवली आहे"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"सुरू करा"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"कामासंबंधित फाइल निवडता आल्या नाहीत"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"तुमचा आयटी ॲडमिन तुम्हाला वैयक्तिक ॲपवरून कामासंबंधित फाइल अ‍ॅक्सेस करण्याची परवानगी देत नाही"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"वैयक्तिक फाइल निवडता आल्या नाहीत"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 3e7c0b0..555af2b 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Gagal menyimpan dokumen"</string>
     <string name="create_error" msgid="3092144450044861994">"Gagal membuat folder"</string>
     <string name="query_error" msgid="6625421453613879336">"Tidak dapat memuatkan kandungan pada masa ini"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Apl kerja dijeda"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Hidupkan apl kerja"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Profil kerja dijeda"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Hidupkan"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Tidak boleh memilih fail kerja"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Pentadbir IT anda tidak membenarkan anda mengakses fail kerja daripada apl peribadi"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Tidak boleh memilih fail peribadi"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 821157a..6863c48 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"စာဖိုင်ကို သိမ်း၍မရခဲ့ပါ"</string>
     <string name="create_error" msgid="3092144450044861994">"ဖိုင်တွဲကို ဖန်တီး၍ မရခဲ့ပါ"</string>
     <string name="query_error" msgid="6625421453613879336">"ဖိုင်ကို လောလောဆယ် တင်ပေး၍မရသေးပါ"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"အလုပ်သုံးအက်ပ်များကို ခေတ္တရပ်ထားသည်"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"အလုပ်သုံးအက်ပ်များ ဖွင့်ရန်"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"အလုပ်ပရိုဖိုင် ခဏရပ်ထားသည်"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"ဖွင့်ရန်"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"အလုပ်ဖိုင်များကို ရွေး၍မရပါ"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"ကိုယ်ပိုင်အက်ပ်မှနေ၍ အလုပ်ဖိုင်များ သုံးရန် သင်၏ IT စီမံခန့်ခွဲသူက ခွင့်မပြုပါ"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"ကိုယ်ပိုင်ဖိုင်များကို ရွေး၍မရပါ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a46d8f4..9b300e3 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Kunne ikke lagre dokumentet"</string>
     <string name="create_error" msgid="3092144450044861994">"Kunne ikke opprette mappen"</string>
     <string name="query_error" msgid="6625421453613879336">"Kan ikke laste inn innholdet for øyeblikket"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Jobbapper er satt på pause"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Slå på jobbapper"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Jobbprofilen er satt på pause"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Slå på"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Du kan ikke velge jobbfiler"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"IT-administratoren din tillater ikke at du får tilgang til jobbfiler fra personlige apper"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Du kan ikke velge personlige filer"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index e9f5fe2..b6c38a3 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"कागजातलाई सुरक्षित गर्न सकिएन"</string>
     <string name="create_error" msgid="3092144450044861994">"फोल्डर सिर्जना गर्न सकिएन"</string>
     <string name="query_error" msgid="6625421453613879336">"यस समय सामग्री लोड गर्न सकिँदैन"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"कामसम्बन्धी एपहरू पज गरिएका छन्"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"कामसम्बन्धी एपहरू अन गर्नुहोस्"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"कार्यलयको प्रोफाइल पज गरिएको छ"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"सक्रिय गरियोस्"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"कार्यालयका फाइलहरू चयन गर्न मिल्दैन"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"तपाईंका IT एडमिनले तपाईंलाई व्यक्तिगत अनुप्रयोगमार्फत कार्यालयका फाइलहरू प्रयोग गर्ने अनुमति दिनुभएको छैन"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"व्यक्तिगत फाइलहरू चयन गर्न सकिएन"</string>
diff --git a/res/values-night-v31/colors.xml b/res/values-night-v31/colors.xml
deleted file mode 100644
index c5e4f6d..0000000
--- a/res/values-night-v31/colors.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-  <color name="tab_selected_text_color">@android:color/black</color>
-  <color name="work_profile_button_stroke_color">
-    @*android:color/system_accent1_200
-  </color> <!-- accent 200 -->
-  <color name="empty_state_text_color">@*android:color/system_neutral1_100
-  </color>
-  <!-- neutral 100 -->
-  <color name="empty_state_message_text_color">
-    @*android:color/system_neutral2_200
-  </color>
-  <!-- neutral variant 200 -->
-  <color name="tab_unselected_text_color">@*android:color/system_neutral2_200
-  </color>
-  <!-- neutral variant 200 -->
-  <color name="profile_tab_default_color">@*android:color/system_neutral1_800
-  </color>
-  <!-- neutral 800 -->
-  <color name="profile_tab_selected_color">@*android:color/system_neutral2_100
-  </color>
-  <!-- neutral variant 100 -->
-  <color name="fragment_pick_inactive_button_color">
-    @*android:color/system_neutral1_800
-  </color>
-  <!-- neutral 100 -->
-  <color name="fragment_pick_inactive_text_color">
-    @*android:color/system_neutral1_600
-  </color>
-  <!-- neutral 600 -->
-  <color name="fragment_pick_active_button_color">
-    @*android:color/system_neutral2_100
-  </color>
-  <!-- neutral variant 100 -->
-  <color name="fragment_pick_active_text_color">@android:color/black</color>
-</resources>
diff --git a/res/values-night-v31/styles.xml b/res/values-night-v31/styles.xml
deleted file mode 100644
index 0cbb57b..0000000
--- a/res/values-night-v31/styles.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2021 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources>
-    <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
-        <item name="colorControlNormal">?android:textColorSecondary</item>
-        <item name="android:actionMenuTextColor">@*android:color/accent_device_default_dark</item>
-        <item name="android:textAllCaps">false</item>
-    </style>
-
-    <style name="TabTextAppearance" parent="@android:style/TextAppearance.Material.Medium">
-        <item name="android:textSize">14sp</item>
-        <item name="fontFamily">@string/config_fontFamilyMedium</item>
-        <item name="android:textColor">?android:attr/colorAccent</item>
-    </style>
-
-    <style name="EmptyStateButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
-        <item name="android:backgroundTint">@android:color/transparent</item>
-        <item name="android:textColor">@*android:color/system_neutral1_100</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="android:textAppearance">@style/EmptyStateButtonTextAppearance</item>
-    </style>
-</resources>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 143b3e6..169f52f 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -22,7 +22,7 @@
     <color name="secondary">#3D8AB4F8</color>
     <color name="hairline">#5F6368</color>
 
-    <color name="empty_state_text_color">@android:color/white</color>
+    <color name="empty_state_text">@android:color/white</color>
     <color name="error_image_color">@android:color/white</color>
 
     <color name="edge_effect">@android:color/white</color>
@@ -33,6 +33,4 @@
 
     <color name="list_divider_color">#9aa0a6</color>
     <color name="list_item_selected_background_color">?android:colorSecondary</color>
-
-    <color name="fragment_pick_active_text_color">#202124</color> <!-- Grey 900 -->
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 823bac4..3edc765 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Kan document niet opslaan"</string>
     <string name="create_error" msgid="3092144450044861994">"Kan map niet maken"</string>
     <string name="query_error" msgid="6625421453613879336">"Kan content momenteel niet laden"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Werk-apps zijn onderbroken"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Werk-apps aanzetten"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Werkprofiel is onderbroken"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Aanzetten"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Kan geen werkbestanden selecteren"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Je IT-beheerder staat niet toe dat je werkbestanden opent met een app die je voor persoonlijke doeleinden gebruikt"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Kan geen persoonlijke bestanden selecteren"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index c6dae26..c1150df 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"ଡକୁମେଣ୍ଟକୁ ସେଭ୍‍ କରିପାରିଲା ନାହିଁ"</string>
     <string name="create_error" msgid="3092144450044861994">"ଫୋଲ୍ଡର୍‍ ତିଆରି କରିହେଲା ନାହିଁ"</string>
     <string name="query_error" msgid="6625421453613879336">"ଏହି ସମୟରେ କଣ୍ଟେଣ୍ଟ ଲୋଡ୍‍ କରିପାରିବ ନାହିଁ"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"ୱାର୍କ ଆପଗୁଡ଼ିକୁ ବିରତ କରାଯାଇଛି"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"ୱାର୍କ ଆପଗୁଡ଼ିକୁ ଚାଲୁ କରନ୍ତୁ"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"ୱାର୍କ ପ୍ରୋଫାଇଲ୍ ବିରତ କରାଯାଇଛି"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"ଚାଲୁ କରନ୍ତୁ"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"ୱାର୍କ ଫାଇଲଗୁଡ଼ିକ ଚୟନ କରାଯାଇପାରିବ ନାହିଁ"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"ଆପଣଙ୍କ IT ଆଡମିନ୍ ଆପଣଙ୍କୁ ଏକ ବ୍ୟକ୍ତିଗତ ଆପରୁ ୱାର୍କ ଫାଇଲଗୁଡ଼ିକ ଆକ୍ସେସ୍ କରିବାକୁ ଅନୁମତି ଦିଅନ୍ତି ନାହିଁ"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"ବ୍ୟକ୍ତିଗତ ଫାଇଲଗୁଡ଼ିକ ଚୟନ କରାଯାଇପାରିବ ନାହିଁ"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index aa7e2ee..b54b096 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"ਦਸਾਤਵੇਜ਼ ਰੱਖਿਅਤ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ"</string>
     <string name="create_error" msgid="3092144450044861994">"ਫੋਲਡਰ ਬਣਾਉਣਾ ਅਸਫਲ ਰਿਹਾ"</string>
     <string name="query_error" msgid="6625421453613879336">"ਇਸ ਵੇਲੇ ਸਮੱਗਰੀ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਨੂੰ ਰੋਕਿਆ ਗਿਆ ਹੈ"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਰੋਕਿਆ ਗਿਆ ਹੈ"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"ਚਾਲੂ ਕਰੋ"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"ਕਾਰਜ ਸੰਬੰਧੀ ਫ਼ਾਈਲਾਂ ਨੂੰ ਨਹੀਂ ਚੁਣਿਆ ਜਾ ਸਕਦਾ"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"ਤੁਹਾਡਾ ਆਈ.ਟੀ. ਪ੍ਰਸ਼ਾਸਕ ਤੁਹਾਨੂੰ ਨਿੱਜੀ ਐਪ ਤੋਂ ਕਾਰਜ ਸੰਬੰਧੀ ਫ਼ਾਈਲਾਂ ਤੱਕ ਪਹੁੰਚ ਨਹੀਂ ਕਰਨ ਦਿੰਦਾ"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"ਨਿੱਜੀ ਫ਼ਾਈਲਾਂ ਨੂੰ ਨਹੀਂ ਚੁਣਿਆ ਜਾ ਸਕਦਾ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 5684295..f4bb256 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Nie udało się zapisać dokumentu"</string>
     <string name="create_error" msgid="3092144450044861994">"Nie udało się utworzyć folderu"</string>
     <string name="query_error" msgid="6625421453613879336">"Teraz nie można załadować zawartości"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Aplikacje służbowe zostały wstrzymane"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Włącz aplikacje służbowe"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Wstrzymano profil służbowy"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Włącz"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Nie można wybrać plików służbowych"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Administrator IT nie pozwala na dostęp do plików służbowych w aplikacjach osobistych"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Nie można wybrać plików osobistych"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 149e6b0..d213091 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Falha ao salvar o documento"</string>
     <string name="create_error" msgid="3092144450044861994">"Falha ao criar pasta"</string>
     <string name="query_error" msgid="6625421453613879336">"Não é possível carregar o conteúdo no momento"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Os apps de trabalho foram pausados"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Ativar apps de trabalho"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"O perfil de trabalho está pausado"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Ativar"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Não é possível selecionar arquivos de trabalho"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Seu administrador de TI não permite que você acesse arquivos de trabalho em um app pessoal"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Não foi possível selecionar arquivos pessoais"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 13eece1..a403d3b 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Falha ao guardar o documento"</string>
     <string name="create_error" msgid="3092144450044861994">"Falha ao criar a pasta"</string>
     <string name="query_error" msgid="6625421453613879336">"Não é possível carregar o conteúdo neste momento"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"As apps de trabalho estão em pausa"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Ativar apps de trabalho"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Perfil de trabalho em pausa"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Ativar"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Não é possível selecionar ficheiros de trabalho."</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"O seu administrador de TI não lhe permite aceder a ficheiros de trabalho a partir de uma app pessoal."</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Não é possível selecionar ficheiros pessoais."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 149e6b0..d213091 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Falha ao salvar o documento"</string>
     <string name="create_error" msgid="3092144450044861994">"Falha ao criar pasta"</string>
     <string name="query_error" msgid="6625421453613879336">"Não é possível carregar o conteúdo no momento"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Os apps de trabalho foram pausados"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Ativar apps de trabalho"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"O perfil de trabalho está pausado"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Ativar"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Não é possível selecionar arquivos de trabalho"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Seu administrador de TI não permite que você acesse arquivos de trabalho em um app pessoal"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Não foi possível selecionar arquivos pessoais"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index c5f447f..681f3d5 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Salvarea documentului nu a reușit"</string>
     <string name="create_error" msgid="3092144450044861994">"Eroare la crearea dosarului"</string>
     <string name="query_error" msgid="6625421453613879336">"Momentan, conținutul nu poate fi încărcat"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Aplicațiile pentru lucru sunt întrerupte"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Activați aplicațiile pentru lucru"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Profilul de serviciu este întrerupt"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Activați"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Nu se pot selecta fișiere de lucru"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Administratorul IT nu vă permite să accesați fișiere de lucru dintr-o aplicație personală"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Nu se pot selecta fișiere personale"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5329c0a..09958d5 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Не удалось сохранить документ"</string>
     <string name="create_error" msgid="3092144450044861994">"Не удалось создать папку"</string>
     <string name="query_error" msgid="6625421453613879336">"Не удалось загрузить контент"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Рабочие приложения приостановлены"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Включить рабочие приложения"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Действие рабочего профиля приостановлено."</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Включить"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Невозможно выбрать рабочие файлы"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Системный администратор запретил доступ к рабочим файлам из личных приложений."</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Невозможно выбрать личные файлы"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 5652758..6bf320f 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"ලේඛනය සුරැකීම අසාර්ථක විය"</string>
     <string name="create_error" msgid="3092144450044861994">"ෆෝල්ඩරය සැදීම අසාර්ථක විය"</string>
     <string name="query_error" msgid="6625421453613879336">"මේ මොහොතේ අන්තර්ගතය පූරණය කිරීමට නොහැකිය"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"කාර්යාල යෙදුම් විරාම කර ඇත"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"කාර්යාල යෙදුම් ක්‍රියාත්මක කරන්න"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"කාර්යාල පැතිකඩ විරාම කර ඇත"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"ක්‍රියාත්මක කරන්න"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"කාර්යාල ගොනු තේරීමට හැකිය"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"ඔබේ IT පරිපාලක ඔබට පෞද්ගලික යෙදුමකින් කාර්යාල ගොනු වෙත ප්‍රවේශ වීමට ඉඩ නොදේ"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"පෞද්ගලික ගොනු තේරීමට නොහැකිය"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 01dfe58..a4465a9 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Dokument sa nepodarilo uložiť"</string>
     <string name="create_error" msgid="3092144450044861994">"Priečinok sa nepodarilo vytvoriť"</string>
     <string name="query_error" msgid="6625421453613879336">"Obsah momentálne nie je možné načítať"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Pracovné aplikácie sú pozastavené"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Zapnúť pracovné aplikácie"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Pracovný profil je pozastavený"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Zapnúť"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Pracovné súbory sa nedajú vybrať"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Váš správca IT vám zakázal prístup k pracovným súborom z osobnej aplikácie"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Osobné súbory sa nedajú vybrať"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 3a1e0b4..d4f75b8 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Dokumenta ni bilo mogoče shraniti"</string>
     <string name="create_error" msgid="3092144450044861994">"Mape ni bilo mogoče ustvariti"</string>
     <string name="query_error" msgid="6625421453613879336">"Vsebine trenutno ni mogoče naložiti"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Delovne aplikacije so začasno zaustavljene"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Vklopi delovne aplikacije"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Delovni profil je začasno zaustavljen"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Vklopi"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Ni mogoče izbrati službenih datotek"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Skrbnik za IT ne dovoli dostopa do službenih datotek iz osebne aplikacije"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Ni mogoče izbrati osebnih datotek"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index b2b3023..fe3b784 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Ruajtja e dokumentit dështoi"</string>
     <string name="create_error" msgid="3092144450044861994">"Krijimi i dosjes dështoi"</string>
     <string name="query_error" msgid="6625421453613879336">"Përmbajtja nuk mund të ngarkohet për momentin"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Aplikacionet e punës janë vendosur në pauzë"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Aktivizo aplikacionet e punës"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Profili i punës është në pauzë"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Aktivizo"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Nuk mund të zgjedhësh skedarë pune"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Administratori i teknologjisë së informacionit nuk të lejon të kesh qasje te skedarët e punës nga një aplikacion personal"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Nuk mund të zgjedhësh skedarë personalë"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 8fe2718..7682be9 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Чување документа није успело"</string>
     <string name="create_error" msgid="3092144450044861994">"Прављење фолдера није успело"</string>
     <string name="query_error" msgid="6625421453613879336">"Учитавање садржаја тренутно није могуће"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Пословне апликације су паузиране"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Укључи пословне апликације"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Пословни профил је паузиран"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Укључи"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Не можете да изаберете пословне фајлове"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"ИТ администратор вам не дозвољава да приступате датотекама за посао из личне апликације"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Избор личних датотека није успео"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 385808c..a94d95d 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Det gick inte att spara dokumentet"</string>
     <string name="create_error" msgid="3092144450044861994">"Det gick inte att skapa mappen"</string>
     <string name="query_error" msgid="6625421453613879336">"Det går inte att läsa in innehållet just nu"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Jobbappar har pausats"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Aktivera jobbappar"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Jobbprofilen har pausats"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Aktivera"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Det går inte att välja jobbfiler"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"IT-administratören tillåter inte att du öppnar jobbfiler i en privat app"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Det går inte att välja privata filer"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 4730783..683a99d 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Imeshindwa kuhifadhi hati"</string>
     <string name="create_error" msgid="3092144450044861994">"Imeshindwa kuunda folda"</string>
     <string name="query_error" msgid="6625421453613879336">"Imeshindwa kupakia maudhui kwa sasa"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Programu za kazini zimesimamishwa"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Washa programu za kazini"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Wasifu wa kazini umesimamishwa"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Washa"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Imeshindwa kuchagua faili za kazini"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Msimamizi wako wa TEHAMA hakuruhusu ufikie faili za kazini kwenye programu ya binafsi"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Imeshindwa kuchagua faili za binafsi"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index c2bb2c6..69f2baf 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -26,7 +26,7 @@
     <skip />
     <string name="title_open" msgid="3165686459158020921">"இதிலிருந்து திற:"</string>
     <string name="title_save" msgid="4384490653102710025">"இதில் சேமி:"</string>
-    <string name="menu_create_dir" msgid="2413624798689091042">"புதிய ஃபோல்டர்"</string>
+    <string name="menu_create_dir" msgid="2413624798689091042">"புதிய கோப்புறை"</string>
     <string name="menu_grid" msgid="1453636521731880680">"கட்டக் காட்சி"</string>
     <string name="menu_list" msgid="6714267452146410402">"பட்டியல் காட்சி"</string>
     <string name="menu_search" msgid="1876699106790719849">"தேடு"</string>
@@ -54,7 +54,7 @@
     <string name="menu_cut_to_clipboard" msgid="2878752142015026229">"வெட்டு"</string>
     <string name="menu_copy_to_clipboard" msgid="5064081159073330776">"நகலெடு"</string>
     <string name="menu_paste_from_clipboard" msgid="360947260414135827">"ஒட்டு"</string>
-    <string name="menu_paste_into_folder" msgid="8000644546983240101">"ஃபோல்டரில் ஒட்டு"</string>
+    <string name="menu_paste_into_folder" msgid="8000644546983240101">"கோப்புறையில் ஒட்டு"</string>
     <string name="menu_advanced_show" msgid="7558626506462906726">"அகச் சேமிப்பகத்தை காட்டு"</string>
     <string name="menu_advanced_hide" msgid="6488381508009246334">"அகச் சேமிப்பகத்தை மறை"</string>
     <string name="button_select" msgid="240863497069321364">"தேர்ந்தெடு"</string>
@@ -90,10 +90,10 @@
     <string name="drawer_open" msgid="8071673398187261741">"சேமித்த இடத்தைக் காட்டு"</string>
     <string name="drawer_close" msgid="4263880768630848848">"சேமித்த இடத்தை மறை"</string>
     <string name="save_error" msgid="8631128801982095782">"ஆவணத்தைச் சேமிக்க முடியவில்லை"</string>
-    <string name="create_error" msgid="3092144450044861994">"ஃபோல்டரை உருவாக்க முடியவில்லை"</string>
+    <string name="create_error" msgid="3092144450044861994">"கோப்புறையை உருவாக்க முடியவில்லை"</string>
     <string name="query_error" msgid="6625421453613879336">"தற்போது உள்ளடக்கத்தை ஏற்ற முடியவில்லை"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"பணி ஆப்ஸ் இடைநிறுத்தப்பட்டுள்ளன"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"பணி ஆப்ஸை இயக்கு"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"பணிக் கணக்கு இடைநிறுத்தப்பட்டது"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"ஆன் செய்"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"பணி ஃபைல்களைத் தேர்ந்தெடுக்க முடியாது"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"பணி ஃபைல்களைத் தனிப்பட்ட பணி ஆப்ஸில் இருந்து அணுகுவதை உங்கள் IT நிர்வாகி அனுமதிக்கவில்லை"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"தனிப்பட்ட ஃபைல்களைத் தேர்ந்தெடுக்க முடியாது"</string>
@@ -262,7 +262,7 @@
     <string name="chip_title_documents" msgid="7432457563000753983">"ஆவணங்கள்"</string>
     <string name="chip_title_large_files" msgid="7740269190493883980">"பெரிய ஃபைல்கள்"</string>
     <string name="chip_title_from_this_week" msgid="4961536405220379672">"இந்த வாரம்"</string>
-    <string name="input_hint_new_folder" msgid="479672411219725677">"ஃபோல்டரின் பெயர்"</string>
+    <string name="input_hint_new_folder" msgid="479672411219725677">"கோப்புறையின் பெயர்"</string>
     <string name="input_hint_rename" msgid="8390711744270994452">"புதிய பெயர்"</string>
     <string name="preview_file" msgid="4056622696305432343">"<xliff:g id="FILENAME">%1$s</xliff:g> என்ற ஃபைல் மாதிரிக்காட்சியாகத் தெரியும்"</string>
     <string name="preview_work_file" msgid="4495643735563487273">"<xliff:g id="FILENAME">%1$s</xliff:g> என்ற பணி ஃபைலின் மாதிரிக்காட்சியைப் பார்க்கவும்"</string>
@@ -273,7 +273,7 @@
     <string name="open_tree_dialog_message" msgid="4120695398430659628">"இது <xliff:g id="DIRECTORY">%2$s</xliff:g> இல் சேமிக்கப்பட்டுள்ள தற்போதைய மற்றும் வருங்கால உள்ளடக்கத்தை அணுக <xliff:g id="APPNAME">%1$s</xliff:g> ஆப்ஸை அனுமதிக்கும்."</string>
     <string name="directory_blocked_header_title" msgid="1164584889578740066">"ஃபோல்டரைப் பயன்படுத்த இயலாது"</string>
     <string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"உங்கள் தனியுரிமையைப் பாதுகாக்க மற்றொரு ஃபோல்டரைத் தேர்வுசெய்யவும்"</string>
-    <string name="create_new_folder_button" msgid="8859613309559794890">"புதிய ஃபோல்டரை உருவாக்கு"</string>
+    <string name="create_new_folder_button" msgid="8859613309559794890">"புதிய கோப்புறையை உருவாக்கு"</string>
     <string name="search_bar_hint" msgid="4517366509897977321">"இந்த மொபைலில் தேடவும்"</string>
     <string name="delete_search_history" msgid="2202015025607694515">"தேடல் வரலாற்றை நீக்கும் பட்டன் <xliff:g id="TEXT">%1$s</xliff:g>"</string>
     <string name="personal_tab" msgid="3878576287868528503">"தனிப்பட்டவை"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 071162e..24339fc 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"పత్రాన్ని సేవ్ చేయడంలో విఫలమైంది"</string>
     <string name="create_error" msgid="3092144450044861994">"ఫోల్డర్‌ను సృష్టించడంలో విఫలమైంది"</string>
     <string name="query_error" msgid="6625421453613879336">"ఈ సమయంలో కంటెంట్‌ను లోడ్ చేయడం సాధ్యపడదు"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"వర్క్ యాప్‌లు పాజ్ చేయబడ్డాయి"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"వర్క్ యాప్‌లను ఆన్ చేయండి"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"వర్క్ ప్రొఫైల్ పాజ్ చేయబడింది"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"ఆన్ చేయి"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"కార్యాలయ ఫైళ్లను ఎంపిక చేయడం సాధ్యం కాదు"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"వ్యక్తిగత యాప్ నుండి ఆఫీస్ ఫైళ్లను యాక్సెస్ చేయడానికి మీ IT అడ్మిన్ అనుమతించరు"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"వ్యక్తిగత ఫైళ్లను ఎంపిక చేయడం సాధ్యం కాదు"</string>
@@ -204,7 +204,7 @@
     <string name="notification_copy_files_converted_title" msgid="6916768494891833365">"కొన్ని పైల్‌లు మార్చబడ్డాయి"</string>
     <string name="open_external_dialog_request" msgid="8173558471322861268">"<xliff:g id="APPNAME"><b>^1</b></xliff:g>కి <xliff:g id="STORAGE"><i>^3</i></xliff:g>లో <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> డైరెక్టరీ యాక్సెస్‌ను మంజూరు చేయాలా?"</string>
     <string name="open_external_dialog_request_primary_volume" msgid="2240992164087948176">"<xliff:g id="APPNAME"><b>^1</b></xliff:g>కి <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> డైరెక్టరీ యాక్సెస్‌ను మంజూరు చేయాలా?"</string>
-    <string name="open_external_dialog_root_request" msgid="6776729293982633">"<xliff:g id="STORAGE"><i>^2</i></xliff:g>లోని ఫోటోలు, వీడియోలతో సహా మీ డేటా యాక్సెస్‌ను <xliff:g id="APPNAME"><b>^1</b></xliff:g>కి మంజూరు చేయాలా?"</string>
+    <string name="open_external_dialog_root_request" msgid="6776729293982633">"<xliff:g id="STORAGE"><i>^2</i></xliff:g>లోని ఫోటోలు మరియు వీడియోలతో సహా మీ డేటా యాక్సెస్‌ను <xliff:g id="APPNAME"><b>^1</b></xliff:g>కి మంజూరు చేయాలా?"</string>
     <string name="allow" msgid="1275746941353040309">"అనుమతించు"</string>
     <string name="deny" msgid="5127201668078153379">"తిరస్కరించు"</string>
     <plurals name="elements_selected" formatted="false" msgid="4448165978637163692">
@@ -251,11 +251,11 @@
     <string name="root_info_header_app_with_summary" msgid="3223302581236069702">"<xliff:g id="LABEL">%1$s</xliff:g> / <xliff:g id="SUMMARY">%2$s</xliff:g>లోని ఫైళ్లు"</string>
     <string name="root_info_header_image_recent" msgid="7494373563753926014">"ఇటీవలి ఇమేజ్‌లు"</string>
     <string name="root_info_header_image_global_search" msgid="7307009823489854697">"ఇమేజ్‌లు"</string>
-    <string name="root_info_header_image_downloads" msgid="7072252612657612307">"\'డౌన్‌లోడ్‌లు\'లోని ఇమేజ్‌లు"</string>
-    <string name="root_info_header_image_storage" msgid="5086740886360075930">"<xliff:g id="DEVICE">%1$s</xliff:g>లోని ఇమేజ్‌లు"</string>
-    <string name="root_info_header_image_folder" msgid="5980430877636279667">"<xliff:g id="FOLDER">%1$s</xliff:g>లోని ఇమేజ్‌లు"</string>
-    <string name="root_info_header_image_app" msgid="4858114210851525359">"<xliff:g id="LABEL">%1$s</xliff:g>లోని ఇమేజ్‌లు"</string>
-    <string name="root_info_header_image_app_with_summary" msgid="6404842960923224778">"<xliff:g id="LABEL">%1$s</xliff:g>లోని ఇమేజ్‌లు / <xliff:g id="SUMMARY">%2$s</xliff:g>"</string>
+    <string name="root_info_header_image_downloads" msgid="7072252612657612307">"\'డౌన్‌లోడ్‌లు\'లోని చిత్రాలు"</string>
+    <string name="root_info_header_image_storage" msgid="5086740886360075930">"<xliff:g id="DEVICE">%1$s</xliff:g>లోని ఫోటోలు"</string>
+    <string name="root_info_header_image_folder" msgid="5980430877636279667">"<xliff:g id="FOLDER">%1$s</xliff:g>లోని చిత్రాలు"</string>
+    <string name="root_info_header_image_app" msgid="4858114210851525359">"<xliff:g id="LABEL">%1$s</xliff:g>లోని ఫోటోలు"</string>
+    <string name="root_info_header_image_app_with_summary" msgid="6404842960923224778">"<xliff:g id="LABEL">%1$s</xliff:g>లోని ఫోటోలు / <xliff:g id="SUMMARY">%2$s</xliff:g>"</string>
     <string name="chip_title_images" msgid="7838299046109841015">"ఇమేజ్‌లు"</string>
     <string name="chip_title_audio" msgid="1032801828748235436">"ఆడియో"</string>
     <string name="chip_title_videos" msgid="7011260091979776447">"వీడియోలు"</string>
@@ -275,7 +275,7 @@
     <string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"మీ గోప్యతను కాపాడుకోవటానికి, మరొక ఫోల్డర్‌ను ఎంచుకోండి"</string>
     <string name="create_new_folder_button" msgid="8859613309559794890">"కొత్త ఫోల్డర్‌ని సృష్టించు"</string>
     <string name="search_bar_hint" msgid="4517366509897977321">"ఈ ఫోన్‌లో వెతకండి"</string>
-    <string name="delete_search_history" msgid="2202015025607694515">"సెర్చ్ హిస్టరీ <xliff:g id="TEXT">%1$s</xliff:g>‌ను తొలగించండి"</string>
+    <string name="delete_search_history" msgid="2202015025607694515">"శోధన చరిత్ర <xliff:g id="TEXT">%1$s</xliff:g>ను తొలగించండి"</string>
     <string name="personal_tab" msgid="3878576287868528503">"వ్యక్తిగత డైరెక్టరీ"</string>
     <string name="work_tab" msgid="7265359366883747413">"కార్యాలయ డైరెక్టరీ"</string>
     <string name="a11y_work" msgid="7504431382825242153">"ఆఫీసు"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index e4e7b6a..525c35b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"การบันทึกเอกสารล้มเหลว"</string>
     <string name="create_error" msgid="3092144450044861994">"การสร้างโฟลเดอร์ล้มเหลว"</string>
     <string name="query_error" msgid="6625421453613879336">"โหลดเนื้อหาไม่ได้ในขณะนี้"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"แอปงานหยุดชั่วคราว"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"เปิดแอปงาน"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"โปรไฟล์งานหยุดชั่วคราว"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"เปิด"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"เลือกไฟล์งานไม่ได้"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"ผู้ดูแลระบบไอทีไม่อนุญาตให้เข้าถึงไฟล์งานจากแอปส่วนตัว"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"เลือกไฟล์ส่วนตัวไม่ได้"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index ed6cfd2..b394b8d 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Hindi na-save ang dokumento"</string>
     <string name="create_error" msgid="3092144450044861994">"Hindi nagawa ang folder"</string>
     <string name="query_error" msgid="6625421453613879336">"Hindi ma-load ang content sa ngayon"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Naka-pause ang mga app para sa trabaho"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"I-on ang mga app para sa trabaho"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Naka-pause ang profile sa trabaho"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"I-on"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Hindi makapili ng mga file sa trabaho"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Hindi ka pinapayagan ng iyong IT admin na mag-access ng mga file sa trabaho mula sa personal na app"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Hindi makapili ng mga personal na file"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index a1462f5..354cb88 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Doküman kaydedilemedi"</string>
     <string name="create_error" msgid="3092144450044861994">"Klasör oluşturulamadı"</string>
     <string name="query_error" msgid="6625421453613879336">"İçerik şu anda yüklenemiyor"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"İş uygulamaları duraklatıldı"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"İş uygulamalarını aç"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"İş profili duraklatıldı"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Etkinleştir"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"İş dosyaları seçilemiyor"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"BT yöneticiniz kişisel bir uygulamadan iş dosyalarına erişmenize izin vermiyor"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Kişisel dosyalar seçilemiyor"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 30d8d79..0c223b2 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Не вдалося зберегти документ"</string>
     <string name="create_error" msgid="3092144450044861994">"Не вдалося створити папку"</string>
     <string name="query_error" msgid="6625421453613879336">"Зараз не вдається завантажити вміст"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Робочі додатки призупинено"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Увімкнути робочі додатки"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Робочий профіль призупинено"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Увімкнути"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Не вдається вибрати робочі файли"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Ваш ІТ-адміністратор не дозволяє отримувати доступ до робочих файлів з особистого додатка"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Не вдається вибрати особисті файли"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index e2d3d1c..037a9a4 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"دستاویز کو محفوظ کرنے میں ناکام ہو گیا۔"</string>
     <string name="create_error" msgid="3092144450044861994">"فولڈر بنانے میں ناکام ہو گیا"</string>
     <string name="query_error" msgid="6625421453613879336">"اس وقت مواد لوڈ نہیں ہو سکتا"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"ورک ایپس موقوف ہیں"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"ورک ایپس آن کریں"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"دفتری پروفائل روک دی گئی ہے"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"آن کریں"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"دفتری فائلز منتخب نہیں کر سکتے"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"‏آپ کا IT منتظم آپ کو ذاتی ایپ سے دفتری فائلز تک رسائی حاصل کرنے کی اجازت نہیں دیتا ہے"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"ذاتی فائلز منتخب نہیں کر سکتے"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index dd005e2..92b6cc6 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Hujjatni saqlab bo‘lmadi"</string>
     <string name="create_error" msgid="3092144450044861994">"Jildni yaratib bo‘lmadi"</string>
     <string name="query_error" msgid="6625421453613879336">"Ayni paytda kontentni yuklab bo‘lmayapti"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Ishga oid ilovalar pauza qilingan"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Ishga oid ilovalarni yoqish"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Ish profili pauza qilingan"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Yoqish"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Ishga oid fayllarni tanlash imkonsiz"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"AT administratoringiz shaxsiy ilovadan ishga oid fayllarga kirishni taqiqlagan"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Shaxsiy fayllar tanlanmadi"</string>
diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
deleted file mode 100644
index 72de6e5..0000000
--- a/res/values-v31/colors.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-  <color name="tab_selected_text_color">@*android:color/system_neutral1_900
-  </color>
-  <!-- neutral 900 -->
-  <color name="tab_unselected_text_color">@*android:color/system_neutral2_700
-  </color>
-  <!-- neutral variant 700-->
-  <color name="work_profile_button_stroke_color">
-    @*android:color/system_accent1_600
-  </color> <!-- primary 600 -->
-  <color name="empty_state_text_color">@*android:color/system_neutral1_900
-  </color>
-  <!-- neutral 900 -->
-  <color name="empty_state_message_text_color">
-    @*android:color/system_neutral2_700
-  </color>
-  <!-- neutral variant 700 -->
-  <color name="profile_tab_selected_color">@*android:color/system_accent1_100
-  </color>
-  <!-- accent 100 -->
-  <color name="profile_tab_default_color">@*android:color/system_neutral1_10
-  </color>
-  <!-- neutral 10 -->
-  <color name="fragment_pick_inactive_button_color">
-    @*android:color/system_neutral1_100
-  </color>
-  <!-- neutral 100 -->
-  <color name="fragment_pick_inactive_text_color">
-    @*android:color/system_neutral1_400
-  </color>
-  <!-- neutral 400 -->
-  <color name="fragment_pick_active_button_color">@*android:color/system_accent1_600
-  </color>
-  <!-- accent 600 -->
-  <color name="fragment_pick_active_text_color">@android:color/white</color>
-</resources>
diff --git a/res/values-v31/config.xml b/res/values-v31/config.xml
deleted file mode 100644
index a96a3e9..0000000
--- a/res/values-v31/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2021 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources>
-    <!-- Starting from Android S, using DocumentsUI as a file browser with launcher icon is no
-    longer supported. -->
-    <bool name="is_launcher_enabled">false</bool>
-</resources>
diff --git a/res/values-v31/dimens.xml b/res/values-v31/dimens.xml
deleted file mode 100644
index 79b3005..0000000
--- a/res/values-v31/dimens.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-  ~ Copyright (C) 2021 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<resources>
-    <dimen name="action_bar_elevation">0dp</dimen>
-    <dimen name="action_bar_margin">0dp</dimen>
-    <dimen name="button_corner_radius">20dp</dimen>
-    <dimen name="tab_selector_indicator_height">0dp</dimen>
-    <dimen name="tab_height">36dp</dimen>
-    <dimen name="tab_container_height">48dp</dimen>
-    <dimen name="profile_tab_padding">20dp</dimen>
-    <dimen name="profile_tab_margin_top">16dp</dimen>
-    <dimen name="profile_tab_margin_side">4dp</dimen>
-    <dimen name="cross_profile_button_corner_radius">30dp</dimen>
-    <dimen name="cross_profile_button_stroke_width">1dp</dimen>
-    <dimen name="cross_profile_button_message_margin_top">16dp</dimen>
-</resources>
diff --git a/res/values-v31/styles.xml b/res/values-v31/styles.xml
deleted file mode 100644
index ad2d98c..0000000
--- a/res/values-v31/styles.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2021 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources>
-
-  <style name="SectionHeader" parent="@android:style/TextAppearance.Material.Medium">
-    <item name="android:textColor">?android:attr/textColorPrimary</item>
-    <item name="fontFamily">@string/config_fontFamilyMedium</item>
-    <item name="android:textSize">12sp</item>
-  </style>
-
-  <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
-    <item name="colorControlNormal">?android:textColorSecondary</item>
-    <item name="android:actionMenuTextColor">
-      @*android:color/accent_device_default_light
-    </item>
-    <item name="android:textAllCaps">false</item>
-  </style>
-
-  <style name="MaterialButton" parent="@style/Widget.MaterialComponents.Button.UnelevatedButton">
-    <item name="android:textAppearance">@style/MaterialButtonTextAppearance
-    </item>
-    <item name="android:backgroundTint">?android:colorAccent</item>
-  </style>
-
-  <style name="MaterialOutlinedButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
-    <item name="android:textAppearance">@style/MaterialButtonTextAppearance
-    </item>
-    <item name="android:backgroundTint">@android:color/white</item>
-    <item name="android:textColor">?android:colorAccent</item>
-  </style>
-
-  <style name="EmptyStateButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
-    <item name="android:backgroundTint">@android:color/transparent</item>
-    <item name="android:textColor">@*android:color/system_neutral1_900</item>
-    <item name="android:textAllCaps">false</item>
-    <item name="android:textAppearance">@style/EmptyStateButtonTextAppearance
-    </item>
-  </style>
-
-  <style name="DialogTextButton" parent="@style/Widget.MaterialComponents.Button.TextButton.Dialog">
-    <item name="android:textAppearance">@style/MaterialButtonTextAppearance
-    </item>
-    <item name="android:textColor">?android:attr/colorAccent</item>
-    <item name="android:backgroundTint">@android:color/transparent</item>
-  </style>
-</resources>
diff --git a/res/values-v31/styles_text.xml b/res/values-v31/styles_text.xml
deleted file mode 100644
index 02b9124..0000000
--- a/res/values-v31/styles_text.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <style name="EmptyStateTitleText">
-        <item name="android:textColor">@color/empty_state_text_color</item>
-        <item name="android:textSize">18sp</item>
-        <item name="fontFamily">@string/config_headerFontFamily</item>
-    </style>
-
-    <style name="EmptyStateMessageText">
-        <item name="android:textColor">@color/empty_state_message_text_color</item>
-        <item name="android:textSize">14sp</item>
-        <item name="fontFamily">@string/config_fontFamily</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 51fda46..3092b4d 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Không lưu tài liệu được"</string>
     <string name="create_error" msgid="3092144450044861994">"Không thể tạo thư mục"</string>
     <string name="query_error" msgid="6625421453613879336">"Không thể tải nội dung vào lúc này"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Ứng dụng công việc đã tạm dừng"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Bật ứng dụng công việc"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Hồ sơ công việc của bạn đã bị tạm dừng"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Bật"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Không thể chọn các tệp công việc"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Quản trị viên CNTT không cho phép bạn truy cập vào tệp công việc từ ứng dụng cá nhân"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Không thể chọn các tệp cá nhân"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1167256..793bdc7 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"无法保存文档"</string>
     <string name="create_error" msgid="3092144450044861994">"无法创建文件夹"</string>
     <string name="query_error" msgid="6625421453613879336">"暂时无法加载内容"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"工作应用已暂停"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"开启工作应用"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"工作资料已被暂停"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"开启"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"无法选择工作文件"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"您的 IT 管理员不允许您通过个人应用访问工作文件"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"无法选择个人文件"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 3b893e6..e559404 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"無法儲存文件"</string>
     <string name="create_error" msgid="3092144450044861994">"無法建立資料夾"</string>
     <string name="query_error" msgid="6625421453613879336">"目前無法載入內容"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"已暫停工作應用程式"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"開啟工作應用程式"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"工作設定檔已暫停使用"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"開啟"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"無法選取工作檔案"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"IT 管理員不允許您透過個人應用程式存取工作檔案"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"無法選取個人檔案"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 1a2f9c6..896426f 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"無法儲存文件"</string>
     <string name="create_error" msgid="3092144450044861994">"無法建立資料夾"</string>
     <string name="query_error" msgid="6625421453613879336">"目前無法載入內容"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"系統已暫停工作應用程式"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"開啟工作應用程式"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"工作資料夾已暫停"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"開啟"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"無法選取工作檔案"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"你的 IT 管理員不允許你透過個人應用程式存取工作檔案"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"無法選取個人檔案"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 5b8ff7c..8065b46 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -92,8 +92,8 @@
     <string name="save_error" msgid="8631128801982095782">"Yehlulekile ukulondoloza idokhumenti"</string>
     <string name="create_error" msgid="3092144450044861994">"Yehlulekile ukudala ifolda"</string>
     <string name="query_error" msgid="6625421453613879336">"Ayikwazanga ukulayisha okuqukethwe okwamanje"</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Izinhlelo zokusebenza zomsebenzi ziphunyuziwe"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Vula ama-app omsebenzi"</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Iphrofayela yomsebenzi iphunyuziwe"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Vula"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Ayikwazi ukukhetha amafayela omsebenzi"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Umphathi wakho we-IT akakuvumeli ukuba ufinyelele amafayela omsebenzi avela kuhlelo lokusebenza lomuntu siqu"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Ayikwazi ukukhetha amafayela akho siqu"</string>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 12b8762..1a4d3bc 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2013 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,57 +15,41 @@
 -->
 
 <resources>
-  <!-- This is the window background, but also the background for anything
-       else that needs to manually declare a background matching the "default"
-       app background (e.g. the drawer overlay). -->
+    <!-- This is the window background, but also the background for anything
+         else that needs to manually declare a background matching the "default"
+         app background (e.g. the drawer overlay). -->
 
-  <color name="app_background_color">@android:color/white</color>
-  <color name="background_floating">@android:color/white</color>
-  <color name="nav_bar_translucent">#99FFFFFF</color>
+    <color name="app_background_color">@android:color/white</color>
+    <color name="background_floating">@android:color/white</color>
+    <color name="nav_bar_translucent">#99FFFFFF</color>
 
-  <color name="primary">#1E88E5</color> <!-- Blue 600 -->
-  <color name="secondary">#E3F2FD</color> <!-- Blue 50 -->
-  <color name="hairline">#E0E0E0</color> <!-- Gray 300 -->
+    <color name="primary">#1E88E5</color> <!-- Blue 600 -->
+    <color name="secondary">#E3F2FD</color> <!-- Blue 50 -->
+    <color name="hairline">#E0E0E0</color> <!-- Gray 300 -->
 
-  <color name="chip_background_disable_color">#fff1f3f4</color>
-  <color name="menu_search_background">@android:color/transparent</color>
-  <color name="item_breadcrumb_background_hovered">#1affffff</color>
-  <color name="item_drag_shadow_background">@android:color/white</color>
-  <color name="item_drag_shadow_container_background">
-    @android:color/transparent
-  </color>
-  <color name="tool_bar_gradient_max">#7f000000</color>
+    <color name="chip_background_disable_color">#fff1f3f4</color>
+    <color name="menu_search_background">@android:color/transparent</color>
+    <color name="item_breadcrumb_background_hovered">#1affffff</color>
+    <color name="item_drag_shadow_background">@android:color/white</color>
+    <color name="item_drag_shadow_container_background">@android:color/transparent</color>
+    <color name="tool_bar_gradient_max">#7f000000</color>
 
-  <color name="band_select_background">#88ffffff</color>
-  <color name="band_select_border">#44000000</color>
+    <color name="band_select_background">#88ffffff</color>
+    <color name="band_select_border">#44000000</color>
 
-  <color name="downloads_icon_background">#ff4688f2</color>
-  <color name="app_icon_background">#ff4688f2</color>
-  <color name="shortcut_foreground">#ff3367d6</color>
-  <color name="shortcut_background">#fff5f5f5</color>
+    <color name="downloads_icon_background">#ff4688f2</color>
+    <color name="app_icon_background">#ff4688f2</color>
+    <color name="shortcut_foreground">#ff3367d6</color>
+    <color name="shortcut_background">#fff5f5f5</color>
 
-  <color name="empty_state_text_color">#202124</color>
-  <color name="error_image_color">#757575</color>
+    <color name="empty_state_text">#202124</color>
+    <color name="error_image_color">#757575</color>
 
-  <color name="edge_effect">@android:color/black</color>
+    <color name="edge_effect">@android:color/black</color>
 
-  <color name="doc_list_item_subtitle_enabled">#5F6368</color> <!-- Gray 700 -->
-  <color name="doc_list_item_subtitle_disabled">#613c4043
-  </color> <!-- 38% Grey800 -->
+    <color name="doc_list_item_subtitle_enabled">#5F6368</color> <!-- Gray 700 -->
+    <color name="doc_list_item_subtitle_disabled">#613c4043</color> <!-- 38% Grey800 -->
 
-  <color name="list_divider_color">#1f000000</color>
-  <color name="list_item_selected_background_color">?android:colorSecondary
-  </color>
-  <color name="color_surface_header">@color/app_background_color</color>
-
-  <color name="tab_selected_text_color">@color/primary</color>
-  <color name="work_profile_button_stroke_color">@color/primary</color>
-  <color name="profile_tab_selected_color">?android:attr/colorAccent</color>
-  <color name="profile_tab_default_color">#E0E0E0</color>
-  <color name="tab_unselected_text_color">#5F6368</color> <!-- Gray 700 -->
-
-  <color name="fragment_pick_inactive_button_color">#E0E0E0</color>
-  <color name="fragment_pick_inactive_text_color">#5F6368</color>
-  <color name="fragment_pick_active_button_color">@color/primary</color>
-  <color name="fragment_pick_active_text_color">@android:color/white</color>
+    <color name="list_divider_color">#1f000000</color>
+    <color name="list_item_selected_background_color">?android:colorSecondary</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0373753..3b326e1 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -18,8 +18,6 @@
     <!-- Material design rounded radius -->
     <dimen name="material_round_radius">2dp</dimen>
 
-    <dimen name="tab_selector_indicator_height">2dp</dimen>
-    <dimen name="profile_tab_padding">0dp</dimen>
     <dimen name="grid_container_padding">20dp</dimen>
     <dimen name="list_container_padding">0dp</dimen>
     <dimen name="icon_size">40dp</dimen>
@@ -56,7 +54,6 @@
     <dimen name="briefcase_icon_margin">8dp</dimen>
     <dimen name="briefcase_icon_size">14dp</dimen>
     <dimen name="briefcase_icon_size_photo">24dp</dimen>
-    <dimen name="button_corner_radius">2dp</dimen>
 
     <dimen name="drawer_edge_width">12dp</dimen>
 
@@ -129,7 +126,4 @@
     <dimen name="refresh_icon_range">64dp</dimen>
 
     <dimen name="item_doc_inflated_message_padding_top">0dp</dimen>
-    <dimen name="cross_profile_button_corner_radius">0dp</dimen>
-    <dimen name="cross_profile_button_stroke_width">0dp</dimen>
-    <dimen name="cross_profile_button_message_margin_top">4dp</dimen>
 </resources>
diff --git a/res/values/overlayable.xml b/res/values/overlayable.xml
index bda8993..0b334d2 100644
--- a/res/values/overlayable.xml
+++ b/res/values/overlayable.xml
@@ -41,7 +41,6 @@
             <!-- START COLOR -->
             <item type="color" name="primary"/>
             <item type="color" name="list_item_selected_background_color"/>
-            <item type="color" name="color_surface_header"/>
             <!-- END COLOR -->
 
             <!-- START DIMEN -->
@@ -68,8 +67,6 @@
             <!-- START STRING CONFIG -->
             <item type="string" name="config_fontFamily"/>
             <item type="string" name="config_fontFamilyMedium"/>
-            <item type="string" name="config_headerFontFamily"/>
-            <item type="string" name="config_headerFontFamilyMedium"/>
             <item type="string" name="default_root_uri"/>
             <item type="string" name="preferred_root_package"/>
             <item type="string" name="trusted_quick_viewer_package"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a1d6982..8595089 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -185,9 +185,9 @@
     <string name="query_error">Can\u2019t load content at the moment</string>
 
     <!-- Title of an error message. This screen is shown when the user's work profile is paused. [CHAR LIMIT=72] -->
-    <string name="quiet_mode_error_title">Work apps are paused</string>
+    <string name="quiet_mode_error_title">Work profile is paused</string>
     <!-- Button text shown on a button when work profile is paused. Tapping the button will switch on the work profile [CHAR LIMIT=48] -->
-    <string name="quiet_mode_button">Turn on work apps</string>
+    <string name="quiet_mode_button">Turn on</string>
 
     <!-- Error message title shown when a user's IT admin does not allow the user to select work files from a personal app. [CHAR LIMIT=72] -->
     <string name="cant_select_work_files_error_title">Can\u2019t select work files</string>
diff --git a/res/values/strings_font.xml b/res/values/strings_font.xml
index 0c3fbc0..4279ef1 100644
--- a/res/values/strings_font.xml
+++ b/res/values/strings_font.xml
@@ -16,15 +16,9 @@
 
 <resources>
 
-    <!-- Name of the body font family. If empty, falls back to platform default -->
+    <!-- Name of a font family. If empty, falls back to platform default -->
     <string name="config_fontFamily" translatable="false">sans-serif</string>
-    <!-- Name of the body font family medium. -->
+    <!-- Name of the font family medium. -->
     <string name="config_fontFamilyMedium" translatable="false">sans-serif-medium</string>
-    <!-- Name of the header font family. If empty, falls back to platform default -->
-    <string name="config_headerFontFamily" translatable="false">@string/config_fontFamily</string>
-    <!-- Name of the header font family medium. -->
-    <string name="config_headerFontFamilyMedium" translatable="false">
-        @string/config_fontFamilyMedium
-    </string>
 
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b27f2ea..264f2b4 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -74,7 +74,7 @@
         <item name="android:textSize">20sp</item>
         <item name="fontFamily">@string/config_fontFamilyMedium</item>
     </style>
-    
+
     <style name="MaterialButton" parent="@style/Widget.MaterialComponents.Button.UnelevatedButton">
         <item name="android:textAppearance">@style/MaterialButtonTextAppearance</item>
     </style>
diff --git a/res/values/styles_text.xml b/res/values/styles_text.xml
index 084480c..8a6ee07 100644
--- a/res/values/styles_text.xml
+++ b/res/values/styles_text.xml
@@ -19,13 +19,6 @@
         <item name="android:textSize">11sp</item>
     </style>
 
-    <style name="SectionHeader" parent="@android:style/TextAppearance.Material.Medium">
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="fontFamily">@string/config_fontFamilyMedium</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
     <style name="SortList" parent="@style/TextAppearance.AppCompat.Subhead">
         <item name="android:textColor">@color/sort_list_text</item>
         <item name="fontFamily">@string/config_fontFamilyMedium</item>
@@ -60,7 +53,6 @@
     <style name="CardPrimaryText" parent="@style/TextAppearance.AppCompat.Subhead">
         <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:textSize">14sp</item>
-        <item name="fontFamily">@string/config_fontFamily</item>
     </style>
 
     <style name="ActionModeTitle" parent="@style/ToolbarTitle">
@@ -92,7 +84,6 @@
     <style name="DrawerMenuSecondary" parent="android:style/TextAppearance.Material.Body2">
         <item name="android:textSize">12sp</item>
         <item name="android:textColor">@color/item_root_secondary_text</item>
-        <item name="fontFamily">@string/config_fontFamily</item>
     </style>
 
     <style name="InspectorKeySubTitle" parent="@style/TextAppearance.MaterialComponents.Subtitle1">
@@ -111,13 +102,13 @@
     </style>
 
     <style name="EmptyStateTitleText">
-        <item name="android:textColor">@color/empty_state_text_color</item>
+        <item name="android:textColor">@color/empty_state_text</item>
         <item name="android:textSize">14sp</item>
         <item name="fontFamily">@string/config_fontFamilyMedium</item>
     </style>
 
     <style name="EmptyStateMessageText">
-        <item name="android:textColor">@color/empty_state_text_color</item>
+        <item name="android:textColor">@color/empty_state_text</item>
         <item name="android:textSize">12sp</item>
     </style>
 
@@ -127,27 +118,18 @@
         <item name="fontFamily">@string/config_fontFamilyMedium</item>
     </style>
 
-    <style name="TabTextAppearance" parent="@android:style/TextAppearance.Material.Medium">
+    <style name="TabTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Medium">
         <item name="android:textSize">14sp</item>
         <item name="fontFamily">@string/config_fontFamilyMedium</item>
     </style>
 
-    <style name="ItemCaptionText" parent="@android:style/TextAppearance.Material.Caption">
+    <style name="ItemDocListCaptionText" parent="@android:style/TextAppearance.Material.Caption">
         <item name="android:textColor">@color/doc_list_item_subtitle_color</item>
-        <item name="fontFamily">@string/config_fontFamily</item>
     </style>
 
-    <style name="MenuItemTextAppearance" parent="@android:style/TextAppearance.Material.Body2">
+    <style name="MenuItemTextAppearance" parent="*android:style/TextAppearance.DeviceDefault.Body2">
         <item name="android:textSize">14sp</item>
         <item name="fontFamily">@string/config_fontFamily</item>
     </style>
 
-    <style name="Subhead" parent="@android:style/TextAppearance.Material.Subhead">
-        <item name="fontFamily">@string/config_fontFamily</item>
-    </style>
-
-    <style name="Body1" parent="@android:style/TextAppearance.Material.Body1">
-        <item name="fontFamily">@string/config_fontFamily</item>
-    </style>
-
 </resources>
\ No newline at end of file
diff --git a/src/com/android/documentsui/AbstractActionHandler.java b/src/com/android/documentsui/AbstractActionHandler.java
index a310ace..db56a05 100644
--- a/src/com/android/documentsui/AbstractActionHandler.java
+++ b/src/com/android/documentsui/AbstractActionHandler.java
@@ -747,7 +747,7 @@
         public void onRootLoaded(@Nullable RootInfo root) {
             if (root == null) {
                 // There is no such root in the other profile. Maybe the provider is missing on
-                // the other profile. Create a placeholder root and open it to show error message.
+                // the other profile. Create a dummy root and open it to show error message.
                 root = RootInfo.copyRootInfo(mOriginalRoot);
                 root.userId = mSelectedUserId;
             }
diff --git a/src/com/android/documentsui/BaseActivity.java b/src/com/android/documentsui/BaseActivity.java
index c6cbc19..8c0d969 100644
--- a/src/com/android/documentsui/BaseActivity.java
+++ b/src/com/android/documentsui/BaseActivity.java
@@ -75,7 +75,6 @@
 import com.android.documentsui.sorting.SortController;
 import com.android.documentsui.sorting.SortModel;
 
-import com.android.documentsui.util.VersionUtils;
 import com.google.android.material.appbar.AppBarLayout;
 
 import java.util.ArrayList;
@@ -168,11 +167,6 @@
 
         mNavigator = new NavigationViewManager(this, mDrawer, mState, this, breadcrumb,
                 profileTabsContainer, DocumentsApplication.getUserIdManager(this));
-        AppBarLayout appBarLayout = findViewById(R.id.app_bar);
-        if (appBarLayout != null) {
-            appBarLayout.addOnOffsetChangedListener(mNavigator);
-        }
-
         SearchManagerListener searchListener = new SearchManagerListener() {
             /**
              * Called when search results changed. Refreshes the content of the directory. It
@@ -720,20 +714,6 @@
         }
     }
 
-    public void updateHeader(boolean shouldHideHeader){
-        View headerContainer = findViewById(R.id.header_container);
-        if(headerContainer == null){
-            updateHeaderTitle();
-            return;
-        }
-        if (shouldHideHeader) {
-            headerContainer.setVisibility(View.GONE);
-        } else {
-            headerContainer.setVisibility(View.VISIBLE);
-            updateHeaderTitle();
-        }
-    }
-
     public void updateHeaderTitle() {
         if (!mState.stack.isInitialized()) {
             //stack has not initialized, the header will update after the stack finishes loading
@@ -954,7 +934,7 @@
                 getMainLooper().getQueue().addIdleHandler(new IdleHandler() {
                     @Override
                     public boolean queueIdle() {
-                        // If startup benchmark is requested by an allowedlist testing package, then
+                        // If startup benchmark is requested by a whitelisted testing package, then
                         // close the activity once idle, and notify the testing activity.
                         if (getIntent().getBooleanExtra(EXTRA_BENCHMARK, false) &&
                                 BENCHMARK_TESTING_PACKAGE.equals(getCallingPackage())) {
diff --git a/src/com/android/documentsui/DevicePolicyMetricConsts.java b/src/com/android/documentsui/DevicePolicyMetricConsts.java
index 386bdc5..1642c30 100644
--- a/src/com/android/documentsui/DevicePolicyMetricConsts.java
+++ b/src/com/android/documentsui/DevicePolicyMetricConsts.java
@@ -23,7 +23,7 @@
 
 /**
  * All constants are based on the enums in
- * frameworks/proto_logging/stats/enums/stats/devicepolicy/device_policy_enums.proto.
+ * frameworks/base/core/proto/android/stats/devicepolicy/device_policy_enums.proto.
  */
 public class DevicePolicyMetricConsts {
 
diff --git a/src/com/android/documentsui/DocsSelectionHelper.java b/src/com/android/documentsui/DocsSelectionHelper.java
index 956527a..b7a720c 100644
--- a/src/com/android/documentsui/DocsSelectionHelper.java
+++ b/src/com/android/documentsui/DocsSelectionHelper.java
@@ -37,10 +37,10 @@
 
     private final DelegateFactory mFactory;
 
-    // initialize to a stub object incase we get some input
+    // initialize to a dummy object incase we get some input
     // event drive calls before we're properly initialized.
     // See: b/69306667.
-    private SelectionTracker<String> mDelegate = new StubSelectionTracker<>();
+    private SelectionTracker<String> mDelegate = new DummySelectionTracker<>();
 
     @VisibleForTesting
     DocsSelectionHelper(DelegateFactory factory) {
diff --git a/src/com/android/documentsui/DrawerController.java b/src/com/android/documentsui/DrawerController.java
index 56b3a87..cb53616 100644
--- a/src/com/android/documentsui/DrawerController.java
+++ b/src/com/android/documentsui/DrawerController.java
@@ -55,7 +55,7 @@
         DrawerLayout layout = (DrawerLayout) activity.findViewById(R.id.drawer_layout);
 
         if (layout == null) {
-            return new StubDrawerController();
+            return new DummyDrawerController();
         }
 
         View drawer = activity.findViewById(R.id.drawer_roots);
@@ -76,8 +76,8 @@
     /**
      * Returns a controller suitable for {@code Layout}.
      */
-    static DrawerController createStub() {
-        return new StubDrawerController();
+    static DrawerController createDummy() {
+        return new DummyDrawerController();
     }
 
     private static int calculateDrawerWidth(Activity activity) {
@@ -235,9 +235,9 @@
     }
 
     /*
-     * Stub controller useful with clients that don't host a real drawer.
+     * Dummy controller useful with clients that don't host a real drawer.
      */
-    private static final class StubDrawerController extends DrawerController {
+    private static final class DummyDrawerController extends DrawerController {
 
         @Override
         public void setOpen(boolean open) {}
diff --git a/src/com/android/documentsui/StubProfileTabsAddons.java b/src/com/android/documentsui/DummyProfileTabsAddons.java
similarity index 86%
rename from src/com/android/documentsui/StubProfileTabsAddons.java
rename to src/com/android/documentsui/DummyProfileTabsAddons.java
index cac1759..697025e 100644
--- a/src/com/android/documentsui/StubProfileTabsAddons.java
+++ b/src/com/android/documentsui/DummyProfileTabsAddons.java
@@ -17,9 +17,9 @@
 package com.android.documentsui;
 
 /**
- * A stub {@ProfileTabsAddons} implementation.
+ * A dummy {@ProfileTabsAddons} implementation.
  */
-public class StubProfileTabsAddons implements ProfileTabsAddons {
+public class DummyProfileTabsAddons implements ProfileTabsAddons {
 
     @Override
     public void setEnabled(boolean enabled) {
diff --git a/src/com/android/documentsui/StubSelectionTracker.java b/src/com/android/documentsui/DummySelectionTracker.java
similarity index 91%
rename from src/com/android/documentsui/StubSelectionTracker.java
rename to src/com/android/documentsui/DummySelectionTracker.java
index 1a39214..49b9ad9 100644
--- a/src/com/android/documentsui/StubSelectionTracker.java
+++ b/src/com/android/documentsui/DummySelectionTracker.java
@@ -26,11 +26,10 @@
 import java.util.Set;
 
 /**
- * A stub SelectionTracker used by DocsSelectionHelper before a real SelectionTracker has been
+ * A dummy SelectionTracker used by DocsSelectionHelper before a real SelectionTracker has been
  * initialized by DirectoryFragment.
- * @param <K> Selection key type which extends {@link SelectionTracker}.
  */
-public class StubSelectionTracker<K> extends SelectionTracker<K> {
+public class DummySelectionTracker<K> extends SelectionTracker<K> {
 
     @Override
     public void addObserver(SelectionObserver observer) {
diff --git a/src/com/android/documentsui/MetricConsts.java b/src/com/android/documentsui/MetricConsts.java
index c969f82..853dbe9 100644
--- a/src/com/android/documentsui/MetricConsts.java
+++ b/src/com/android/documentsui/MetricConsts.java
@@ -23,7 +23,7 @@
 
 /**
  * All constants are based on the enums in
- * frameworks/proto_logging/stats/enums/stats/docsui/docsui_enums.proto.
+ * frameworks/base/core/proto/android/stats/docsui/docsui_enums.proto.
  */
 public class MetricConsts {
 
@@ -400,4 +400,4 @@
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface SearchMode {}
-}
+}
\ No newline at end of file
diff --git a/src/com/android/documentsui/NavigationViewManager.java b/src/com/android/documentsui/NavigationViewManager.java
index 83979ab..b09b3c0 100644
--- a/src/com/android/documentsui/NavigationViewManager.java
+++ b/src/com/android/documentsui/NavigationViewManager.java
@@ -19,27 +19,20 @@
 import static com.android.documentsui.base.SharedMinimal.VERBOSE;
 
 import android.content.res.Resources;
-import android.content.res.TypedArray;
 import android.graphics.Outline;
-import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewOutlineProvider;
-import android.view.Window;
-import android.view.WindowManager;
 import android.widget.FrameLayout;
 
-import androidx.annotation.ColorRes;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.content.ContextCompat;
 
 import com.android.documentsui.base.RootInfo;
 import com.android.documentsui.base.State;
 import com.android.documentsui.base.UserId;
 import com.android.documentsui.dirlist.AnimationView;
-import com.android.documentsui.util.VersionUtils;
 
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.appbar.CollapsingToolbarLayout;
@@ -49,13 +42,12 @@
 /**
  * A facade over the portions of the app and drawer toolbars.
  */
-public class NavigationViewManager implements AppBarLayout.OnOffsetChangedListener {
+public class NavigationViewManager {
 
     private static final String TAG = "NavigationViewManager";
 
     private final DrawerController mDrawer;
     private final Toolbar mToolbar;
-    private final BaseActivity mActivity;
     private final View mHeader;
     private final State mState;
     private final NavigationViewManager.Environment mEnv;
@@ -69,7 +61,6 @@
     private final boolean mShowSearchBar;
 
     private boolean mIsActionModeActivated = false;
-    private @ColorRes int mDefaultStatusBarColorResId;
 
     public NavigationViewManager(
             BaseActivity activity,
@@ -80,7 +71,6 @@
             View tabLayoutContainer,
             UserIdManager userIdManager) {
 
-        mActivity = activity;
         mToolbar = activity.findViewById(R.id.toolbar);
         mHeader = activity.findViewById(R.id.directory_header);
         mDrawer = drawer;
@@ -103,15 +93,6 @@
         mDefaultOutlineProvider = mToolbar.getOutlineProvider();
         mShowSearchBar = activity.getResources().getBoolean(R.bool.show_search_bar);
 
-        final int[] styledAttrs = {android.R.attr.statusBarColor};
-        TypedArray a = mActivity.obtainStyledAttributes(styledAttrs);
-        mDefaultStatusBarColorResId = a.getResourceId(0, -1);
-        if (mDefaultStatusBarColorResId == -1) {
-            Log.w(TAG, "Retrieve statusBarColorResId from theme failed, assigned default");
-            mDefaultStatusBarColorResId = R.color.app_background_color;
-        }
-        a.recycle();
-
         final Resources resources = mToolbar.getResources();
         final int radius = resources.getDimensionPixelSize(R.dimen.search_bar_radius);
         final int marginStart =
@@ -127,36 +108,6 @@
         };
     }
 
-    @Override
-    public void onOffsetChanged(AppBarLayout appBarLayout, int offset) {
-        if (!VersionUtils.isAtLeastS()) {
-            return;
-        }
-
-        // For S+ Only. Change toolbar color dynamically based on scroll offset.
-        // Usually this can be done in xml using app:contentScrim and app:statusBarScrim, however
-        // in our case since we also put directory_header.xml inside the CollapsingToolbarLayout,
-        // the scrim will also cover the directory header. Long term need to think about how to
-        // move directory_header out of the AppBarLayout.
-
-        Window window = mActivity.getWindow();
-        View actionBar = window.getDecorView().findViewById(R.id.action_mode_bar);
-        int dynamicHeaderColor = ContextCompat.getColor(mActivity,
-                offset == 0 ? mDefaultStatusBarColorResId : R.color.color_surface_header);
-        if (actionBar != null) {
-            // Action bar needs to be updated separately for selection mode.
-            actionBar.setBackgroundColor(dynamicHeaderColor);
-        }
-
-        window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-        window.setStatusBarColor(dynamicHeaderColor);
-        if (shouldShowSearchBar()) {
-            // Do not change search bar background.
-        } else {
-            mToolbar.setBackground(new ColorDrawable(dynamicHeaderColor));
-        }
-    }
-
     public void setSearchBarClickListener(View.OnClickListener listener) {
         mSearchBarView.setOnClickListener(listener);
     }
diff --git a/src/com/android/documentsui/PreBootReceiver.java b/src/com/android/documentsui/PreBootReceiver.java
index f5ad939..c476316 100644
--- a/src/com/android/documentsui/PreBootReceiver.java
+++ b/src/com/android/documentsui/PreBootReceiver.java
@@ -30,7 +30,6 @@
 import android.util.Log;
 
 import com.android.documentsui.theme.ThemeOverlayManager;
-import com.android.documentsui.util.VersionUtils;
 
 /**
  * A receiver listening action.PRE_BOOT_COMPLETED event for setting component enable or disable.
@@ -92,15 +91,11 @@
         int resId = overlayRes.getIdentifier(config, "bool", overlayPkg);
         if (resId != 0) {
             final ComponentName component = new ComponentName(packageName, className);
-            boolean enabled = overlayRes.getBoolean(resId);
-            if (VersionUtils.isAtLeastS() && CONFIG_IS_LAUNCHER_ENABLED.equals(config)) {
-                enabled = false; // Do not allow LauncherActivity to be enabled for S+.
-            }
+            final boolean value = overlayRes.getBoolean(resId);
             if (DEBUG) {
-                Log.i(TAG,
-                        "Overlay package:" + overlayPkg + ", customize " + config + ":" + enabled);
+                Log.i(TAG, "Overlay package:" + overlayPkg + ", customize " + config + ":" + value);
             }
-            pm.setComponentEnabledSetting(component, enabled
+            pm.setComponentEnabledSetting(component, value
                             ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
                             : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
                     PackageManager.DONT_KILL_APP);
diff --git a/src/com/android/documentsui/ProfileTabs.java b/src/com/android/documentsui/ProfileTabs.java
index 3d59051..7149de6 100644
--- a/src/com/android/documentsui/ProfileTabs.java
+++ b/src/com/android/documentsui/ProfileTabs.java
@@ -20,14 +20,12 @@
 
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 
 import androidx.annotation.Nullable;
 
 import com.android.documentsui.base.RootInfo;
 import com.android.documentsui.base.State;
 import com.android.documentsui.base.UserId;
-import com.android.documentsui.util.VersionUtils;
 
 import com.google.android.material.tabs.TabLayout;
 import com.google.common.base.Objects;
@@ -51,7 +49,6 @@
     @Nullable
     private Listener mListener;
     private TabLayout.OnTabSelectedListener mOnTabSelectedListener;
-    private View mTabSeparator;
 
     public ProfileTabs(View tabLayoutContainer, State state, UserIdManager userIdManager,
             NavigationViewManager.Environment env,
@@ -64,8 +61,6 @@
         mUserIdManager = checkNotNull(userIdManager);
         mTabs.removeAllTabs();
         mUserIds = Collections.singletonList(UserId.CURRENT_USER);
-        mTabSeparator = tabLayoutContainer.findViewById(R.id.tab_separator);
-
         mOnTabSelectedListener = new TabLayout.OnTabSelectedListener() {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
@@ -101,38 +96,6 @@
             mTabs.addOnTabSelectedListener(mOnTabSelectedListener);
         }
         mTabsContainer.setVisibility(shouldShow() ? View.VISIBLE : View.GONE);
-
-        // Material next changes apply only for version S or greater
-        if(VersionUtils.isAtLeastS()) {
-            mTabSeparator.setVisibility(View.GONE);
-            int tabContainerHeightInDp = (int)mTabsContainer.getContext().getResources().
-                getDimension(R.dimen.tab_container_height);
-            mTabsContainer.getLayoutParams().height = tabContainerHeightInDp;
-            ViewGroup.MarginLayoutParams tabContainerMarginLayoutParams =
-                (ViewGroup.MarginLayoutParams) mTabsContainer.getLayoutParams();
-            int tabContainerMarginTop = (int)mTabsContainer.getContext().getResources().
-                getDimension(R.dimen.profile_tab_margin_top);
-            tabContainerMarginLayoutParams.setMargins(0, tabContainerMarginTop, 0, 0);
-            mTabsContainer.requestLayout();
-            for (int i = 0; i < mTabs.getTabCount(); i++) {
-
-                // Tablayout holds a view that contains the individual tab
-                View tab = ((ViewGroup) mTabs.getChildAt(0)).getChildAt(i);
-
-                // Get individual tab to set the style
-                ViewGroup.MarginLayoutParams marginLayoutParams =
-                        (ViewGroup.MarginLayoutParams) tab.getLayoutParams();
-                int tabMarginSide = (int)mTabsContainer.getContext().getResources().
-                    getDimension(R.dimen.profile_tab_margin_side);
-                marginLayoutParams.setMargins(tabMarginSide, 0, tabMarginSide, 0);
-                int tabHeightInDp = (int)mTabsContainer.getContext().getResources().
-                    getDimension(R.dimen.tab_height);
-                tab.getLayoutParams().height = tabHeightInDp;
-                tab.requestLayout();
-                tab.setBackgroundResource(R.drawable.tab_border_rounded);
-            }
-
-        }
     }
 
     public void setListener(@Nullable Listener listener) {
diff --git a/src/com/android/documentsui/base/StubLookup.java b/src/com/android/documentsui/base/DummyLookup.java
similarity index 79%
rename from src/com/android/documentsui/base/StubLookup.java
rename to src/com/android/documentsui/base/DummyLookup.java
index 2a2dc9b..11a6375 100644
--- a/src/com/android/documentsui/base/StubLookup.java
+++ b/src/com/android/documentsui/base/DummyLookup.java
@@ -17,10 +17,8 @@
 
 /**
  * Lookup that always returns null.
- * @param <K> input type (the "key") which implements {@link Lookup}.
- * @param <V> output type (the "value") which implements {@link Lookup}.
  */
-public final class StubLookup<K, V> implements Lookup<K, V> {
+public final class DummyLookup<K, V> implements Lookup<K, V> {
     @Override
     public V lookup(K key) {
         return null;
diff --git a/src/com/android/documentsui/base/Shared.java b/src/com/android/documentsui/base/Shared.java
index 5ac9de4..55a32b6 100644
--- a/src/com/android/documentsui/base/Shared.java
+++ b/src/com/android/documentsui/base/Shared.java
@@ -171,10 +171,6 @@
      * Whether the calling app should be restricted in Storage Access Framework or not.
      */
     public static boolean shouldRestrictStorageAccessFramework(Activity activity) {
-        if (VersionUtils.isAtLeastS()) {
-            return true;
-        }
-
         if (!VersionUtils.isAtLeastR()) {
             return false;
         }
diff --git a/src/com/android/documentsui/dirlist/DirectoryFragment.java b/src/com/android/documentsui/dirlist/DirectoryFragment.java
index a5306bd..41fe766 100644
--- a/src/com/android/documentsui/dirlist/DirectoryFragment.java
+++ b/src/com/android/documentsui/dirlist/DirectoryFragment.java
@@ -111,7 +111,6 @@
 import com.android.documentsui.sorting.SortDimension;
 import com.android.documentsui.sorting.SortModel;
 
-import com.android.documentsui.util.VersionUtils;
 import com.google.common.base.Objects;
 
 import java.io.IOException;
@@ -369,7 +368,7 @@
         mRecView.setItemAnimator(new DirectoryItemAnimator());
 
         mInjector = mActivity.getInjector();
-        // Initially, this selection tracker (delegator) uses a stub implementation, so it must be
+        // Initially, this selection tracker (delegator) uses a dummy implementation, so it must be
         // updated (reset) when necessary things are ready.
         mSelectionMgr = mInjector.selectionMgr;
         mModel = mInjector.getModel();
@@ -494,7 +493,7 @@
                         this::getModelId,
                         mRecView::findChildViewUnder,
                         DocumentsApplication.getDragAndDropManager(mActivity))
-                : DragStartListener.STUB;
+                : DragStartListener.DUMMY;
 
         {
             // Limiting the scope of the localTracker so nobody uses it.
@@ -1429,11 +1428,8 @@
                 // update. We need to update the menu here to ensure the status is correct.
                 mInjector.menuManager.updateModel(mModel);
                 mInjector.menuManager.updateOptionMenu();
-                if (VersionUtils.isAtLeastS()) {
-                    mActivity.updateHeader(update.hasCrossProfileException());
-                } else {
-                    mActivity.updateHeaderTitle();
-                }
+
+                mActivity.updateHeaderTitle();
             }
         }
     }
diff --git a/src/com/android/documentsui/dirlist/DocumentsAdapter.java b/src/com/android/documentsui/dirlist/DocumentsAdapter.java
index 41ce73c..7d09d68 100644
--- a/src/com/android/documentsui/dirlist/DocumentsAdapter.java
+++ b/src/com/android/documentsui/dirlist/DocumentsAdapter.java
@@ -36,8 +36,8 @@
 /**
  * DocumentsAdapter provides glue between a directory Model, and RecyclerView. We've
  * abstracted this a bit in order to decompose some specialized support
- * for adding stub layout objects (@see SectionBreakDocumentsAdapter). Handling of the
- * stub layout objects was error prone when interspersed with the core mode / adapter code.
+ * for adding dummy layout objects (@see SectionBreakDocumentsAdapter). Handling of the
+ * dummy layout objects was error prone when interspersed with the core mode / adapter code.
  *
  * @see ModelBackedDocumentsAdapter
  * @see DirectoryAddonsAdapter
diff --git a/src/com/android/documentsui/dirlist/DragStartListener.java b/src/com/android/documentsui/dirlist/DragStartListener.java
index 0adddcc..8fe0872 100644
--- a/src/com/android/documentsui/dirlist/DragStartListener.java
+++ b/src/com/android/documentsui/dirlist/DragStartListener.java
@@ -48,7 +48,7 @@
  */
 interface DragStartListener {
 
-    DragStartListener STUB = new DragStartListener() {
+    static final DragStartListener DUMMY = new DragStartListener() {
         @Override
         public boolean onDragEvent(MotionEvent event) {
             return false;
diff --git a/src/com/android/documentsui/dirlist/GridDirectoryHolder.java b/src/com/android/documentsui/dirlist/GridDirectoryHolder.java
index 0357f12..930773b 100644
--- a/src/com/android/documentsui/dirlist/GridDirectoryHolder.java
+++ b/src/com/android/documentsui/dirlist/GridDirectoryHolder.java
@@ -81,8 +81,7 @@
 
     @Override
     public boolean inSelectRegion(MotionEvent event) {
-        return mAction == State.ACTION_BROWSE ? Views.isEventOver(event, itemView.getParent(),
-                mIconLayout) : false;
+        return mAction == State.ACTION_BROWSE ? Views.isEventOver(event, mIconLayout) : false;
     }
 
     /**
diff --git a/src/com/android/documentsui/dirlist/GridDocumentHolder.java b/src/com/android/documentsui/dirlist/GridDocumentHolder.java
index 1a3e24e..631298f 100644
--- a/src/com/android/documentsui/dirlist/GridDocumentHolder.java
+++ b/src/com/android/documentsui/dirlist/GridDocumentHolder.java
@@ -137,12 +137,12 @@
 
     @Override
     public boolean inSelectRegion(MotionEvent event) {
-        return Views.isEventOver(event, itemView.getParent(), mIconLayout);
+        return Views.isEventOver(event, mIconLayout);
     }
 
     @Override
     public boolean inPreviewIconRegion(MotionEvent event) {
-        return Views.isEventOver(event, itemView.getParent(), mPreviewIcon);
+        return Views.isEventOver(event, mPreviewIcon);
     }
 
     /**
diff --git a/src/com/android/documentsui/dirlist/GridPhotoHolder.java b/src/com/android/documentsui/dirlist/GridPhotoHolder.java
index 2b5e5e2..b415eba 100644
--- a/src/com/android/documentsui/dirlist/GridPhotoHolder.java
+++ b/src/com/android/documentsui/dirlist/GridPhotoHolder.java
@@ -125,7 +125,7 @@
 
     @Override
     public boolean inPreviewIconRegion(MotionEvent event) {
-        return Views.isEventOver(event, itemView.getParent(), mPreviewIcon);
+        return Views.isEventOver(event, mPreviewIcon);
     }
 
     /**
diff --git a/src/com/android/documentsui/dirlist/InflateMessageDocumentHolder.java b/src/com/android/documentsui/dirlist/InflateMessageDocumentHolder.java
index 2e2b921..4b11136 100644
--- a/src/com/android/documentsui/dirlist/InflateMessageDocumentHolder.java
+++ b/src/com/android/documentsui/dirlist/InflateMessageDocumentHolder.java
@@ -26,7 +26,6 @@
 import android.widget.TextView;
 
 import com.android.documentsui.R;
-import com.android.documentsui.util.VersionUtils;
 
 /**
  * RecyclerView.ViewHolder class that displays a message when there are no contents
@@ -109,11 +108,7 @@
         } else {
             mCrossProfileMessage.setVisibility(View.GONE);
         }
-        if (VersionUtils.isAtLeastS()) {
-            mCrossProfileImage.setVisibility(View.GONE);
-        } else {
-            mCrossProfileImage.setImageDrawable(mMessage.getIcon());
-        }
+        mCrossProfileImage.setImageDrawable(mMessage.getIcon());
         if (!TextUtils.isEmpty(mMessage.getButtonString())) {
             mCrossProfileButton.setVisibility(View.VISIBLE);
             mCrossProfileButton.setText(mMessage.getButtonString());
diff --git a/src/com/android/documentsui/dirlist/ListDocumentHolder.java b/src/com/android/documentsui/dirlist/ListDocumentHolder.java
index 9849006..f6a9002 100644
--- a/src/com/android/documentsui/dirlist/ListDocumentHolder.java
+++ b/src/com/android/documentsui/dirlist/ListDocumentHolder.java
@@ -180,12 +180,12 @@
     @Override
     public boolean inSelectRegion(MotionEvent event) {
         return (mDoc.isDirectory() && !(mAction == State.ACTION_BROWSE)) ?
-                false : Views.isEventOver(event, itemView.getParent(), mIconLayout);
+                false : Views.isEventOver(event, mIconLayout);
     }
 
     @Override
     public boolean inPreviewIconRegion(MotionEvent event) {
-        return Views.isEventOver(event, itemView.getParent(), mPreviewIcon);
+        return Views.isEventOver(event, mPreviewIcon);
     }
 
     /**
diff --git a/src/com/android/documentsui/files/FilesActivity.java b/src/com/android/documentsui/files/FilesActivity.java
index 7c09811..a256726 100644
--- a/src/com/android/documentsui/files/FilesActivity.java
+++ b/src/com/android/documentsui/files/FilesActivity.java
@@ -37,6 +37,7 @@
 import com.android.documentsui.BaseActivity;
 import com.android.documentsui.DocsSelectionHelper;
 import com.android.documentsui.DocumentsApplication;
+import com.android.documentsui.DummyProfileTabsAddons;
 import com.android.documentsui.FocusManager;
 import com.android.documentsui.Injector;
 import com.android.documentsui.MenuManager.DirectoryDetails;
@@ -48,7 +49,6 @@
 import com.android.documentsui.R;
 import com.android.documentsui.SharedInputHandler;
 import com.android.documentsui.ShortcutsUpdater;
-import com.android.documentsui.StubProfileTabsAddons;
 import com.android.documentsui.base.DocumentInfo;
 import com.android.documentsui.base.Features;
 import com.android.documentsui.base.RootInfo;
@@ -76,7 +76,7 @@
     private Injector<ActionHandler<FilesActivity>> mInjector;
     private ActivityInputHandler mActivityInputHandler;
     private SharedInputHandler mSharedInputHandler;
-    private final ProfileTabsAddons mProfileTabsAddonsStub = new StubProfileTabsAddons();
+    private final ProfileTabsAddons mProfileTabsAddonsStub = new DummyProfileTabsAddons();
 
     public FilesActivity() {
         super(R.layout.files_activity, TAG);
@@ -151,7 +151,7 @@
 
         mInjector.searchManager = mSearchManager;
 
-        // No profile tabs will be shown on FilesActivity. Use a stub to avoid unnecessary
+        // No profile tabs will be shown on FilesActivity. Use a dummy to avoid unnecessary
         // operations.
         mInjector.profileTabsController = new ProfileTabsController(
                 mInjector.selectionMgr,
diff --git a/src/com/android/documentsui/inspector/DebugView.java b/src/com/android/documentsui/inspector/DebugView.java
index 908d192..ffd4b7e 100644
--- a/src/com/android/documentsui/inspector/DebugView.java
+++ b/src/com/android/documentsui/inspector/DebugView.java
@@ -27,8 +27,8 @@
 
 import com.android.documentsui.R;
 import com.android.documentsui.base.DocumentInfo;
+import com.android.documentsui.base.DummyLookup;
 import com.android.documentsui.base.Lookup;
-import com.android.documentsui.base.StubLookup;
 import com.android.documentsui.inspector.InspectorController.DebugDisplay;
 
 import java.text.NumberFormat;
@@ -47,7 +47,7 @@
 
     private final Context mContext;
     private final Resources mRes;
-    private Lookup<String, Executor> mExecutors = new StubLookup<>();
+    private Lookup<String, Executor> mExecutors = new DummyLookup<>();
 
     public DebugView(Context context) {
         this(context, null);
diff --git a/src/com/android/documentsui/services/Job.java b/src/com/android/documentsui/services/Job.java
index 71f0ae8..0b1b158 100644
--- a/src/com/android/documentsui/services/Job.java
+++ b/src/com/android/documentsui/services/Job.java
@@ -310,8 +310,7 @@
                         failureCount, failureCount))
                 .setContentText(service.getString(R.string.notification_touch_for_details))
                 .setContentIntent(PendingIntent.getActivity(appContext, 0, navigateIntent,
-                        PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT
-                        | PendingIntent.FLAG_MUTABLE))
+                        PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT))
                 .setCategory(Notification.CATEGORY_ERROR)
                 .setSmallIcon(icon)
                 .setAutoCancel(true);
@@ -343,8 +342,7 @@
                         service,
                         0,
                         cancelIntent,
-                        PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_CANCEL_CURRENT
-                        | PendingIntent.FLAG_MUTABLE));
+                        PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_CANCEL_CURRENT));
 
         return progressBuilder;
     }
diff --git a/src/com/android/documentsui/sidebar/RootItem.java b/src/com/android/documentsui/sidebar/RootItem.java
index a0a3210..9af396e 100644
--- a/src/com/android/documentsui/sidebar/RootItem.java
+++ b/src/com/android/documentsui/sidebar/RootItem.java
@@ -210,13 +210,13 @@
     }
 
     /**
-     * Creates a stub root item for a user. A stub root item is used as a place holder when
+     * Creates a dummy root item for a user. A dummy root item is used as a place holder when
      * there is no such root available. We can therefore show the item on the UI.
      */
-    public static RootItem createStubItem(RootItem item, UserId targetUser) {
-        RootInfo stubRootInfo = RootInfo.copyRootInfo(item.root);
-        stubRootInfo.userId = targetUser;
-        RootItem stub = new RootItem(stubRootInfo, item.mActionHandler, item.mMaybeShowBadge);
-        return stub;
+    public static RootItem createDummyItem(RootItem item, UserId targetUser) {
+        RootInfo dummyRootInfo = RootInfo.copyRootInfo(item.root);
+        dummyRootInfo.userId = targetUser;
+        RootItem dummy = new RootItem(dummyRootInfo, item.mActionHandler, item.mMaybeShowBadge);
+        return dummy;
     }
 }
diff --git a/src/com/android/documentsui/sidebar/RootItemListBuilder.java b/src/com/android/documentsui/sidebar/RootItemListBuilder.java
index b29bd0d..4bdce15 100644
--- a/src/com/android/documentsui/sidebar/RootItemListBuilder.java
+++ b/src/com/android/documentsui/sidebar/RootItemListBuilder.java
@@ -37,7 +37,7 @@
  * selected user.
  *
  * <p>If no root of the selected user was added but that of the other user was added,
- * a stub root of that root for the selected user will be generated.
+ * a dummy root of that root for the selected user will be generated.
  *
  * <p>The builder group the roots using {@link Item#stringId} as key.
  *
@@ -45,9 +45,9 @@
  * itemC[10], itemX[0],itemY[10] where root itemX, itemY do not support cross profile.
  *
  * <p>When the selected user is user 0, {@link #getList()} returns itemA[0], itemB[0],
- * stubC[0], itemX[0], itemY[10].
+ * dummyC[0], itemX[0], itemY[10].
  *
- * <p>When the selected user is user 10, {@link #getList()} returns itemA[10], stubB[10],
+ * <p>When the selected user is user 10, {@link #getList()} returns itemA[10], dummyB[10],
  * itemC[10], itemX[0], itemY[10].
  */
 class RootItemListBuilder {
@@ -87,7 +87,7 @@
             return items;
         }
 
-        // If the root supports cross-profile, we return the added root or create a stub root if
+        // If the root supports cross-profile, we return the added root or create a dummy root if
         // it was not added for the selected user.
         for (RootItem item : items) {
             if (item.userId.equals(mSelectedUser)) {
@@ -96,6 +96,6 @@
             }
         }
 
-        return Collections.singletonList(RootItem.createStubItem(testRootItem, mSelectedUser));
+        return Collections.singletonList(RootItem.createDummyItem(testRootItem, mSelectedUser));
     }
 }
diff --git a/src/com/android/documentsui/sidebar/SpacerItem.java b/src/com/android/documentsui/sidebar/SpacerItem.java
index 44dd75c..d0f49c9 100644
--- a/src/com/android/documentsui/sidebar/SpacerItem.java
+++ b/src/com/android/documentsui/sidebar/SpacerItem.java
@@ -25,7 +25,7 @@
 import com.android.documentsui.base.UserId;
 
 /**
- * Stub {@link Item} for dividers between different types of {@link Item}s.
+ * Dummy {@link Item} for dividers between different types of {@link Item}s.
  */
 class SpacerItem extends Item {
     private static final String TAG = "SpacerItem";
diff --git a/src/com/android/documentsui/ui/Views.java b/src/com/android/documentsui/ui/Views.java
index cebd0cc..2ac27b2 100644
--- a/src/com/android/documentsui/ui/Views.java
+++ b/src/com/android/documentsui/ui/Views.java
@@ -19,8 +19,6 @@
 import android.graphics.Rect;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewParent;
 
 /**
  * A utility class for working with Views.
@@ -30,44 +28,22 @@
     private Views() {}
 
     /**
-     *
-     * Return whether the event is in the view's region. We determine it with in the coordinate
-     * of the parent view that dispatches the motion event.
+     * Return whether the event is in the view's region
      * @param event the motion event
-     * @param eventSource the view dispatching the motion events.
      * @param view the view to check the selection region
      * @return True, if the event is in the region. Otherwise, return false.
      */
-
-    public static boolean isEventOver(MotionEvent event, ViewParent eventSource, View view) {
+    public static boolean isEventOver(MotionEvent event, View view) {
         if (view == null || event == null || !view.isAttachedToWindow()) {
             return false;
         }
 
-        View parent = null;
-        if (eventSource instanceof ViewGroup) {
-            parent = (View) eventSource;
-        }
-
-        final Rect viewBoundsOnGlobalCoordinate = getBoundsOnScreen(view);
-
-        // If the parent is null, it means view is the view root of the window, so the event
-        // should be from view itself, in this case we don't need any offset.
-        final int[] viewParentCoord = new int[2];
-        if (parent != null) {
-            parent.getLocationOnScreen(viewParentCoord);
-        }
-
-        Rect viewBoundsOnParentViewCoordinate = new Rect(viewBoundsOnGlobalCoordinate);
-        viewBoundsOnParentViewCoordinate.offset(-viewParentCoord[0], -viewParentCoord[1]);
-        return viewBoundsOnParentViewCoordinate.contains((int) event.getX(), (int) event.getY());
-    }
-
-    private static Rect getBoundsOnScreen(View view) {
         final int[] coord = new int[2];
         view.getLocationOnScreen(coord);
 
-        return new Rect(coord[0], coord[1], coord[0] + view.getMeasuredWidth(),
+        final Rect viewRect = new Rect(coord[0], coord[1], coord[0] + view.getMeasuredWidth(),
                 coord[1] + view.getMeasuredHeight());
+
+        return viewRect.contains((int) event.getRawX(), (int) event.getRawY());
     }
 }
diff --git a/src/com/android/documentsui/util/VersionUtils.java b/src/com/android/documentsui/util/VersionUtils.java
index aba6374..58ae3cd 100644
--- a/src/com/android/documentsui/util/VersionUtils.java
+++ b/src/com/android/documentsui/util/VersionUtils.java
@@ -27,19 +27,10 @@
     }
 
     /**
-     * Returns whether the device is running on Android R or newer.
+     * Returns whether the device is running on the Android R or newer.
      */
     public static boolean isAtLeastR() {
-        return isAtLeastS() // Keep reference to isAtLeastS() so it's not stripped from test apk
-                || Build.VERSION.CODENAME.equals("R")
-                || Build.VERSION.SDK_INT >= 30;
-    }
-
-    /**
-     * Returns whether the device is running on Android S or newer.
-     */
-    public static boolean isAtLeastS() {
-        return Build.VERSION.CODENAME.equals("S")
-                || Build.VERSION.SDK_INT >= 31;
+        return Build.VERSION.CODENAME.equals("R")
+                || (Build.VERSION.CODENAME.equals("REL") && Build.VERSION.SDK_INT >= 30);
     }
 }
diff --git a/tests/Android.bp b/tests/Android.bp
index dd7b23b..e0b427d 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -12,10 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
 filegroup {
     name: "DocumentsUIPerfTests-files",
     srcs: [
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index d5e9a60..cb43811 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -9,8 +9,7 @@
     <application android:label="DocumentsUI Tests">
         <uses-library android:name="android.test.runner" />
 
-        <activity android:name="com.android.documentsui.SettingsActivity"
-            android:exported="true">
+        <activity android:name="com.android.documentsui.SettingsActivity">
             <intent-filter>
                 <action android:name="android.provider.action.DOCUMENT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -21,8 +20,7 @@
         </activity>
 
         <!--Needed for demo'ing and functional testing the open in provider feature in inspector -->
-        <activity android:name="com.android.documentsui.TestProviderActivity"
-          android:exported="true">
+        <activity android:name="com.android.documentsui.TestProviderActivity">
           <intent-filter>
             <action android:name="android.provider.action.DOCUMENT_SETTINGS" />
             <category android:name="android.intent.category.DEFAULT" />
@@ -32,8 +30,7 @@
           </intent-filter>
         </activity>
 
-        <activity android:name="com.android.documentsui.AuthenticationActivity"
-            android:exported="true">
+        <activity android:name="com.android.documentsui.AuthenticationActivity">
             <intent-filter>
                 <action android:name="com.android.documentsui.test.action.AUTHENTICATE" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -133,7 +130,6 @@
 
         <service android:name="com.android.documentsui.services.TestNotificationService"
                  android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"
-                 android:exported="true"
                  android:process="com.android.documentsui">
             <intent-filter>
                 <action android:name="android.service.notification.NotificationListenerService" />
diff --git a/tests/common/com/android/documentsui/InspectorProvider.java b/tests/common/com/android/documentsui/InspectorProvider.java
index 7227993..1d678d1 100644
--- a/tests/common/com/android/documentsui/InspectorProvider.java
+++ b/tests/common/com/android/documentsui/InspectorProvider.java
@@ -34,10 +34,10 @@
  *
  *  Structure of the provider.
  *
- *         Top ------------> Middle  ------> Bottom -------> Stub21 50B
- *         openInProvider    Stub1 50B       Stub11 50B      Stub22 150B
- *         test.txt          Stub2 150B      Stub12 150B     Stub23 100B
- *         update.txt        Stub3 100B      Stub13 100B
+ *         Top ------------> Middle  ------> Bottom -------> Dummy21 50B
+ *         openInProvider    Dummy1 50B      Dummy11 50B     Dummy22 150B
+ *         test.txt          Dummy2 150B     Dummy12 150B    Dummy23 100B
+ *         update.txt        Dummy3 100B     Dummy13 100B
  *         test.jpg
  *         invalid.jpg
  */
@@ -97,24 +97,24 @@
         if("Top".equals(s)) {
             MatrixCursor c = createDocCursor(projection);
             addFolder(c, "Middle");
-            addFileWithSize(c, "stub1", 50);
-            addFileWithSize(c, "stub2", 150);
-            addFileWithSize(c, "stub3", 100);
+            addFileWithSize(c, "dummy1", 50);
+            addFileWithSize(c, "dummy2", 150);
+            addFileWithSize(c, "dummy3", 100);
             return c;
         }
         else if("Middle".equals(s)) {
             MatrixCursor c = createDocCursor(projection);
             addFolder(c, "Bottom");
-            addFileWithSize(c, "stub11", 50);
-            addFileWithSize(c, "stub12", 150);
-            addFileWithSize(c, "stub13", 100);
+            addFileWithSize(c, "dummy11", 50);
+            addFileWithSize(c, "dummy12", 150);
+            addFileWithSize(c, "dummy13", 100);
             return c;
         }
         else if("Bottom".equals(s)) {
             MatrixCursor c = createDocCursor(projection);
-            addFileWithSize(c, "stub21", 50);
-            addFileWithSize(c, "stub22", 150);
-            addFileWithSize(c, "stub23", 100);
+            addFileWithSize(c, "dummy21", 50);
+            addFileWithSize(c, "dummy22", 150);
+            addFileWithSize(c, "dummy23", 100);
             return c;
         }
         else {
diff --git a/tests/common/com/android/documentsui/bots/SearchBot.java b/tests/common/com/android/documentsui/bots/SearchBot.java
index d14fd13..13494f0 100644
--- a/tests/common/com/android/documentsui/bots/SearchBot.java
+++ b/tests/common/com/android/documentsui/bots/SearchBot.java
@@ -49,7 +49,7 @@
  */
 public class SearchBot extends Bots.BaseBot {
 
-    // Base search layout changes substantially between Ryu and Angler.
+    // Dumb search layout changes substantially between Ryu and Angler.
     @SuppressWarnings("unchecked")
     private static final Matcher<View> SEARCH_WIDGET = allOf(
             withId(R.id.option_menu_search),
diff --git a/tests/common/com/android/documentsui/dirlist/TestFocusHandler.java b/tests/common/com/android/documentsui/dirlist/TestFocusHandler.java
index 969ddcf..5656655 100644
--- a/tests/common/com/android/documentsui/dirlist/TestFocusHandler.java
+++ b/tests/common/com/android/documentsui/dirlist/TestFocusHandler.java
@@ -22,7 +22,7 @@
 import android.view.View;
 
 /**
- * A purely placeholder instance of FocusHandler.
+ * A purely dummy instance of FocusHandler.
  */
 public final class TestFocusHandler implements FocusHandler {
 
diff --git a/tests/common/com/android/documentsui/testing/TestEnv.java b/tests/common/com/android/documentsui/testing/TestEnv.java
index 3249c8c..e5c7eb8 100644
--- a/tests/common/com/android/documentsui/testing/TestEnv.java
+++ b/tests/common/com/android/documentsui/testing/TestEnv.java
@@ -192,7 +192,7 @@
         DocumentInfo rootDoc = model.getDocument(
                 ModelId.build(model.mUserId, TestProvidersAccess.HOME.authority, "1"));
 
-        // These are test setup quick checks, not test assertions.
+        // These are test setup sanity checks, not test assertions.
         assert rootDoc != null;
         assert rootDoc.isDirectory();
         assert FOLDER_0.equals(rootDoc);
diff --git a/tests/common/com/android/documentsui/testing/Views.java b/tests/common/com/android/documentsui/testing/Views.java
index 6f5b1a2..30f79a6 100644
--- a/tests/common/com/android/documentsui/testing/Views.java
+++ b/tests/common/com/android/documentsui/testing/Views.java
@@ -34,7 +34,7 @@
     }
 
     /*
-     * Mock View object with (x, y) coordinates
+     * Dummy View object with (x, y) coordinates
      */
     public static View createTestView(float x, float y) {
         View view = createTestView();
diff --git a/tests/functional/com/android/documentsui/CancelFromNotificationUiTest.java b/tests/functional/com/android/documentsui/CancelFromNotificationUiTest.java
index 953e350..0697056 100644
--- a/tests/functional/com/android/documentsui/CancelFromNotificationUiTest.java
+++ b/tests/functional/com/android/documentsui/CancelFromNotificationUiTest.java
@@ -47,7 +47,7 @@
 public class CancelFromNotificationUiTest extends ActivityTest<FilesActivity> {
     private static final String TAG = "CancelFromNotificationUiTest";
 
-    private static final String TARGET_FILE = "stub.data";
+    private static final String TARGET_FILE = "dummy.data";
 
     private static final int BUFFER_SIZE = 10 * 1024 * 1024;
 
@@ -127,20 +127,20 @@
     @Override
     public void initTestFiles() throws RemoteException {
         try {
-            createStubFile();
+            createDummyFile();
         } catch (Exception e) {
             fail("Initialization failed. " + e.toString());
         }
     }
 
-    private void createStubFile() throws Exception {
+    private void createDummyFile() throws Exception {
         Uri uri = mDocsHelper.createDocument(rootDir0, "*/*", TARGET_FILE);
-        byte[] stubByte = new byte[BUFFER_SIZE];
-        mDocsHelper.writeDocument(uri, stubByte);
+        byte[] dummyByte = new byte[BUFFER_SIZE];
+        mDocsHelper.writeDocument(uri, dummyByte);
         for (int i = 0; i < 49; i++) {
-            stubByte = null;
-            stubByte = new byte[BUFFER_SIZE];
-            mDocsHelper.writeAppendDocument(uri, stubByte, stubByte.length);
+            dummyByte = null;
+            dummyByte = new byte[BUFFER_SIZE];
+            mDocsHelper.writeAppendDocument(uri, dummyByte, dummyByte.length);
         }
     }
 
diff --git a/tests/functional/com/android/documentsui/FileDeleteUiTest.java b/tests/functional/com/android/documentsui/FileDeleteUiTest.java
index 5a13962..d68dbd6 100644
--- a/tests/functional/com/android/documentsui/FileDeleteUiTest.java
+++ b/tests/functional/com/android/documentsui/FileDeleteUiTest.java
@@ -49,7 +49,7 @@
 public class FileDeleteUiTest extends ActivityTest<FilesActivity> {
     private static final String TAG = "FileDeleteUiTest";
 
-    private static final int STUB_FILE_COUNT = 1000;
+    private static final int DUMMY_FILE_COUNT = 1000;
 
     private static final int WAIT_TIME_SECONDS = 60;
 
@@ -126,17 +126,17 @@
     @Override
     public void initTestFiles() throws RemoteException {
         try {
-            createStubFiles();
+            createDummyFiles();
         } catch (Exception e) {
             fail("Initialization failed");
         }
     }
 
-    private void createStubFiles() throws Exception {
+    private void createDummyFiles() throws Exception {
         final ThreadPoolExecutor exec = new ThreadPoolExecutor(
                 5, 5, 1000L, TimeUnit.MILLISECONDS,
                         new ArrayBlockingQueue<Runnable>(100, true));
-        for (int i = 0; i < STUB_FILE_COUNT; i++) {
+        for (int i = 0; i < DUMMY_FILE_COUNT; i++) {
             final String fileName = "file" + String.format("%04d", i) + ".log";
             if (exec.getQueue().size() >= 80) {
                 Thread.sleep(50);
diff --git a/tests/functional/com/android/documentsui/archives/ArchiveHandleTest.java b/tests/functional/com/android/documentsui/archives/ArchiveHandleTest.java
index 1e0e95e..50bc916 100644
--- a/tests/functional/com/android/documentsui/archives/ArchiveHandleTest.java
+++ b/tests/functional/com/android/documentsui/archives/ArchiveHandleTest.java
@@ -555,7 +555,7 @@
                         "application/zip");
 
         assertThat(transformToIterable(archiveHandle.getEntries()))
-                .containsAtLeastElementsIn(sExpectEntries);
+                .containsAllIn(sExpectEntries);
     }
 
     @Test
@@ -565,7 +565,7 @@
                 "application/x-gtar");
 
         assertThat(transformToIterable(archiveHandle.getEntries()))
-                .containsAtLeastElementsIn(sExpectEntries);
+                .containsAllIn(sExpectEntries);
     }
 
     @Test
@@ -575,7 +575,7 @@
                         "application/x-compressed-tar");
 
         assertThat(transformToIterable(archiveHandle.getEntries()))
-                .containsAtLeastElementsIn(sExpectEntries);
+                .containsAllIn(sExpectEntries);
     }
 
     @Test
@@ -585,7 +585,7 @@
                         "application/x-bzip-compressed-tar");
 
         assertThat(transformToIterable(archiveHandle.getEntries()))
-                .containsAtLeastElementsIn(sExpectEntries);
+                .containsAllIn(sExpectEntries);
     }
 
     @Test
@@ -595,7 +595,7 @@
                         "application/x-brotli-compressed-tar");
 
         assertThat(transformToIterable(archiveHandle.getEntries()))
-                .containsAtLeastElementsIn(sExpectEntries);
+                .containsAllIn(sExpectEntries);
     }
 
     @Test
@@ -605,6 +605,6 @@
                         "application/x-xz-compressed-tar");
 
         assertThat(transformToIterable(archiveHandle.getEntries()))
-                .containsAtLeastElementsIn(sExpectEntries);
+                .containsAllIn(sExpectEntries);
     }
 }
diff --git a/tests/functional/com/android/documentsui/dirlist/DirectoryAddonsAdapterTest.java b/tests/functional/com/android/documentsui/dirlist/DirectoryAddonsAdapterTest.java
index bcd1131..303c8e5 100644
--- a/tests/functional/com/android/documentsui/dirlist/DirectoryAddonsAdapterTest.java
+++ b/tests/functional/com/android/documentsui/dirlist/DirectoryAddonsAdapterTest.java
@@ -186,7 +186,7 @@
         assertTrue(mAdapter.getItemViewType(index) == type);
     }
 
-    private static class StubAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+    private static class DummyAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
         @Override
         public int getItemCount() {
diff --git a/tests/functional/com/android/documentsui/services/AbstractCopyJobTest.java b/tests/functional/com/android/documentsui/services/AbstractCopyJobTest.java
index 7b2cb82..eaafb37 100644
--- a/tests/functional/com/android/documentsui/services/AbstractCopyJobTest.java
+++ b/tests/functional/com/android/documentsui/services/AbstractCopyJobTest.java
@@ -179,7 +179,7 @@
         // Init FileCountProgressTracker with 10 docs required to copy.
         TestCopyJobProcessTracker<CopyJob.FileCountProgressTracker> tracker =
                 new TestCopyJobProcessTracker(CopyJob.FileCountProgressTracker.class, 10,
-                        createJob(newArrayList(mDocs.createFolder(mSrcRoot, "tempDir"))),
+                        createJob(newArrayList(mDocs.createFolder(mSrcRoot, "dummyDir"))),
                         (completed) -> NumberFormat.getPercentInstance().format(completed),
                         (time) -> mContext.getString(R.string.copy_remaining,
                                 DateUtils.formatDuration((Long) time)));
@@ -213,7 +213,7 @@
         // Init ByteCountProgressTracker with 100 KBytes required to copy.
         TestCopyJobProcessTracker<CopyJob.ByteCountProgressTracker> tracker =
                 new TestCopyJobProcessTracker(CopyJob.ByteCountProgressTracker.class, 100000,
-                        createJob(newArrayList(mDocs.createFolder(mSrcRoot, "tempDir"))),
+                        createJob(newArrayList(mDocs.createFolder(mSrcRoot, "dummyDir"))),
                         (completed) -> NumberFormat.getPercentInstance().format(completed),
                         (time) -> mContext.getString(R.string.copy_remaining,
                                 DateUtils.formatDuration((Long) time)));
diff --git a/tests/functional/com/android/documentsui/ui/DarkThemeUiTest.java b/tests/functional/com/android/documentsui/ui/DarkThemeUiTest.java
index ae57dcd..870e8ac 100644
--- a/tests/functional/com/android/documentsui/ui/DarkThemeUiTest.java
+++ b/tests/functional/com/android/documentsui/ui/DarkThemeUiTest.java
@@ -16,8 +16,6 @@
 
 package com.android.documentsui.ui;
 
-import static org.junit.Assume.assumeFalse;
-
 import android.content.Context;
 import android.content.res.Configuration;
 
@@ -26,7 +24,6 @@
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.documentsui.tests.R;
-import com.android.documentsui.util.VersionUtils;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -49,8 +46,7 @@
     }
 
     @Test
-    public void themeNightModeEnable_actionBarColorShouldBeDark() throws Exception {
-        assumeFalse(VersionUtils.isAtLeastS()); // Disable for S dynamic color
+    public void themeNightModeEnable_actionBarColorShouldBeDark() {
         assertTheme(R.styleable.ThemeColor, R.styleable.ThemeColor_android_colorBackground,
                 mTheme.getResources().getColor(com.android.documentsui.R.color.app_background_color,
                         mTheme));
@@ -75,25 +71,22 @@
     }
 
     @Test
-    public void themeNightModeEnable_windowBackgroundColorShouldBeDark() throws Exception {
-        assumeFalse(VersionUtils.isAtLeastS()); // Disable for S dynamic color
+    public void themeNightModeEnable_windowBackgroundColorShouldBeDark() {
         assertTheme(R.styleable.SystemWindow, R.styleable.SystemWindow_android_windowBackground,
                 mTheme.getResources().getColor(com.android.documentsui.R.color.app_background_color,
                         mTheme));
     }
 
     @Test
-    public void themeNightModeEnable_statusBarColorShouldBeDark() throws Exception {
-        assumeFalse(VersionUtils.isAtLeastS()); // Disable for S dynamic color
+    public void themeNightModeEnable_statusBarColorShouldBeDark() {
         assertTheme(R.styleable.SystemWindow, R.styleable.SystemWindow_android_statusBarColor,
                 mTheme.getResources().getColor(com.android.documentsui.R.color.app_background_color,
                         mTheme));
     }
 
     @Test
-    public void appCompatThemeNightModeEnable_colorPrimaryShouldBeThemeable() throws Exception {
-        assumeFalse(VersionUtils.isAtLeastS()); // Disable for S dynamic color
+    public void appCompatThemeNightModeEnable_colorPrimaryShouldBeThemeable() {
         assertTheme(R.styleable.ThemeColor, R.styleable.ThemeColor_android_colorPrimary,
                 mTheme.getResources().getColor(com.android.documentsui.R.color.primary, mTheme));
     }
-}
\ No newline at end of file
+}
diff --git a/tests/functional/com/android/documentsui/ui/ThemeUiTest.java b/tests/functional/com/android/documentsui/ui/ThemeUiTest.java
index f3172e4..292ea83 100644
--- a/tests/functional/com/android/documentsui/ui/ThemeUiTest.java
+++ b/tests/functional/com/android/documentsui/ui/ThemeUiTest.java
@@ -16,8 +16,6 @@
 
 package com.android.documentsui.ui;
 
-import static org.junit.Assume.assumeFalse;
-
 import android.content.res.Configuration;
 import android.graphics.Color;
 
@@ -25,7 +23,6 @@
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.documentsui.tests.R;
-import com.android.documentsui.util.VersionUtils;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -46,8 +43,7 @@
     }
 
     @Test
-    public void themeNightModeDisable_actionBarColorShouldBeLight() throws Exception {
-        assumeFalse(VersionUtils.isAtLeastS()); // Disable for S dynamic color
+    public void themeNightModeDisable_actionBarColorShouldBeLight() {
         assertTheme(R.styleable.ThemeColor, R.styleable.ThemeColor_android_colorBackground,
                 Color.WHITE);
     }
@@ -65,30 +61,26 @@
     }
 
     @Test
-    public void themeNightModeDisable_navigationBarColorShouldBeLight() throws Exception {
-        assumeFalse(VersionUtils.isAtLeastS()); // Disable for S dynamic color
+    public void themeNightModeDisable_navigationBarColorShouldBeLight() {
         assertTheme(R.styleable.SystemWindow, R.styleable.SystemWindow_android_navigationBarColor,
                 Color.WHITE);
     }
 
     @Test
-    public void themeNightModeDisable_windowBackgroundColorShouldBeLight() throws Exception {
-        assumeFalse(VersionUtils.isAtLeastS()); // Disable for S dynamic color
+    public void themeNightModeDisable_windowBackgroundColorShouldBeLight() {
         assertTheme(R.styleable.SystemWindow, R.styleable.SystemWindow_android_windowBackground,
                 Color.WHITE);
     }
 
     @Test
-    public void themeNightModeDisable_statusBarColorShouldBeLight() throws Exception {
-        assumeFalse(VersionUtils.isAtLeastS()); // Disable for S dynamic color
+    public void themeNightModeDisable_statusBarColorShouldBeLight() {
         assertTheme(R.styleable.SystemWindow, R.styleable.SystemWindow_android_statusBarColor,
                 Color.WHITE);
     }
 
     @Test
-    public void appCompatThemeNightModeDisable_colorPrimaryShouldBeThemeable() throws Exception {
-        assumeFalse(VersionUtils.isAtLeastS()); // Disable for S dynamic color
+    public void appCompatThemeNightModeDisable_colorPrimaryShouldBeThemeable() {
         assertTheme(R.styleable.ThemeColor, R.styleable.ThemeColor_android_colorPrimary,
                 mTheme.getResources().getColor(com.android.documentsui.R.color.primary, mTheme));
     }
-}
\ No newline at end of file
+}
diff --git a/tests/unit/com/android/documentsui/DocsSelectionHelperTest.java b/tests/unit/com/android/documentsui/DocsSelectionHelperTest.java
index 3d25007..e377f0a 100644
--- a/tests/unit/com/android/documentsui/DocsSelectionHelperTest.java
+++ b/tests/unit/com/android/documentsui/DocsSelectionHelperTest.java
@@ -102,7 +102,7 @@
         mSelectionMgr.reset(mgr);
     }
 
-    private static final class TestSelectionManager extends StubSelectionTracker<String> {
+    private static final class TestSelectionManager extends DummySelectionTracker<String> {
 
         private boolean mCleared;
         private Map<String, Boolean> mSelected = new HashMap<>();
diff --git a/tests/unit/com/android/documentsui/ModelTest.java b/tests/unit/com/android/documentsui/ModelTest.java
index 8257790..f9835b1 100644
--- a/tests/unit/com/android/documentsui/ModelTest.java
+++ b/tests/unit/com/android/documentsui/ModelTest.java
@@ -95,7 +95,7 @@
         DirectoryResult r = new DirectoryResult();
         r.setCursor(cursor);
 
-        // Instantiate the model with a stub view adapter and listener that (for now) do nothing.
+        // Instantiate the model with a dummy view adapter and listener that (for now) do nothing.
         model = new Model(features);
         // not sure why we add a listener here at all.
         model.addUpdateListener(new TestEventListener<>());
diff --git a/tests/unit/com/android/documentsui/ProfileTabsTest.java b/tests/unit/com/android/documentsui/ProfileTabsTest.java
index 373f4e5..dd6ef3c 100644
--- a/tests/unit/com/android/documentsui/ProfileTabsTest.java
+++ b/tests/unit/com/android/documentsui/ProfileTabsTest.java
@@ -50,7 +50,6 @@
     private ProfileTabs mProfileTabs;
 
     private Context mContext;
-    private View mTabLayoutContainer;
     private TabLayout mTabLayout;
     private TestEnvironment mTestEnv;
     private State mState;
@@ -72,7 +71,6 @@
         View view = layoutInflater.inflate(R.layout.directory_header, null);
 
         mTabLayout = view.findViewById(R.id.tabs);
-        mTabLayoutContainer = view.findViewById(R.id.tabs_container);
         mTestEnv = new TestEnvironment();
         mTestEnv.isSearchExpanded = false;
 
@@ -85,7 +83,7 @@
     public void testUpdateView_singleUser_shouldHide() {
         initializeWithUsers(systemUser);
 
-        assertThat(mTabLayoutContainer.getVisibility()).isEqualTo(View.GONE);
+        assertThat(mTabLayout.getVisibility()).isEqualTo(View.GONE);
         assertThat(mTabLayout.getTabCount()).isEqualTo(0);
     }
 
@@ -93,7 +91,7 @@
     public void testUpdateView_twoUsers_shouldShow() {
         initializeWithUsers(systemUser, managedUser);
 
-        assertThat(mTabLayoutContainer.getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(mTabLayout.getVisibility()).isEqualTo(View.VISIBLE);
         assertThat(mTabLayout.getTabCount()).isEqualTo(2);
 
         TabLayout.Tab tab1 = mTabLayout.getTabAt(0);
@@ -112,7 +110,7 @@
         mState.supportsCrossProfile = false;
         mProfileTabs.updateView();
 
-        assertThat(mTabLayoutContainer.getVisibility()).isEqualTo(View.GONE);
+        assertThat(mTabLayout.getVisibility()).isEqualTo(View.GONE);
     }
 
     @Test
@@ -123,7 +121,7 @@
         mState.stack.push(TestEnv.FOLDER_1);
 
         mProfileTabs.updateView();
-        assertThat(mTabLayoutContainer.getVisibility()).isEqualTo(View.GONE);
+        assertThat(mTabLayout.getVisibility()).isEqualTo(View.GONE);
         assertThat(mTabLayout.getTabCount()).isEqualTo(2);
     }
 
@@ -136,7 +134,7 @@
         mState.stack.push((TestEnv.FOLDER_0));
 
         mProfileTabs.updateView();
-        assertThat(mTabLayoutContainer.getVisibility()).isEqualTo(View.GONE);
+        assertThat(mTabLayout.getVisibility()).isEqualTo(View.GONE);
         assertThat(mTabLayout.getTabCount()).isEqualTo(2);
     }
 
@@ -148,7 +146,7 @@
         mState.stack.push((TestEnv.FOLDER_0));
 
         mProfileTabs.updateView();
-        assertThat(mTabLayoutContainer.getVisibility()).isEqualTo(View.GONE);
+        assertThat(mTabLayout.getVisibility()).isEqualTo(View.GONE);
         assertThat(mTabLayout.getTabCount()).isEqualTo(2);
     }
 
@@ -157,7 +155,7 @@
         mTestEnv.isSearchExpanded = true;
         initializeWithUsers(systemUser, managedUser);
 
-        assertThat(mTabLayoutContainer.getVisibility()).isEqualTo(View.GONE);
+        assertThat(mTabLayout.getVisibility()).isEqualTo(View.GONE);
         assertThat(mTabLayout.getTabCount()).isEqualTo(2);
     }
 
@@ -166,12 +164,12 @@
         initializeWithUsers(systemUser, managedUser);
         mProfileTabs.updateView();
         mTabLayout.selectTab(mTabLayout.getTabAt(1));
-        assertThat(mTabLayoutContainer.getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(mTabLayout.getVisibility()).isEqualTo(View.VISIBLE);
         assertThat(mProfileTabs.getSelectedUser()).isEqualTo(managedUser);
 
         mTestUserIdManager.userIds = Collections.singletonList(systemUser);
         mProfileTabs.updateView();
-        assertThat(mTabLayoutContainer.getVisibility()).isEqualTo(View.GONE);
+        assertThat(mTabLayout.getVisibility()).isEqualTo(View.GONE);
         assertThat(mProfileTabs.getSelectedUser()).isEqualTo(systemUser);
     }
 
@@ -233,7 +231,7 @@
             }
         }
 
-        mProfileTabs = new ProfileTabs(mTabLayoutContainer, mState, mTestUserIdManager, mTestEnv,
+        mProfileTabs = new ProfileTabs(mTabLayout, mState, mTestUserIdManager, mTestEnv,
                 mTestCommonAddons);
         mProfileTabs.updateView();
         mProfileTabs.setListener(userId -> mIsListenerInvoked = true);
diff --git a/tests/unit/com/android/documentsui/UserIdManagerTest.java b/tests/unit/com/android/documentsui/UserIdManagerTest.java
index 31fe7d1..88ac3ed 100644
--- a/tests/unit/com/android/documentsui/UserIdManagerTest.java
+++ b/tests/unit/com/android/documentsui/UserIdManagerTest.java
@@ -157,7 +157,7 @@
         // Returns the both if there are system and managed users.
         UserId currentUser = UserId.of(systemUser);
         initializeUserIdManager(currentUser, Arrays.asList(systemUser, managedUser1));
-        assertThat(mUserIdManager.getUserIds()).isSameInstanceAs(mUserIdManager.getUserIds());
+        assertThat(mUserIdManager.getUserIds()).isSameAs(mUserIdManager.getUserIds());
     }
 
     @Test
diff --git a/tests/unit/com/android/documentsui/base/RootInfoTest.java b/tests/unit/com/android/documentsui/base/RootInfoTest.java
index bea4c23..4639b45 100644
--- a/tests/unit/com/android/documentsui/base/RootInfoTest.java
+++ b/tests/unit/com/android/documentsui/base/RootInfoTest.java
@@ -67,6 +67,6 @@
 
         RootInfo copied = RootInfo.copyRootInfo(rootInfo);
         assertThat(copied).isEqualTo(rootInfo);
-        assertThat(copied).isNotSameInstanceAs(rootInfo);
+        assertThat(copied).isNotSameAs(rootInfo);
     }
 }
diff --git a/tests/unit/com/android/documentsui/base/UserIdTest.java b/tests/unit/com/android/documentsui/base/UserIdTest.java
index b9f2d94..2f9f7b2 100644
--- a/tests/unit/com/android/documentsui/base/UserIdTest.java
+++ b/tests/unit/com/android/documentsui/base/UserIdTest.java
@@ -91,7 +91,7 @@
         when(mockContext.createPackageContextAsUser("android", 0, differentUserHandle)).thenReturn(
                 expectedContext);
 
-        assertThat(UserId.of(differentUserHandle).asContext(mockContext)).isSameInstanceAs(
+        assertThat(UserId.of(differentUserHandle).asContext(mockContext)).isSameAs(
                 expectedContext);
     }
 
diff --git a/tests/unit/com/android/documentsui/files/ActionHandlerTest.java b/tests/unit/com/android/documentsui/files/ActionHandlerTest.java
index 62fea24..d59f9eb 100644
--- a/tests/unit/com/android/documentsui/files/ActionHandlerTest.java
+++ b/tests/unit/com/android/documentsui/files/ActionHandlerTest.java
@@ -30,7 +30,6 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
 
 import android.app.Activity;
 import android.app.DownloadManager;
@@ -71,7 +70,6 @@
 import com.android.documentsui.testing.TestProvidersAccess;
 import com.android.documentsui.testing.UserManagers;
 import com.android.documentsui.ui.TestDialogController;
-import com.android.documentsui.util.VersionUtils;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -512,31 +510,28 @@
 
     @Test
     public void testDragAndDrop_OnReadOnlyRoot() throws Exception {
-        assumeTrue(VersionUtils.isAtLeastS());
         RootInfo root = new RootInfo(); // root by default has no SUPPORT_CREATE flag
-        DragEvent event = DragEvent.obtain(DragEvent.ACTION_DROP, 1, 1, 0, 0, null, null, null,
-                null, null, true);
+        DragEvent event = DragEvent.obtain(DragEvent.ACTION_DROP, 1, 1, null, null, null,
+                null, true);
         assertFalse(mHandler.dropOn(event, root));
     }
 
     @Test
     public void testDragAndDrop_OnLibraryRoot() throws Exception {
-        assumeTrue(VersionUtils.isAtLeastS());
-        DragEvent event = DragEvent.obtain(DragEvent.ACTION_DROP, 1, 1, 0, 0, null, null, null,
-                null, null, true);
+        DragEvent event = DragEvent.obtain(DragEvent.ACTION_DROP, 1, 1, null, null, null,
+                null, true);
         assertFalse(mHandler.dropOn(event, TestProvidersAccess.RECENTS));
     }
 
     @Test
     public void testDragAndDrop_DropsOnWritableRoot() throws Exception {
-        assumeTrue(VersionUtils.isAtLeastS());
         // DragEvent gets recycled in Android, so it is possible that by the time the callback is
         // called, event.getLocalState() and event.getClipData() returns null. This tests to ensure
         // our Clipper is getting the original CipData passed in.
         Object localState = new Object();
         ClipData clipData = ClipDatas.createTestClipData();
-        DragEvent event = DragEvent.obtain(DragEvent.ACTION_DROP, 1, 1, 0, 0, localState, null,
-                clipData, null, null, true);
+        DragEvent event = DragEvent.obtain(DragEvent.ACTION_DROP, 1, 1, localState, null, clipData,
+                null, true);
 
         mHandler.dropOn(event, TestProvidersAccess.DOWNLOADS);
         event.recycle();
diff --git a/tests/unit/com/android/documentsui/roots/ProvidersAccessTest.java b/tests/unit/com/android/documentsui/roots/ProvidersAccessTest.java
index 944bafa..e97eab7 100644
--- a/tests/unit/com/android/documentsui/roots/ProvidersAccessTest.java
+++ b/tests/unit/com/android/documentsui/roots/ProvidersAccessTest.java
@@ -41,11 +41,19 @@
 
     private static final UserId OTHER_USER = UserId.of(UserId.DEFAULT_USER.getIdentifier() + 1);
     private static final Correspondence<RootInfo, RootInfo> USER_ID_MIME_TYPES_CORRESPONDENCE =
-            Correspondence.from((@Nullable RootInfo actual, @Nullable RootInfo expected) -> {
+            new Correspondence<RootInfo, RootInfo>() {
+                @Override
+                public boolean compare(@Nullable RootInfo actual, @Nullable RootInfo expected) {
                     return actual != null && expected != null
                             && Objects.equals(actual.userId, expected.userId)
                             && Objects.equals(actual.derivedMimeTypes, expected.derivedMimeTypes);
-            }, "has same userId and mimeTypes as in");
+                }
+
+                @Override
+                public String toString() {
+                    return "has same userId and mimeTypes as in";
+                }
+            };
 
     private static RootInfo mNull = buildForMimeTypes((String[]) null);
     private static RootInfo mEmpty = buildForMimeTypes();
diff --git a/tests/unit/com/android/documentsui/sidebar/RootItemListBuilderTest.java b/tests/unit/com/android/documentsui/sidebar/RootItemListBuilderTest.java
index aadb736..2574ecc 100644
--- a/tests/unit/com/android/documentsui/sidebar/RootItemListBuilderTest.java
+++ b/tests/unit/com/android/documentsui/sidebar/RootItemListBuilderTest.java
@@ -173,10 +173,10 @@
 
         List<RootItem> result = mBuilder.getList();
         assertThat(result).containsExactlyElementsIn(Lists.newArrayList(
-                RootItem.createStubItem(
+                RootItem.createDummyItem(
                         DOWNLOADS_DEFAULT_USER, TestProvidersAccess.OtherUser.USER_ID),
                 SDCARD_DEFAULT_USER,
-                RootItem.createStubItem(HOME_DEFAULT_USER, TestProvidersAccess.OtherUser.USER_ID),
+                RootItem.createDummyItem(HOME_DEFAULT_USER, TestProvidersAccess.OtherUser.USER_ID),
                 IMAGE_OTHER_USER,
                 PICKLES_DEFAULT_USER));
     }
diff --git a/tests/unit/com/android/documentsui/sidebar/UserItemsCombinerTest.java b/tests/unit/com/android/documentsui/sidebar/UserItemsCombinerTest.java
index 6caf236..f9549e0 100644
--- a/tests/unit/com/android/documentsui/sidebar/UserItemsCombinerTest.java
+++ b/tests/unit/com/android/documentsui/sidebar/UserItemsCombinerTest.java
@@ -61,10 +61,18 @@
     );
 
     private static final Correspondence<Item, Item> ITEM_CORRESPONDENCE =
-            Correspondence.from((Item actual, Item expected) -> {
+            new Correspondence<Item, Item>() {
+                @Override
+                public boolean compare(Item actual, Item expected) {
                     return Objects.equals(actual.title, expected.title)
                             && Objects.equals(actual.userId, expected.userId);
-            }, "has same title and userId as in");
+                }
+
+                @Override
+                public String toString() {
+                    return "has same title and userId as in";
+                }
+            };
 
     private final State mState = new State();
     private final Resources mResources =
diff --git a/tests/unit/com/android/documentsui/sorting/SortModelTest.java b/tests/unit/com/android/documentsui/sorting/SortModelTest.java
index 25c026e..da89030 100644
--- a/tests/unit/com/android/documentsui/sorting/SortModelTest.java
+++ b/tests/unit/com/android/documentsui/sorting/SortModelTest.java
@@ -70,14 +70,14 @@
                     DIMENSION_3
             };
 
-    private static final StubListener STUB_LISTENER = new StubListener();
+    private static final DummyListener DUMMY_LISTENER = new DummyListener();
 
     private SortModel mModel;
 
     @Before
     public void setUp() {
         mModel = new SortModel(Arrays.asList(DIMENSIONS));
-        mModel.addListener(STUB_LISTENER);
+        mModel.addListener(DUMMY_LISTENER);
     }
 
     @Test
@@ -106,7 +106,7 @@
         mModel.setDimensionVisibility(DIMENSION_1.getId(), View.GONE);
 
         assertEquals(View.GONE, DIMENSION_1.getVisibility());
-        assertEquals(SortModel.UPDATE_TYPE_VISIBILITY, STUB_LISTENER.mLastUpdateType);
+        assertEquals(SortModel.UPDATE_TYPE_VISIBILITY, DUMMY_LISTENER.mLastUpdateType);
     }
 
     @Test
@@ -122,8 +122,8 @@
         assertSame(DIMENSION_1, sortedDimension);
         assertEquals(DIMENSION_1.getDefaultSortDirection(), sortedDimension.getSortDirection());
 
-        assertSame(mModel, STUB_LISTENER.mLastSortModel);
-        assertEquals(SortModel.UPDATE_TYPE_SORTING, STUB_LISTENER.mLastUpdateType);
+        assertSame(mModel, DUMMY_LISTENER.mLastSortModel);
+        assertEquals(SortModel.UPDATE_TYPE_SORTING, DUMMY_LISTENER.mLastUpdateType);
     }
 
     @Test
@@ -134,8 +134,8 @@
         assertSame(DIMENSION_1, sortedDimension);
         assertEquals(SortDimension.SORT_DIRECTION_DESCENDING, sortedDimension.getSortDirection());
 
-        assertSame(mModel, STUB_LISTENER.mLastSortModel);
-        assertEquals(SortModel.UPDATE_TYPE_SORTING, STUB_LISTENER.mLastUpdateType);
+        assertSame(mModel, DUMMY_LISTENER.mLastSortModel);
+        assertEquals(SortModel.UPDATE_TYPE_SORTING, DUMMY_LISTENER.mLastUpdateType);
     }
 
     @Test
@@ -147,8 +147,8 @@
         assertSame(DIMENSION_1, sortedDimension);
         assertEquals(SortDimension.SORT_DIRECTION_DESCENDING, sortedDimension.getSortDirection());
 
-        assertSame(mModel, STUB_LISTENER.mLastSortModel);
-        assertEquals(SortModel.UPDATE_TYPE_SORTING, STUB_LISTENER.mLastUpdateType);
+        assertSame(mModel, DUMMY_LISTENER.mLastSortModel);
+        assertEquals(SortModel.UPDATE_TYPE_SORTING, DUMMY_LISTENER.mLastUpdateType);
     }
 
     @Test
@@ -160,8 +160,8 @@
         assertSame(DIMENSION_1, sortedDimension);
         assertEquals(SortDimension.SORT_DIRECTION_DESCENDING, sortedDimension.getSortDirection());
 
-        assertSame(mModel, STUB_LISTENER.mLastSortModel);
-        assertEquals(SortModel.UPDATE_TYPE_SORTING, STUB_LISTENER.mLastUpdateType);
+        assertSame(mModel, DUMMY_LISTENER.mLastSortModel);
+        assertEquals(SortModel.UPDATE_TYPE_SORTING, DUMMY_LISTENER.mLastUpdateType);
     }
 
     @Test
@@ -225,7 +225,7 @@
         return mModel.getDimensionById(sortedDimensionId);
     }
 
-    private static class StubListener implements UpdateListener {
+    private static class DummyListener implements UpdateListener {
 
         private SortModel mLastSortModel;
         private @UpdateType int mLastUpdateType;