summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Miranda <jonmiranda@google.com>2017-03-01 16:06:21 -0800
committerJon Miranda <jonmiranda@google.com>2017-03-01 16:06:21 -0800
commit5fcbad03ef33fa8e25de79b115905592d761ef83 (patch)
tree31d0f1d4689236e93b94b606792822e99627059c
parent0b4a430aac252d6c0aa1c7b9ba5d30804c956f57 (diff)
downloadandroid_packages_apps_Trebuchet-5fcbad03ef33fa8e25de79b115905592d761ef83.tar.gz
android_packages_apps_Trebuchet-5fcbad03ef33fa8e25de79b115905592d761ef83.tar.bz2
android_packages_apps_Trebuchet-5fcbad03ef33fa8e25de79b115905592d761ef83.zip
Added getIconSize method to PreviewLayoutRule interface.
This will be used in new Folder animation. Bug: 35064148 Change-Id: I5573336c0b8a9db8d1e600b1e16de07f48f35a21
-rw-r--r--src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java5
-rw-r--r--src/com/android/launcher3/folder/FolderIcon.java1
-rw-r--r--src/com/android/launcher3/folder/StackFolderIconLayoutRule.java5
3 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
index 194a62fe4..503c2ec9f 100644
--- a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
+++ b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
@@ -121,6 +121,11 @@ public class ClippedFolderIconLayoutRule implements FolderIcon.PreviewLayoutRule
}
@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 407f923bf..d84a9d2e3 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 1f4e64813..9c8c2efdb 100644
--- a/src/com/android/launcher3/folder/StackFolderIconLayoutRule.java
+++ b/src/com/android/launcher3/folder/StackFolderIconLayoutRule.java
@@ -87,6 +87,11 @@ public class StackFolderIconLayoutRule implements FolderIcon.PreviewLayoutRule {
}
@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.
index = MAX_NUM_ITEMS_IN_PREVIEW - index - 1;