commit 331d6508a23d79e754fb756a07bf3aaf5e0dcd9f
author Hyunyoung Song <hyunyoungs@google.com> Wed Apr 12 22:16:58 2017 -0700
committer Walter Jang <wjang@google.com> Mon Apr 17 19:25:09 2017 +0000
tree 1e2998c3e690a6bc4ccad6adc5ae30bafa58d0b7
parent 11798d44eb59efc943ba5c78635426d3b773db19

Change to AdaptiveIconDrawable.getExtraInsetFraction()
b/37079814
Test: manual, builds

Change-Id: Iba2c388d9aaac5cb4b451e9b60e6dd76785c6862
(cherry picked from commit 47af0f491e945f5f52e892d911503131959e5b02)

src/com/android/contacts/DynamicShortcuts.java

diff --git a/src/com/android/contacts/DynamicShortcuts.java b/src/com/android/contacts/DynamicShortcuts.java
index 98e725f..e287e4a 100644
--- a/src/com/android/contacts/DynamicShortcuts.java
+++ b/src/com/android/contacts/DynamicShortcuts.java
@@ -406,9 +406,9 @@
 
         // If on O or higher, add padding around the bitmap.
         final int paddingW = (int) (bitmap.getWidth() *
-                AdaptiveIconDrawable.getExtraInsetPercentage());
+                AdaptiveIconDrawable.getExtraInsetFraction());
         final int paddingH = (int) (bitmap.getHeight() *
-                AdaptiveIconDrawable.getExtraInsetPercentage());
+                AdaptiveIconDrawable.getExtraInsetFraction());
 
         final Bitmap scaledBitmap = Bitmap.createBitmap(bitmap.getWidth() + paddingW,
                 bitmap.getHeight() + paddingH, bitmap.getConfig());
@@ -426,7 +426,7 @@
         if (BuildCompat.isAtLeastO()) {
             // Add padding on >= O
             padding = (int) (RECOMMENDED_ICON_PIXEL_LENGTH *
-                    AdaptiveIconDrawable.getExtraInsetPercentage());
+                    AdaptiveIconDrawable.getExtraInsetFraction());
             width = RECOMMENDED_ICON_PIXEL_LENGTH + padding;
             height = RECOMMENDED_ICON_PIXEL_LENGTH + padding;
         } else {

src/com/android/contacts/ShortcutIntentBuilder.java

diff --git a/src/com/android/contacts/ShortcutIntentBuilder.java b/src/com/android/contacts/ShortcutIntentBuilder.java
index 76ef08f..3a0b36b 100644
--- a/src/com/android/contacts/ShortcutIntentBuilder.java
+++ b/src/com/android/contacts/ShortcutIntentBuilder.java
@@ -432,7 +432,7 @@
 
         // On >= O scale image up by AdaptiveIconDrawable.DEFAULT_VIEW_PORT_SCALE.
         final int scale = (int) (icon.getHeight() *
-                (1f / (1 + 2 * AdaptiveIconDrawable.getExtraInsetPercentage())));
+                (1f / (1 + 2 * AdaptiveIconDrawable.getExtraInsetFraction())));
         final Bitmap scaledBitmap = Bitmap.createBitmap(icon.getWidth() + scale,
                 icon.getHeight() + scale, icon.getConfig());
         Canvas scaledCanvas = new Canvas(scaledBitmap);