[Catalog] Fix initial content description of the navigation drawer toggle in demos

Without calling `syncState()`, the `ActionBarDrawerToggle` defaults to the "Navigate up" description, ignoring the custom "Show navigation drawer" description until the user interacts with the drawer.

PiperOrigin-RevId: 853203850

Author: Material Design Team

catalog/java/io/material/catalog/navigationdrawer/CustomNavigationDrawerDemoActivity.java

@@ -20,6 +20,7 @@
 
 import android.animation.Animator.AnimatorListener;
 import android.animation.ValueAnimator.AnimatorUpdateListener;
+import android.content.res.Configuration;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
@@ -40,7 +41,6 @@
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.drawerlayout.widget.DrawerLayout.LayoutParams;
-import androidx.drawerlayout.widget.DrawerLayout.SimpleDrawerListener;
 import com.google.android.material.motion.MaterialSideContainerBackHelper;
 import com.google.android.material.navigation.DrawerLayoutUtils;
 import io.material.catalog.feature.DemoActivity;
@@ -60,6 +60,7 @@ public void handleOnBackPressed() {
   @Nullable private OnBackAnimationCallback drawerOnBackAnimationCallback;
 
   private DrawerLayout drawerLayout;
+  private ActionBarDrawerToggle toggle;
   private View currentDrawerView;
   private MaterialSideContainerBackHelper sideContainerBackHelper;
 
@@ -77,25 +78,26 @@ public View onCreateDemoView(
     setSupportActionBar(toolbar);
 
     drawerLayout = view.findViewById(R.id.drawer);
-    drawerLayout.addDrawerListener(
+    toggle =
         new ActionBarDrawerToggle(
             this,
             drawerLayout,
             toolbar,
             R.string.cat_navigationdrawer_button_show_content_description,
-            R.string.cat_navigationdrawer_button_hide_content_description));
-    drawerLayout.addDrawerListener(
-        new SimpleDrawerListener() {
+            R.string.cat_navigationdrawer_button_hide_content_description) {
           @Override
-          public void onDrawerOpened(@NonNull View drawerView) {
+          public void onDrawerOpened(View drawerView) {
+            super.onDrawerOpened(drawerView);
             registerBackCallback(drawerView);
           }
 
           @Override
-          public void onDrawerClosed(@NonNull View drawerView) {
+          public void onDrawerClosed(View drawerView) {
+            super.onDrawerClosed(drawerView);
             unregisterBackCallback();
           }
-        });
+        };
+    drawerLayout.addDrawerListener(toggle);
 
     View endDrawer = view.findViewById(R.id.custom_drawer_end);
     view.findViewById(R.id.show_end_drawer_gravity)
@@ -151,6 +153,18 @@ protected boolean shouldShowDefaultDemoActionBar() {
     return false;
   }
 
+  @Override
+  protected void onPostCreate(@Nullable Bundle savedInstanceState) {
+    super.onPostCreate(savedInstanceState);
+    toggle.syncState();
+  }
+
+  @Override
+  public void onConfigurationChanged(@NonNull Configuration newConfig) {
+    super.onConfigurationChanged(newConfig);
+    toggle.onConfigurationChanged(newConfig);
+  }
+
   @RequiresApi(VERSION_CODES.UPSIDE_DOWN_CAKE)
   private OnBackAnimationCallback createOnBackAnimationCallback() {
     return new OnBackAnimationCallback() {

catalog/java/io/material/catalog/navigationdrawer/NavigationDrawerDemoActivity.java

@@ -18,6 +18,7 @@
 
 import io.material.catalog.R;
 
+import android.content.res.Configuration;
 import android.os.Bundle;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.widget.Toolbar;
@@ -30,7 +31,6 @@
 import androidx.annotation.Nullable;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.drawerlayout.widget.DrawerLayout.SimpleDrawerListener;
 import com.google.android.material.materialswitch.MaterialSwitch;
 import com.google.android.material.navigation.NavigationView;
 import io.material.catalog.feature.DemoActivity;
@@ -47,6 +47,7 @@ public void handleOnBackPressed() {
       };
 
   private DrawerLayout drawerLayout;
+  private ActionBarDrawerToggle toggle;
   private MaterialSwitch autoCloseSwitch;
 
   @NonNull
@@ -64,25 +65,26 @@ public View onCreateDemoView(
     setSupportActionBar(toolbar);
 
     drawerLayout = view.findViewById(R.id.drawer);
-    drawerLayout.addDrawerListener(
+    toggle =
         new ActionBarDrawerToggle(
             this,
             drawerLayout,
             toolbar,
             R.string.cat_navigationdrawer_button_show_content_description,
-            R.string.cat_navigationdrawer_button_hide_content_description));
-    drawerLayout.addDrawerListener(
-        new SimpleDrawerListener() {
+            R.string.cat_navigationdrawer_button_hide_content_description) {
           @Override
-          public void onDrawerOpened(@NonNull View drawerView) {
+          public void onDrawerOpened(View drawerView) {
+            super.onDrawerOpened(drawerView);
             drawerOnBackPressedCallback.setEnabled(true);
           }
 
           @Override
-          public void onDrawerClosed(@NonNull View drawerView) {
+          public void onDrawerClosed(View drawerView) {
+            super.onDrawerClosed(drawerView);
             drawerOnBackPressedCallback.setEnabled(false);
           }
-        });
+        };
+    drawerLayout.addDrawerListener(toggle);
 
     NavigationView navigationViewStart = view.findViewById(R.id.navigation_view_start);
     initNavigationView(navigationViewStart);
@@ -139,4 +141,16 @@ public boolean dispatchKeyEvent(KeyEvent keyEvent) {
   protected boolean shouldShowDefaultDemoActionBar() {
     return false;
   }
+
+  @Override
+  protected void onPostCreate(@Nullable Bundle savedInstanceState) {
+    super.onPostCreate(savedInstanceState);
+    toggle.syncState();
+  }
+
+  @Override
+  public void onConfigurationChanged(@NonNull Configuration newConfig) {
+    super.onConfigurationChanged(newConfig);
+    toggle.onConfigurationChanged(newConfig);
+  }
 }