diff options
author | Sameer Padala <sxp@google.com> | 2015-01-31 01:09:14 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-31 01:09:14 +0000 |
commit | 6b3c775727d55a0aa5b25d0ea89b939b71624cd2 (patch) | |
tree | 4ff7198df257f3a36c5c5b6a522aab186600e6e7 | |
parent | ab5af008ce894d6df9baaf5f9f93bea076b56a2c (diff) | |
parent | 8fd74831de067fbadad180c54f70fb4a5375a933 (diff) | |
download | android_packages_apps_Trebuchet-6b3c775727d55a0aa5b25d0ea89b939b71624cd2.tar.gz android_packages_apps_Trebuchet-6b3c775727d55a0aa5b25d0ea89b939b71624cd2.tar.bz2 android_packages_apps_Trebuchet-6b3c775727d55a0aa5b25d0ea89b939b71624cd2.zip |
am 8fd74831: Source change to get code compiling on google3
* commit '8fd74831de067fbadad180c54f70fb4a5375a933':
Source change to get code compiling on google3
-rw-r--r-- | src/com/android/launcher3/AutoInstallsLayout.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/BubbleTextView.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/WidgetPreviewLoader.java | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher3/AutoInstallsLayout.java b/src/com/android/launcher3/AutoInstallsLayout.java index 00f0cf36f..08ed89b43 100644 --- a/src/com/android/launcher3/AutoInstallsLayout.java +++ b/src/com/android/launcher3/AutoInstallsLayout.java @@ -142,7 +142,7 @@ public class AutoInstallsLayout implements WorkspaceLoader { mDb = db; try { return parseLayout(mRes, mLayoutId, screenIds); - } catch (XmlPullParserException | IOException | RuntimeException e) { + } catch (Exception e) { Log.w(TAG, "Got exception parsing layout.", e); return -1; } diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index a368796bd..73c7831f9 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -40,7 +40,7 @@ import android.widget.TextView; */ public class BubbleTextView extends TextView { - private static SparseArray<Theme> sPreloaderThemes = new SparseArray<>(2); + private static SparseArray<Theme> sPreloaderThemes = new SparseArray<Theme>(2); private static final float SHADOW_LARGE_RADIUS = 4.0f; private static final float SHADOW_SMALL_RADIUS = 1.75f; diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java index 5aa719027..184fd78eb 100644 --- a/src/com/android/launcher3/WidgetPreviewLoader.java +++ b/src/com/android/launcher3/WidgetPreviewLoader.java @@ -130,8 +130,8 @@ public class WidgetPreviewLoader { private final PaintCache mDefaultAppWidgetPreviewPaint = new PaintCache(); private final BitmapFactoryOptionsCache mCachedBitmapFactoryOptions = new BitmapFactoryOptionsCache(); - private final HashMap<String, WeakReference<Bitmap>> mLoadedPreviews = new HashMap<>(); - private final ArrayList<SoftReference<Bitmap>> mUnusedBitmaps = new ArrayList<>(); + private final HashMap<String, WeakReference<Bitmap>> mLoadedPreviews = new HashMap<String, WeakReference<Bitmap>>(); + private final ArrayList<SoftReference<Bitmap>> mUnusedBitmaps = new ArrayList<SoftReference<Bitmap>>(); private final Context mContext; private final int mAppIconSize; |