From 5fcbad03ef33fa8e25de79b115905592d761ef83 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 1 Mar 2017 16:06:21 -0800
Subject: [PATCH] Added getIconSize method to PreviewLayoutRule interface.

This will be used in new Folder animation.

Bug: 35064148
Change-Id: I5573336c0b8a9db8d1e600b1e16de07f48f35a21
---
 .../launcher3/folder/ClippedFolderIconLayoutRule.java        | 5 +++++
 src/com/android/launcher3/folder/FolderIcon.java             | 1 +
 .../android/launcher3/folder/StackFolderIconLayoutRule.java  | 5 +++++
 3 files changed, 11 insertions(+)

diff --git a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
index 194a62fe4e..503c2ec9f3 100644
--- a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
+++ b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
@@ -120,6 +120,11 @@ public class ClippedFolderIconLayoutRule implements FolderIcon.PreviewLayoutRule
         return scale * mBaselineIconScale;
     }
 
+    @Override
+    public float getIconSize() {
+        return mIconSize;
+    }
+
     @Override
     public int maxNumItems() {
         return MAX_NUM_ITEMS_IN_PREVIEW;
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index 407f923bfc..d84a9d2e3f 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -1138,6 +1138,7 @@ public class FolderIcon extends FrameLayout implements FolderListener {
             PreviewItemDrawingParams params);
         void init(int availableSpace, int intrinsicIconSize, boolean rtl);
         float scaleForItem(int index, int totalNumItems);
+        float getIconSize();
         int maxNumItems();
         boolean clipToBackground();
     }
diff --git a/src/com/android/launcher3/folder/StackFolderIconLayoutRule.java b/src/com/android/launcher3/folder/StackFolderIconLayoutRule.java
index 1f4e648138..9c8c2efdb8 100644
--- a/src/com/android/launcher3/folder/StackFolderIconLayoutRule.java
+++ b/src/com/android/launcher3/folder/StackFolderIconLayoutRule.java
@@ -86,6 +86,11 @@ public class StackFolderIconLayoutRule implements FolderIcon.PreviewLayoutRule {
         return MAX_NUM_ITEMS_IN_PREVIEW;
     }
 
+    @Override
+    public float getIconSize() {
+        return mBaselineIconSize;
+    }
+
     @Override
     public float scaleForItem(int index, int numItems) {
         // Scale is determined by the position of the icon in the preview.