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

Commit 9223788e authored by Tomasz Mikolajewski's avatar Tomasz Mikolajewski Committed by Android Git Automerger
Browse files

am 327dbb57: am 41ce0039: Merge "Remove the action bar icon when there is no... 

am 327dbb57: am 41ce0039: Merge "Remove the action bar icon when there is no drawer enabled." into mnc-dev

* commit '327dbb57':
  Remove the action bar icon when there is no drawer enabled.
parents b8f58b8f 327dbb57

packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java

+7 −10
Original line number Original line Diff line number Diff line
@@ -408,15 +408,8 @@ public class DocumentsActivity extends BaseActivity { 
            }

            }

        }

        }





        final RootInfo root = getCurrentRoot();

        if (!mShowAsDialog && mDrawerLayout.getDrawerLockMode(mRootsDrawer) ==

        final boolean showRootIcon = mShowAsDialog

                DrawerLayout.LOCK_MODE_UNLOCKED) {

                || (mState.action == ACTION_MANAGE || mState.action == ACTION_BROWSE);

        if (showRootIcon) {

            mToolbar.setNavigationIcon(

                    root != null ? root.loadToolbarIcon(mToolbar.getContext()) : null);

            mToolbar.setNavigationContentDescription(R.string.drawer_open);

            mToolbar.setNavigationOnClickListener(null);

        } else {

            mToolbar.setNavigationIcon(R.drawable.ic_hamburger);

            mToolbar.setNavigationIcon(R.drawable.ic_hamburger);

            mToolbar.setNavigationContentDescription(R.string.drawer_open);

            mToolbar.setNavigationContentDescription(R.string.drawer_open);

            mToolbar.setNavigationOnClickListener(new View.OnClickListener() {

            mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
@@ -425,6 +418,10 @@ public class DocumentsActivity extends BaseActivity { 
                    setRootsDrawerOpen(true);

                    setRootsDrawerOpen(true);

                }

                }

            });

            });

        } else {

            mToolbar.setNavigationIcon(null);

            mToolbar.setNavigationContentDescription(R.string.drawer_open);

            mToolbar.setNavigationOnClickListener(null);

        }

        }





        if (mSearchManager.isExpanded()) {

        if (mSearchManager.isExpanded()) {
@@ -433,7 +430,7 @@ public class DocumentsActivity extends BaseActivity { 
            mToolbarStack.setAdapter(null);

            mToolbarStack.setAdapter(null);

        } else {

        } else {

            if (mState.stack.size() <= 1) {

            if (mState.stack.size() <= 1) {

                mToolbar.setTitle(root.title);

                mToolbar.setTitle(getCurrentRoot().title);

                mToolbarStack.setVisibility(View.GONE);

                mToolbarStack.setVisibility(View.GONE);

                mToolbarStack.setAdapter(null);

                mToolbarStack.setAdapter(null);

            } else {

            } else {