diff options
| author | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-07 22:44:56 +0000 |
|---|---|---|
| committer | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-07 22:44:56 +0000 |
| commit | 8bcf5e3fa3a1ecbe697ae9766fdbc9146ddf5af6 (patch) | |
| tree | 6c22adaf6c703e403e4b15f0be8b159d2b1a43cd | |
| parent | 6ee43a78f54a4a8b9562ee88bbcc4f9587a339bd (diff) | |
| download | chromium_src-8bcf5e3fa3a1ecbe697ae9766fdbc9146ddf5af6.zip chromium_src-8bcf5e3fa3a1ecbe697ae9766fdbc9146ddf5af6.tar.gz chromium_src-8bcf5e3fa3a1ecbe697ae9766fdbc9146ddf5af6.tar.bz2 | |
[Android] Support missing resource in PopupZoomer.
The PopupZoomer supports the drawable resource not being found,
it should also support the same class of error when getting the
corner radius.
BUG=162413
Review URL: https://chromiumcodereview.appspot.com/11476025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171869 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java b/content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java index 3612698..d62ff77 100644 --- a/content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java +++ b/content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java @@ -110,9 +110,15 @@ class PopupZoomer extends View { private GestureDetector mGestureDetector; private static float getOverlayCornerRadius(Context context) { - if (sOverlayCornerRadius == 0) - sOverlayCornerRadius = context.getResources().getDimension( - R.dimen.link_preview_overlay_radius); + if (sOverlayCornerRadius == 0) { + try { + sOverlayCornerRadius = context.getResources().getDimension( + R.dimen.link_preview_overlay_radius); + } catch (Resources.NotFoundException e) { + Log.w(LOGTAG, "No corner radius resource for PopupZoomer overlay found."); + sOverlayCornerRadius = 1.0f; + } + } return sOverlayCornerRadius; } |