commit 00ab85ed13ab658e396346aae64547c2d0ca6022
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 13 17:00:00 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 13 17:00:01 2017 +0000
tree 07c2564e609181b8c6c591107ac0ba9fac4b0bee
parent 47af0f491e945f5f52e892d911503131959e5b02
parent c20d688fcee47a81473a5a44e5bec3a9b55e5e89

Merge "Fix crash when viewing or editing contacts without account" into oc-dev

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