diff options
| author | Sameer Padala <sxp@google.com> | 2014-09-08 16:00:29 -0700 |
|---|---|---|
| committer | Sameer Padala <sxp@google.com> | 2014-09-22 15:17:18 -0700 |
| commit | 8fd74831de067fbadad180c54f70fb4a5375a933 (patch) | |
| tree | ad2d4496b0796843f8a4287a9eb4ada44ea0e2f5 | |
| parent | 12429e46b195281e0c43c8edfaf23b8ae42e76ff (diff) | |
| download | android_packages_apps_Trebuchet-8fd74831de067fbadad180c54f70fb4a5375a933.tar.gz android_packages_apps_Trebuchet-8fd74831de067fbadad180c54f70fb4a5375a933.tar.bz2 android_packages_apps_Trebuchet-8fd74831de067fbadad180c54f70fb4a5375a933.zip | |
Source change to get code compiling on google3
Change-Id: Ib16df8dd9caa04903a664d8cf92767107fe57628
| -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; |