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

Commit 9c05e88e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "SnapdragonGallery: don't show navigation icon when drawer locked"

parents 0eb124ce b1ef1869

src/com/android/gallery3d/app/GalleryActivity.java

100644 → 100755
+3 −0
Original line number Diff line number Diff line
@@ -282,8 +282,10 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On 
        if (mDrawerLayout != null) {

            if (setDrawerVisibility && mDrawerLayoutSupported) {

                mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);

                mToolbar.setNavigationIcon(R.drawable.drawer);

            } else {

                mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);

                mToolbar.setNavigationIcon(null);

            }

        }

    }
@@ -419,6 +421,7 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On 
            startTimelinePage();

            mToolbar.setTitle(R.string.albums_title);

        }

        toggleNavDrawer(mDrawerLayoutSupported);

    }



    public void startAlbumPage() {