commit 2868d7ca4ec55a603947fb5a9677d91f4082b9bc
author Hyunyoung Song <hyunyoungs@google.com> Wed May 03 23:33:05 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 03 23:33:05 2017 +0000
tree 51c6667d6ce14706c3bc6a7ded024577b85a575f
parent d2d43ef9be85b277d20add65d645570ff0f3526f
parent 8f4a3963b0bc0f98773bf34a3ff2989677d43e96

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

Change-Id: I88f5ff89d7cb5f021f857295db89520100d044ae

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);