Merge "Eliminate jank when the user deletes a character thereby removing all contact results in the popup." into jb-mr1.1-dev
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 2a24e1f..6f126b4 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.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;
@@ -183,18 +184,19 @@
// Create the adapter and add the view pager
mAdapter = new PhotoPagerAdapter(this, getFragmentManager(), null);
+ 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);
}
