am skip reason: Change-Id I2241bdb524ca6bc66e545a0ec8433119e0448358 with SHA-1 b2049196b9 is in history
Change-Id: I9f4d692dd2a3e09a78e31767f4ed094b921d0524
This just crashes since we can't access SharedPreferences, and we don't
addPluginListener until onUserUnlocked() anyway.
Bug: 145019350
Change-Id: I705498f859857a52a2cb5735201a652973b26d0b
(cherry picked from commit 435b11b95f)
This just crashes since we can't access SharedPreferences, and we don't
addPluginListener until onUserUnlocked() anyway.
Change-Id: I705498f859857a52a2cb5735201a652973b26d0b
The current logic in BaseIconFactory is only trying to add the user
badge if the user passed in isn't null and isn't the current user,
then if no such attempt is made, try to add an instant app badge. This
is causing user badge to disappear if the current user is a work
profile. Meanwhile, the badging logic in IconDrawableFactory is to try
to add the instant app badge first, and then always try to add the
user badge.
Bug: 132625654
Test: manually test as in b/128625591
Change-Id: Ia5b456f1f27095d546504266a1a90034105c9ae9
Merged-In: I2241bdb524ca6bc66e545a0ec8433119e0448358
(cherry picked from commit bdb0236125922a3a9b20fbaa8ecd1d2477b48ed5)
The current logic in BaseIconFactory is only trying to add the user
badge if the user passed in isn't null and isn't the current user,
then if no such attempt is made, try to add an instant app badge. This
is causing user badge to disappear if the current user is a work
profile. Meanwhile, the badging logic in IconDrawableFactory is to try
to add the instant app badge first, and then always try to add the
user badge.
Bug: 132625654
Test: manually test as in b/128625591
Change-Id: I2241bdb524ca6bc66e545a0ec8433119e0448358
Signed-off-by: Hyunyoung Song <hyunyoungs@google.com>
am skip reason: Change-Id I082291ca9b288f57701cc00d61a9b3a84da8b084 with SHA-1 ad7e30f5d7 is in history
Change-Id: Ia0b4a222f49ffab92533873134b358df1780ddf2
- The bug is caused by cancelling of the RectFSpringAnim before the
StaggeredWorkspaceAnim has started.
- Instead of having logic in StaggeredWorkspaceAnim control the visibility
of the icon, we instead maintain all the visibility within the
FloatingIconView class itself.
Bug: 142120338
Change-Id: I94f3a066d395f9c3b97dc6ee9fc836e9401650a5
Merged-In: I082291ca9b288f57701cc00d61a9b3a84da8b084
- The bug is caused by cancelling of the RectFSpringAnim before the
StaggeredWorkspaceAnim has started.
- Instead of having logic in StaggeredWorkspaceAnim control the visibility
of the icon, we instead maintain all the visibility within the
FloatingIconView class itself.
Bug: 142120338
Change-Id: I082291ca9b288f57701cc00d61a9b3a84da8b084
When flinging up and to the right, we previously always returned
home. Now, if the right velocity is stronger, we quick switch.
Bug: 126596417
Change-Id: I14fa0584399bb90f2e07e0b296fc5932d8224fbf
am: 8b406b8d31 -s ours
am skip reason: change_id I8a1e20d0b175f03a1a05c81749f07ab5314e872a with SHA1 73b84ce47f is in history
Change-Id: If28a800615a8a50ec5bf9b15f12a43658012e998
am: f3761296a1 -s ours
am skip reason: change_id I65a2c71c9acd2f5345941ea2cff7d32c04b7be3f with SHA1 4df42f85a4 is in history
Change-Id: Ife6d77baef86054445ccbe966c3e880f1c95007c
am: ced2347289 -s ours
am skip reason: change_id Id679ad84c08246e205c667a78ed5df00d7276258 with SHA1 37a0970bf5 is in history
Change-Id: I9fc180a21ce82d4088211c144134636f127d1447
We were previously offsetting the launcher animation progress based
on when we got onGestureStart, which meant it would lag behind if
onGestureStart came late. Now that we track the window instead of
the launcher shelf, and we don't show the launcher animation right
away in fully gestural mode anyway, we should remove this to ensure
the launcher part of the animation always lines up with the app
window.
We also reapply state whenever predictions are enabled, e.g. when
launcher starts after being force stopped, and previously this was
canceling the existing state animation. We don't want to do that
because predictions can be enabled at any point on a cold start,
and cancelling the existing state animation means that RecentsView
shows up in fullscreen and not attached to the app window for the
duration of the gesture.
Bug: 144454486
Change-Id: I65a2c71c9acd2f5345941ea2cff7d32c04b7be3f
Merged-In: I65a2c71c9acd2f5345941ea2cff7d32c04b7be3f
am: 70a2a7dcac -s ours
am skip reason: change_id I5ba501b04b3eaf12a20ba1312ef362f9734761c3 with SHA1 85d6f25016 is in history
Change-Id: Ie23add1cbd181cc6d84f00f3f9d7c3a107c5589d
The issue was that the scaled folder size was smaller than the clip size.
To ensure that the folder size is always larger than the clip size, we
instead scale the contents of the folder instead of the folder itself.
Bug: 143703075
Change-Id: I6eadcc487148fe7e2b7dd9f0ff94a9205048b992
This CL adds git history that is missing in: ag/q/topic:merge_5945220
How was this generated:
$ git merge -s ours 40f8756793
More context:
40f8756793 is Launcher3 SHA from build 5945220
Test: on top of this git history CL, I executed merge and only two files
had merge conflicts BaseIconFactory and QuicksteLauncher.
Change-Id: Ifd9b738aa681202cff09ccfc18c2a2f8a08acbe3
android-build-team Robot
Automerger Merge Worker
TreeHugger Robot
Hyunyoung Song
Tony Wickham
Hai Zhang
Xin Li
vadimt
Jon Miranda
thiruram