commit f622e4f4943170892cbad865b2b1fec433873820
author Hyunyoung Song <hyunyoungs@google.com> Wed May 03 22:39:45 2017 +0000
committer Hyunyoung Song <hyunyoungs@google.com> Wed May 03 22:39:45 2017 +0000
tree 166e544abf7082862aaebdc3951afc73011d03a7
parent 8ecc14a0ab044a239fe9806a39d7b168b89a1693
parent 8f4a3963b0bc0f98773bf34a3ff2989677d43e96

Guard aginast O for checking AdaptiveIconDrawable b/37952598 am: 8f4a3963b0

Change-Id: I376dd5c29e5a8c1af0b9dc25c8dfe47b50214112

src/com/android/launcher3/graphics/LauncherIcons.java

diff --git a/src/com/android/launcher3/graphics/LauncherIcons.java b/src/com/android/launcher3/graphics/LauncherIcons.java
index 746a639..53521f2 100644
--- a/src/com/android/launcher3/graphics/LauncherIcons.java
+++ b/src/com/android/launcher3/graphics/LauncherIcons.java
@@ -265,7 +265,7 @@
             final int top = (textureHeight-height) / 2;
 
             sOldBounds.set(icon.getBounds());
-            if (icon instanceof AdaptiveIconDrawable) {
+            if (Utilities.isAtLeastO() && icon instanceof AdaptiveIconDrawable) {
                 int offset = Math.min(left, top);
                 int size = Math.max(width, height);
                 icon.setBounds(offset, offset, offset + size, offset + size);