diff options
| author | Mindy Pereira <mindyp@google.com> | 2012-12-14 17:51:32 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-14 17:51:32 -0800 |
| commit | 0d9a747070daed3ba994b0390c043acfab46506e (patch) | |
| tree | 67e5e3811745b5dabc7457dbc900faff0d241c07 /photoviewer | |
| parent | e53c7a6b1fe833d400ae06ad17f4be406d1653ff (diff) | |
| parent | e9c8a53c11e7092344f49e965150037ca8581dbe (diff) | |
| download | android_frameworks_ex-0d9a747070daed3ba994b0390c043acfab46506e.tar.gz android_frameworks_ex-0d9a747070daed3ba994b0390c043acfab46506e.tar.bz2 android_frameworks_ex-0d9a747070daed3ba994b0390c043acfab46506e.zip | |
am e9c8a53c: am 7d7b83bc: Merge "Fix problem where part of wrong photo shows" into jb-mr1.1-dev
* commit 'e9c8a53c11e7092344f49e965150037ca8581dbe':
Fix problem where part of wrong photo shows
Diffstat (limited to 'photoviewer')
| -rw-r--r-- | photoviewer/res/values/dimen.xml | 1 | ||||
| -rw-r--r-- | photoviewer/src/com/android/ex/photo/PhotoViewActivity.java | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/photoviewer/res/values/dimen.xml b/photoviewer/res/values/dimen.xml index c1b8b90..754c99b 100644 --- a/photoviewer/res/values/dimen.xml +++ b/photoviewer/res/values/dimen.xml @@ -21,4 +21,5 @@ <dimen name="photo_crop_stroke_width">1dip</dimen> <dimen name="photo_preview_size">200dip</dimen> <dimen name="retry_button_size">48dip</dimen> + <dimen name="photo_page_margin">32dip</dimen> </resources> diff --git a/photoviewer/src/com/android/ex/photo/PhotoViewActivity.java b/photoviewer/src/com/android/ex/photo/PhotoViewActivity.java index 6c32ae5..678b07f 100644 --- a/photoviewer/src/com/android/ex/photo/PhotoViewActivity.java +++ b/photoviewer/src/com/android/ex/photo/PhotoViewActivity.java @@ -25,6 +25,7 @@ import android.app.Fragment; import android.app.LoaderManager.LoaderCallbacks; import android.content.Intent; import android.content.Loader; +import android.content.res.Resources; import android.database.Cursor; import android.net.Uri; import android.os.Build; @@ -196,18 +197,19 @@ public class PhotoViewActivity extends Activity implements // Create the adapter and add the view pager mAdapter = new PhotoPagerAdapter(this, getFragmentManager(), null, mMaxInitialScale); + final Resources resources = getResources(); mViewPager = (PhotoViewPager) findViewById(R.id.photo_view_pager); mViewPager.setAdapter(mAdapter); mViewPager.setOnPageChangeListener(this); mViewPager.setOnInterceptTouchListener(this); + mViewPager.setPageMargin(resources.getDimensionPixelSize(R.dimen.photo_page_margin)); // Kick off the loader getLoaderManager().initLoader(LOADER_PHOTO_LIST, null, this); final ActionBar actionBar = getActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); - mActionBarHideDelayTime = getResources().getInteger( - R.integer.action_bar_delay_time_in_millis); + mActionBarHideDelayTime = resources.getInteger(R.integer.action_bar_delay_time_in_millis); actionBar.addOnMenuVisibilityListener(this); actionBar.setDisplayOptions(0, ActionBar.DISPLAY_SHOW_TITLE); } |