summaryrefslogtreecommitdiffstats
path: root/util/com/android/launcher3/DecoderRing.java
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2015-07-23 21:24:37 -0700
committerHyunyoung Song <hyunyoungs@google.com>2015-07-23 21:24:37 -0700
commit0c0d54637af7109ae22e21a117dba3efdaded4b5 (patch)
treefe9ed94353b09dda232fceb64691f96dcd5db8d3 /util/com/android/launcher3/DecoderRing.java
parentcf51139c6e1d57b57177109f2177edc41edf5bbc (diff)
parent13ef17a37e683b8ad5800e9f542b411180fbec2f (diff)
downloadandroid_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.tar.gz
android_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.tar.bz2
android_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.zip
resolved conflicts for merge of 13ef17a3 to mnc-ub-dev
b/22609402 Change-Id: I80699d985088b9b79211284e710e8a6b8b90860b
Diffstat (limited to 'util/com/android/launcher3/DecoderRing.java')
-rw-r--r--util/com/android/launcher3/DecoderRing.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/util/com/android/launcher3/DecoderRing.java b/util/com/android/launcher3/DecoderRing.java
index 86431d9b7..0732fe889 100644
--- a/util/com/android/launcher3/DecoderRing.java
+++ b/util/com/android/launcher3/DecoderRing.java
@@ -220,9 +220,6 @@ class DecoderRing {
if (widget.icon != null) {
writeImageData(widget.icon.data, prefix + "_icon.png");
}
- if (widget.preview != null) {
- writeImageData(widget.preview.data, prefix + "_preview.png");
- }
}
}
}