Merge "Add a hidden test-only API to get Toolbar's navigation view." into nyc-dev

api/test-current.txt

@@ -48352,6 +48352,7 @@ package android.widget {
     method public android.view.Menu getMenu();
     method public java.lang.CharSequence getNavigationContentDescription();
     method public android.graphics.drawable.Drawable getNavigationIcon();
+    method public android.view.View getNavigationView();
     method public android.graphics.drawable.Drawable getOverflowIcon();
     method public int getPopupTheme();
     method public java.lang.CharSequence getSubtitle();

core/java/android/widget/Toolbar.java

@@ -23,6 +23,7 @@ import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.StringRes;
 import android.annotation.StyleRes;
+import android.annotation.TestApi;
 import android.app.ActionBar;
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -975,6 +976,15 @@ public class Toolbar extends ViewGroup {
         mNavButtonView.setOnClickListener(listener);
     }
 
+    /**
+     * @hide
+     */
+    @Nullable
+    @TestApi
+    public View getNavigationView() {
+        return mNavButtonView;
+    }
+
     /**
      * Return the Menu shown in the toolbar.
      *