summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/browser')
-rw-r--r--src/com/android/browser/BrowserActivity.java16
-rw-r--r--src/com/android/browser/BrowserBookmarksPage.java4
2 files changed, 13 insertions, 7 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index faf0e6b..ff8a589 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -2335,16 +2335,24 @@ public class BrowserActivity extends Activity
}
}
+ /**
+ * Constants for the size of the thumbnail created when taking a screenshot
+ */
+ /* package */ static final int THUMBNAIL_WIDTH = 130;
+ /* package */ static final int THUMBNAIL_HEIGHT = 104;
+
private Bitmap createScreenshot(WebView view) {
Picture thumbnail = view.capturePicture();
- // Keep width and height in sync with BrowserBookmarksPage
- // and bookmark_thumb
- Bitmap bm = Bitmap.createBitmap(100, 80,
+ Bitmap bm = Bitmap.createBitmap(THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT,
Bitmap.Config.ARGB_4444);
Canvas canvas = new Canvas(bm);
// May need to tweak these values to determine what is the
// best scale factor
- canvas.scale(.5f, .5f);
+ int contentWidth = view.getContentWidth();
+ if (contentWidth > 0) {
+ float scaleFactor = (float) THUMBNAIL_WIDTH / (float) contentWidth;
+ canvas.scale(scaleFactor, scaleFactor);
+ }
thumbnail.draw(canvas);
return bm;
}
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index 019806c..0f1754e 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -293,9 +293,7 @@ public class BrowserBookmarksPage extends Activity implements
mGridPage.setAdapter(mBookmarksAdapter);
mGridPage.setOnItemClickListener(mListener);
mGridPage.setNumColumns(GridView.AUTO_FIT);
- // Keep this in sync with bookmark_thumb and
- // BrowserActivity.updateScreenshot
- mGridPage.setColumnWidth(100);
+ mGridPage.setColumnWidth(BrowserActivity.THUMBNAIL_WIDTH);
mGridPage.setFocusable(true);
mGridPage.setFocusableInTouchMode(true);
mGridPage.setSelector(android.R.drawable.gallery_thumb);