Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94ecef02 authored by Kirill Grouchnikov's avatar Kirill Grouchnikov Committed by android-build-merger
Browse files

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

am: bbcf4327

* commit 'bbcf4327':
  Add a hidden test-only API to get Toolbar's navigation view.

Change-Id: Id24760bed597ad0b154e0ec1120d065a4627c7ea
parents 586da02e bbcf4327

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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

+10 −0
Original line number Diff line number Diff line
@@ -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.

     *