diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-14 08:56:25 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-14 08:56:25 -0700 |
| commit | 9c05e88e9a962de544a540a83445a5cde0cc2c18 (patch) | |
| tree | 4a835272e17f45b0a448e3c97d158a1db39ed0c3 /src | |
| parent | 0eb124ce43621b3364a9bdf24d568bdc9f3ac8ed (diff) | |
| parent | b1ef1869e4a4555754b82b5ea92151973db47a12 (diff) | |
| download | android_packages_apps_Gallery2-9c05e88e9a962de544a540a83445a5cde0cc2c18.tar.gz android_packages_apps_Gallery2-9c05e88e9a962de544a540a83445a5cde0cc2c18.tar.bz2 android_packages_apps_Gallery2-9c05e88e9a962de544a540a83445a5cde0cc2c18.zip | |
Merge "SnapdragonGallery: don't show navigation icon when drawer locked"
Diffstat (limited to 'src')
| -rwxr-xr-x[-rw-r--r--] | src/com/android/gallery3d/app/GalleryActivity.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/GalleryActivity.java b/src/com/android/gallery3d/app/GalleryActivity.java index 4e5beabad..7a4e5db28 100644..100755 --- a/src/com/android/gallery3d/app/GalleryActivity.java +++ b/src/com/android/gallery3d/app/GalleryActivity.java @@ -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() { |