[DocsUI M3] update M3 acronym in the code to use_material3

Bug: 373720657
Test: m DocumentsUIGoogle && manual inspection
Flag: com.android.documentsui.flags.use_material3
Change-Id: I50d5c01a7427f594fc067461c5409d8434241b90

16 files changed, 26 insertions, 26 deletions

diff --git a/res/flag(com.android.documentsui.flags.use_material3)/color/item_action_icon.xml b/res/flag(com.android.documentsui.flags.use_material3)/color/item_action_icon.xml
index a65a72517..0ef672d95 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/color/item_action_icon.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/color/item_action_icon.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- TODO(b/379776735): remove this file after M3 uplift -->
+<!-- TODO(b/379776735): remove this file after use_material3 flag is launched. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false"
         android:alpha="@dimen/root_icon_disabled_alpha"
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/color/search_chip_ripple_color.xml b/res/flag(com.android.documentsui.flags.use_material3)/color/search_chip_ripple_color.xml
index b4aa0b8a7..09677a81a 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/color/search_chip_ripple_color.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/color/search_chip_ripple_color.xml
@@ -15,7 +15,7 @@
   limitations under the License.
   -->
 
-<!-- TODO(b/379776735): remove this file after M3 uplift -->
+<!-- TODO(b/379776735): remove this file after use_material3 flag is launched. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Selected. -->
     <item android:state_pressed="true" android:state_selected="true"
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/color/search_chip_text_color.xml b/res/flag(com.android.documentsui.flags.use_material3)/color/search_chip_text_color.xml
index be0cc404b..6935cef57 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/color/search_chip_text_color.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/color/search_chip_text_color.xml
@@ -15,7 +15,7 @@
   limitations under the License.
   -->
 
-<!-- TODO(b/379776735): remove this file after M3 uplift -->
+<!-- TODO(b/379776735): remove this file after use_material3 flag is launched. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true" android:color="@color/search_chip_text_selected_color"/>
     <item android:state_enabled="true" android:color="?android:textColorSecondary"/>
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/drawable/progress_indeterminate_horizontal_material_trimmed.xml b/res/flag(com.android.documentsui.flags.use_material3)/drawable/progress_indeterminate_horizontal_material_trimmed.xml
index 68782024b..7a0a5e555 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/drawable/progress_indeterminate_horizontal_material_trimmed.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/drawable/progress_indeterminate_horizontal_material_trimmed.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- TODO(b/379776735): remove this file after M3 uplift -->
+<!-- TODO(b/379776735): remove this file after use_material3 flag is launched. -->
 <!-- Variant of progress_indeterminate_horizontal_material in frameworks/base/core/res, which
      draws the whole height of the progress bar instead having blank space above and below the
      bar. -->
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/drawable/sort_widget_background.xml b/res/flag(com.android.documentsui.flags.use_material3)/drawable/sort_widget_background.xml
index 5a9022035..b18bc4eb3 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/drawable/sort_widget_background.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/drawable/sort_widget_background.xml
@@ -15,7 +15,7 @@
     limitations under the License.
   -->
 
-<!-- TODO(b/379776735): remove this file after M3 uplift -->
+<!-- TODO(b/379776735): remove this file after use_material3 flag is launched. -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:top="-1dp"
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/layout/apps_row.xml b/res/flag(com.android.documentsui.flags.use_material3)/layout/apps_row.xml
index 3a69d9f61..249a6d3f1 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/layout/apps_row.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/layout/apps_row.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- TODO(b/379776735): Remove this after M3 uplift.
+<!-- TODO(b/379776735): Remove this after use_material3 flag is launched.
     Currently it's being referenced in AppsRowManager.
 -->
 <LinearLayout
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/layout/root_vertical_divider.xml b/res/flag(com.android.documentsui.flags.use_material3)/layout/root_vertical_divider.xml
index 7795492e4..3197d9dce 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/layout/root_vertical_divider.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/layout/root_vertical_divider.xml
@@ -15,7 +15,7 @@
   limitations under the License.
   -->
 
-<!-- TODO(b/379776735): remove this file after M3 uplift -->
+<!-- TODO(b/379776735): remove this file after use_material3 flag is launched. -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/vertical_divider"
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/values-night/colors.xml b/res/flag(com.android.documentsui.flags.use_material3)/values-night/colors.xml
index 6ffe52622..ef4f5a902 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/values-night/colors.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/values-night/colors.xml
@@ -32,6 +32,6 @@
 
     <color name="fragment_pick_active_text_color">#202124</color> <!-- Grey 900 -->
 
-    <!-- TODO(b/379776735): remove this after M3 uplift -->
+    <!-- TODO(b/379776735): remove this after use_material3 flag is launched. -->
     <color name="search_chip_text_selected_color">@android:color/black</color>
 </resources>
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/values/colors.xml b/res/flag(com.android.documentsui.flags.use_material3)/values/colors.xml
index 98cc94cfc..77a41868f 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/values/colors.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/values/colors.xml
@@ -26,7 +26,7 @@
   <color name="secondary">#E3F2FD</color> <!-- Blue 50 -->
   <color name="hairline">#E0E0E0</color> <!-- Gray 300 -->
 
-  <!-- TODO(b/379776735): remove this after M3 uplift -->
+  <!-- TODO(b/379776735): remove this after use_material3 flag is launched. -->
   <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>
@@ -65,7 +65,7 @@
   <color name="fragment_pick_active_button_color">@color/primary</color>
   <color name="fragment_pick_active_text_color">@android:color/white</color>
 
-  <!-- TODO(b/379776735): remove this after M3 uplift -->
+  <!-- TODO(b/379776735): remove this after use_material3 flag is launched. -->
   <color name="search_chip_text_selected_color">@android:color/white</color>
 
   <!-- Use this when we need to set alpha channel on top of a theme attribute color in the
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/values/dimens.xml b/res/flag(com.android.documentsui.flags.use_material3)/values/dimens.xml
index b11397ee9..f68390fe8 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/values/dimens.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/values/dimens.xml
@@ -23,25 +23,25 @@
     <dimen name="profile_tab_padding">0dp</dimen>
     <dimen name="grid_container_padding">20dp</dimen>
     <dimen name="list_container_padding">@dimen/space_extra_small_4</dimen>
-    <!-- For compact screen, file area occupies the whole screen height, in M3 we show breadcrumb
-         at the bottom, so we need to add padding (breadcrumb height) at the bottom to make sure
-         breadcrumb won't over-shadow the file area. -->
+    <!-- For compact screen, file area occupies the whole screen height, when use_material3 flag is
+         ON we show breadcrumb at the bottom, so we need to add padding (breadcrumb height) at the
+         bottom to make sure breadcrumb won't over-shadow the file area. -->
     <dimen name="file_area_padding_bottom">48dp</dimen>
     <dimen name="icon_size">40dp</dimen>
     <dimen name="button_touch_size">48dp</dimen>
     <dimen name="root_icon_size">24dp</dimen>
-    <!-- TODO(b/379776735): remove this block after M3 uplift -->
+    <!-- TODO(b/379776735): remove this block after use_material3 flag is launched. -->
     <dimen name="root_icon_margin">0dp</dimen>
     <dimen name="root_spacer_padding">0dp</dimen>
     <!-- block end -->
     <dimen name="root_action_icon_size">24dp</dimen>
-    <!-- TODO(b/379776735): remove this after M3 uplift -->
+    <!-- TODO(b/379776735): remove this after use_material3 flag is launched. -->
     <dimen name="root_icon_disabled_alpha">?android:attr/disabledAlpha</dimen>
     <dimen name="check_icon_size">20dp</dimen>
     <dimen name="zoom_icon_size">24dp</dimen>
     <dimen name="list_item_thumbnail_size">40dp</dimen>
     <dimen name="grid_item_icon_size">30dp</dimen>
-    <!-- TODO(b/379776735): remove this after M3 uplift -->
+    <!-- TODO(b/379776735): remove this after use_material3 flag is launched. -->
     <dimen name="progress_bar_height">4dp</dimen>
     <fraction name="grid_scale_min">85%</fraction>
     <fraction name="grid_scale_max">200%</fraction>
@@ -56,7 +56,7 @@
     <dimen name="list_item_padding_vertical">4dp</dimen>
     <dimen name="list_item_icon_margin_end">16dp</dimen>
     <dimen name="list_item_icon_size">32dp</dimen>
-    <!-- TODO(b/379776735): remove this block after M3 uplift -->
+    <!-- TODO(b/379776735): remove this block after use_material3 flag is launched. -->
     <dimen name="list_item_width">72dp</dimen>
     <dimen name="list_item_padding">16dp</dimen>
     <dimen name="list_item_icon_padding">16dp</dimen>
@@ -141,7 +141,7 @@
     <dimen name="root_info_header_height">60dp</dimen>
     <dimen name="root_info_header_horizontal_padding">24dp</dimen>
 
-    <!-- TODO(b/379776735): remove this block after M3 uplift -->
+    <!-- TODO(b/379776735): remove this block after use_material3 flag is launched. -->
     <dimen name="search_chip_group_margin">20dp</dimen>
     <dimen name="search_chip_spacing">8dp</dimen>
     <dimen name="search_chip_half_spacing">4dp</dimen>
diff --git a/src/com/android/documentsui/BaseActivity.java b/src/com/android/documentsui/BaseActivity.java
index 11717de4e..0b5d96da9 100644
--- a/src/com/android/documentsui/BaseActivity.java
+++ b/src/com/android/documentsui/BaseActivity.java
@@ -573,7 +573,7 @@ public abstract class BaseActivity
             root.setPadding(insets.getSystemWindowInsetLeft(),
                     insets.getSystemWindowInsetTop(), insets.getSystemWindowInsetRight(), 0);
 
-            // in M3, no additional bottom gap in full screen mode.
+            // When use_material3 flag is ON, no additional bottom gap in full screen mode.
             if (!isUseMaterial3FlagEnabled()) {
                 View saveContainer = findViewById(R.id.container_save);
                 saveContainer.setPadding(
diff --git a/src/com/android/documentsui/DrawerController.java b/src/com/android/documentsui/DrawerController.java
index a519b6001..cc90c9869 100644
--- a/src/com/android/documentsui/DrawerController.java
+++ b/src/com/android/documentsui/DrawerController.java
@@ -60,7 +60,7 @@ public abstract class DrawerController implements DrawerListener {
         }
 
         View drawer = activity.findViewById(R.id.drawer_roots);
-        // This will be null in M3, we will check the flag when it's used in
+        // This will be null when use_material3 flag is ON, we will check the flag when it's used in
         // RuntimeDrawerController.
         Toolbar toolbar = (Toolbar) activity.findViewById(R.id.roots_toolbar);
         drawer.getLayoutParams().width = calculateDrawerWidth(activity);
diff --git a/src/com/android/documentsui/dirlist/AppsRowManager.java b/src/com/android/documentsui/dirlist/AppsRowManager.java
index 33cb67a02..eb0d8bf2e 100644
--- a/src/com/android/documentsui/dirlist/AppsRowManager.java
+++ b/src/com/android/documentsui/dirlist/AppsRowManager.java
@@ -47,7 +47,7 @@ import java.util.Map;
 
 /**
  * A manager class stored apps row chip data list. Data will be synced by RootsFragment.
- * TODO(b/379776735): Remove this after M3 uplift.
+ * TODO(b/379776735): Remove this after use_material3 flag is launched.
  */
 public class AppsRowManager {
 
diff --git a/src/com/android/documentsui/dirlist/ListDocumentHolder.java b/src/com/android/documentsui/dirlist/ListDocumentHolder.java
index 58473d5aa..0d0f79919 100644
--- a/src/com/android/documentsui/dirlist/ListDocumentHolder.java
+++ b/src/com/android/documentsui/dirlist/ListDocumentHolder.java
@@ -70,7 +70,7 @@ final class ListDocumentHolder extends DocumentHolder {
     private final @Nullable LinearLayout mDetails;
     // TextView for date + size + summary, null only for tablets/sw720dp
     private final @Nullable TextView mMetadataView;
-    // Non-null only when M3 flag is ON.
+    // Non-null only when use_material3 flag is ON.
     private final @Nullable MaterialCardView mIconWrapper;
     private final ImageView mIconMime;
     private final ImageView mIconThumb;
diff --git a/src/com/android/documentsui/queries/SearchChipViewManager.java b/src/com/android/documentsui/queries/SearchChipViewManager.java
index 18cde82a5..f673b7408 100644
--- a/src/com/android/documentsui/queries/SearchChipViewManager.java
+++ b/src/com/android/documentsui/queries/SearchChipViewManager.java
@@ -418,8 +418,8 @@ public class SearchChipViewManager {
             return context.getDrawable(R.drawable.ic_chip_from_this_week);
         }
 
-        // For M3, we don't want to use MIME type icons for image/audio/video/document from the
-        // system.
+        // When use_material3 flag is ON, we don't want to use MIME type icons for
+        // image/audio/video/document from the system.
         if (isUseMaterial3FlagEnabled()) {
             return switch (chipType) {
                 case TYPE_IMAGES -> context.getDrawable(R.drawable.ic_chip_image);
diff --git a/src/com/android/documentsui/sidebar/AppItem.java b/src/com/android/documentsui/sidebar/AppItem.java
index d9aed1522..b72e4041c 100644
--- a/src/com/android/documentsui/sidebar/AppItem.java
+++ b/src/com/android/documentsui/sidebar/AppItem.java
@@ -100,8 +100,8 @@ public class AppItem extends Item {
 
         bindIcon(icon);
 
-        // In M3, we don't show action icon for the app items, do nothing here because the icons
-        // are hidden by default.
+        // When use_material3 flag is ON, we don't show action icon for the app items, do nothing
+        // here because the icons are hidden by default.
         if (!isUseMaterial3FlagEnabled()) {
             final View actionIconArea = convertView.findViewById(R.id.action_icon_area);
             final ImageView actionIcon = (ImageView) convertView.findViewById(R.id.action_icon);