diff options
| author | Tony Wickham <twickham@google.com> | 2017-06-22 14:22:40 -0700 |
|---|---|---|
| committer | Tony <twickham@google.com> | 2017-06-27 19:43:18 -0700 |
| commit | aa2272f81cc4a62f847db777efda7959cc2b9979 (patch) | |
| tree | 31fe70125c6918bdde27828d378609310e484da9 /src/com/android/launcher3/shortcuts | |
| parent | d032d2cea4c453c626832a85c4b7bf5241f237dc (diff) | |
| download | android_packages_apps_Trebuchet-aa2272f81cc4a62f847db777efda7959cc2b9979.tar.gz android_packages_apps_Trebuchet-aa2272f81cc4a62f847db777efda7959cc2b9979.tar.bz2 android_packages_apps_Trebuchet-aa2272f81cc4a62f847db777efda7959cc2b9979.zip | |
Popup visual changes
- Don't remove elevation during animation (b/62905720)
- Other adjustments (b/35766387)
- Add "gutter" between notification and shortcuts
- Change shortcuts to always be primary color (e.g. white)
- Scale down shortcut icons when notifications present
- Apply icon extracted color to "Notifications" header
Change-Id: Idf791dc76d15d05d246000ad73810916d7cd1750
Diffstat (limited to 'src/com/android/launcher3/shortcuts')
| -rw-r--r-- | src/com/android/launcher3/shortcuts/ShortcutsItemView.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher3/shortcuts/ShortcutsItemView.java b/src/com/android/launcher3/shortcuts/ShortcutsItemView.java index 8785a56f9..f6fffe00b 100644 --- a/src/com/android/launcher3/shortcuts/ShortcutsItemView.java +++ b/src/com/android/launcher3/shortcuts/ShortcutsItemView.java @@ -35,6 +35,7 @@ import com.android.launcher3.ItemInfo; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAnimUtils; import com.android.launcher3.R; +import com.android.launcher3.anim.PropertyListBuilder; import com.android.launcher3.anim.RoundedRectRevealOutlineProvider; import com.android.launcher3.dragndrop.DragOptions; import com.android.launcher3.dragndrop.DragView; @@ -280,6 +281,9 @@ public class ShortcutsItemView extends PopupItemView implements View.OnLongClick // Make sure the text and icon stay centered in the shortcut. animation.play(translateYFrom(shortcut.getBubbleText(), heightDiff / 2 * fromDir)); animation.play(translateYFrom(shortcut.getIconView(), heightDiff / 2 * fromDir)); + // Scale icons back up to full size. + animation.play(LauncherAnimUtils.ofPropertyValuesHolder(shortcut.getIconView(), + new PropertyListBuilder().scale(1f).build())); } return animation; } |