diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-25 18:10:23 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-25 18:10:23 -0700 |
| commit | 875372770361fc1005a6518e8a0074be7c043b13 (patch) | |
| tree | d0275ffec25381cad0bbc3ecba3fc0e5858e5737 /src/com/android/gallery3d/app | |
| parent | be7964f1843065b040485c0528ef30b11648c1ae (diff) | |
| parent | fece30c283386fd0439831b63f0e373489b41166 (diff) | |
| download | android_packages_apps_Gallery2-875372770361fc1005a6518e8a0074be7c043b13.tar.gz android_packages_apps_Gallery2-875372770361fc1005a6518e8a0074be7c043b13.tar.bz2 android_packages_apps_Gallery2-875372770361fc1005a6518e8a0074be7c043b13.zip | |
Merge "SnapdragonGallery: Fix timetitle doesn't show"
Diffstat (limited to 'src/com/android/gallery3d/app')
| -rwxr-xr-x | src/com/android/gallery3d/app/GalleryActivity.java | 4 | ||||
| -rwxr-xr-x | src/com/android/gallery3d/app/PhotoPage.java | 6 | ||||
| -rwxr-xr-x | src/com/android/gallery3d/app/TimeLinePage.java | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/com/android/gallery3d/app/GalleryActivity.java b/src/com/android/gallery3d/app/GalleryActivity.java index 93ac5a4bc..e18f1c2c6 100755 --- a/src/com/android/gallery3d/app/GalleryActivity.java +++ b/src/com/android/gallery3d/app/GalleryActivity.java @@ -91,10 +91,6 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On public static final String KEY_FROM_SNAPCAM = "from-snapcam"; public static final String KEY_TOTAL_NUMBER = "total-number"; - //add for TimelinePage and PhotoPage: -1 don't show timeline title, 0 show timeline title - public static final int CLUSTER_ALBUMSET_NO_TITLE = -1; - public static final int CLUSTER_ALBUMSET_TIME_TITLE = 0; - private static final String TAG = "GalleryActivity"; private Dialog mVersionCheckDialog; private ListView mDrawerListView; diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index cdd5742fd..008784c91 100755 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -481,7 +481,7 @@ public abstract class PhotoPage extends ActivityState implements mMediaSet = (FilterDeleteSet) mActivity.getDataManager() .getMediaSet(mSetPathString); if (mMediaSet != null && mIsFromTimelineScreen) { - mMediaSet.setClusterKind(GalleryActivity.CLUSTER_ALBUMSET_NO_TITLE); + mMediaSet.setShowAlbumsetTimeTitle(false); } if (mMediaSet == null) { Log.w(TAG, "failed to restore " + mSetPathString); @@ -987,7 +987,7 @@ public abstract class PhotoPage extends ActivityState implements } else { if (mMediaSet != null && mIsFromTimelineScreen) { //if back to TimeLinePage, need show timeline title - mMediaSet.setClusterKind(GalleryActivity.CLUSTER_ALBUMSET_TIME_TITLE); + mMediaSet.setShowAlbumsetTimeTitle(true); } super.onBackPressed(); mActionBar.setBackGroundDefault(); @@ -1613,7 +1613,7 @@ public abstract class PhotoPage extends ActivityState implements //if from TimeLinePage, don't show the timeline title if (mMediaSet != null && mIsFromTimelineScreen) { - mMediaSet.setClusterKind(GalleryActivity.CLUSTER_ALBUMSET_NO_TITLE); + mMediaSet.setShowAlbumsetTimeTitle(false); } mActionBar.setDisplayOptions( diff --git a/src/com/android/gallery3d/app/TimeLinePage.java b/src/com/android/gallery3d/app/TimeLinePage.java index ab16b72af..05fa4d187 100755 --- a/src/com/android/gallery3d/app/TimeLinePage.java +++ b/src/com/android/gallery3d/app/TimeLinePage.java @@ -451,7 +451,7 @@ public class TimeLinePage extends ActivityState implements setLoadingBit(BIT_LOADING_RELOAD); if (null != mMediaSet) { //set to show timeline title - mMediaSet.setClusterKind(GalleryActivity.CLUSTER_ALBUMSET_TIME_TITLE); + mMediaSet.setShowAlbumsetTimeTitle(true); } mLoadingFailed = false; mAlbumDataAdapter.resume(); |