Commit Graph

49925 Commits

Author SHA1 Message Date
Tracy Zhou 0785671ceb Merge "Wallpaper and non-app targets are not necessary" into sc-dev am: 540723bd05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15085898

Change-Id: I6268548f20cd19204b9016e5fa8406738d52c658
2021-06-25 19:27:44 +00:00
Tracy Zhou 540723bd05 Merge "Wallpaper and non-app targets are not necessary" into sc-dev 2021-06-25 19:11:57 +00:00
Schneider Victor-tulias 9617332f60 Remove expensive logging.
Removed expensive logs added for debugging. Removed unused code.

Fixes: 168788486
Test: none
Change-Id: I0579275633361d2d67399c773e6376af74c9f1b1
2021-06-25 11:48:15 -07:00
Vadim Tryshev 324ecf9f91 Merge "Postponing CUJ start by 1 frame" into sc-dev am: e70e6a3b0b am: 841e8c56d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15096971

Change-Id: Ic6b8afd15635b5dd30a5f1285855c17c3b5e09dc
2021-06-25 18:36:22 +00:00
Vadim Tryshev 841e8c56d6 Merge "Postponing CUJ start by 1 frame" into sc-dev am: e70e6a3b0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15096971

Change-Id: I36b5757716c0d326cda42877149a8e13726233a5
2021-06-25 18:21:47 +00:00
Vadim Tryshev 5877fc876a Merge "Postponing CUJ start by 1 frame" into sc-dev am: e70e6a3b0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15096971

Change-Id: Ieef68819c6fb2ff2f96f256818a2b38bbfe7dce3
2021-06-25 18:21:21 +00:00
Vadim Tryshev e70e6a3b0b Merge "Postponing CUJ start by 1 frame" into sc-dev 2021-06-25 17:56:34 +00:00
Jon Miranda 2be425b6b0 Fix folder icon text alignment.
- We set the parent view padding to be cellYPadding, so we no longer need to
  account for it when setting the text LayoutParams.

Bug: 191954558
Test: grid where scalableGrid=true and scalableGrid=false (4x5, and 5x5)
Change-Id: I8d7578b2589f801ceef229b663446d868d135ad0
2021-06-25 10:33:20 -07:00
Hilary Huo cf5b9ac423 Merge "[settings-pixel-search] Flag guard slice logging." into sc-dev am: 7a5a96ea73 am: dd57c2eff7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15084513

Change-Id: I9b6ffeb550208be4f0423b9889e1d0f32282898b
2021-06-25 17:31:59 +00:00
Yogisha Dixit 3893eefe75 resolve merge conflicts of 1491ec31c5 to sc-v2-dev
Test: manual
Bug: 192076258
Change-Id: I44e02383cd8ce386811e24a1c4fd6ce62e38f90f
2021-06-25 17:23:22 +00:00
Yogisha Dixit 0cc33ba984 resolve merge conflicts of a2e4c36d1c to sc-v2-dev-plus-aosp
Change-Id: Icedf6f4eeaa095e8bd013448a6d0e1157a3c0605
2021-06-25 17:18:13 +00:00
Tracy Zhou 936f06e02c Wallpaper and non-app targets are not necessary
Fixes: 191773356
Test: Swipe up to overview, launch another app, and make sure it works
Change-Id: I3f71d90687e18f38ddb17876bf7c56861bc61932
2021-06-25 10:17:50 -07:00
Hilary Huo dd57c2eff7 Merge "[settings-pixel-search] Flag guard slice logging." into sc-dev am: 7a5a96ea73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15084513

Change-Id: Ic18c9f758eaca613260b03355834059e8bd3b8c2
2021-06-25 17:11:36 +00:00
Hilary Huo 894c29b60d Merge "[settings-pixel-search] Flag guard slice logging." into sc-dev am: 7a5a96ea73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15084513

Change-Id: I3a4ece927061416e4139ce0c982eb27827a88dc6
2021-06-25 17:11:28 +00:00
Android Build Coastguard Worker 7b166903d4 Snap for 7493928 from 6a00bf853b to sc-v2-release
Change-Id: Ic5304f05eebd160660a4f1446b73c3b9005cd7fa
2021-06-25 16:55:46 +00:00
Hilary Huo 7a5a96ea73 Merge "[settings-pixel-search] Flag guard slice logging." into sc-dev 2021-06-25 16:54:59 +00:00
Steven Ng 3538a16a8b Merge "Extra logging related to widget removal upon restore" into sc-dev am: 408a73ea76 am: 0d4e57d4f0 am: c9ad90b2ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098572

Change-Id: I166824122d55e480cb0e6bf6e4e47521266a6b4f
2021-06-25 16:41:17 +00:00
TreeHugger Robot 42e59bc8cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4c979388e2 -s ours am: d7cdd6a9f0 -s ours am: 3d2415c34b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098014

Change-Id: Ie8d6719a3d05bd751a64e1889ca48b1879db3123
2021-06-25 16:40:43 +00:00
TreeHugger Robot 08e751c56e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 00e3efc034 -s ours am: 44ec29405a -s ours am: 26834af77e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098012

Change-Id: I239bceacb32066c797a511642f56d3b865e02fc9
2021-06-25 16:40:24 +00:00
TreeHugger Robot 529e095412 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 39c65137ee -s ours am: 832c61cb0e -s ours am: a809446120 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098016

Change-Id: Ic2ba3586a61ef5082d9dde68bc03236abd77359a
2021-06-25 16:40:00 +00:00
Winson Chung b8076eb7a4 Merge "Tweak live tile rotation handling" into sc-dev am: 694734f133 am: 95e819d572 am: b7e99799f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15023837

Change-Id: I23f60db8e75fb52d1e05f253a226148af590b60a
2021-06-25 16:39:33 +00:00
Steven Ng c9ad90b2ec Merge "Extra logging related to widget removal upon restore" into sc-dev am: 408a73ea76 am: 0d4e57d4f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098572

Change-Id: I41f72589fdc83823e36ed5f7ef32745403602291
2021-06-25 16:33:50 +00:00
TreeHugger Robot 3d2415c34b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4c979388e2 -s ours am: d7cdd6a9f0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098014

Change-Id: I014b50d222d6a8a020b1afe8b771e5b3d4f05c45
2021-06-25 16:33:46 +00:00
TreeHugger Robot 26834af77e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 00e3efc034 -s ours am: 44ec29405a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098012

Change-Id: I754df3c2702762ce5b5a6d3b7c84429005bce6df
2021-06-25 16:33:42 +00:00
Steven Ng 0d4e57d4f0 Merge "Extra logging related to widget removal upon restore" into sc-dev am: 408a73ea76
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098572

Change-Id: I5bf17c3b4344b91fee64eab63bf013ea7ab94550
2021-06-25 16:30:53 +00:00
TreeHugger Robot d7cdd6a9f0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4c979388e2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098014

Change-Id: I864f186f5d37c552ddcff1cb50e2dc3708bda9ae
2021-06-25 16:29:39 +00:00
TreeHugger Robot 44ec29405a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 00e3efc034 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098012

Change-Id: I31e34ffda55bc04791c00f65f312a1cf693c4526
2021-06-25 16:29:12 +00:00
TreeHugger Robot fcf22af26f Merge "Update gesture navigation intent tutorial steps handling" into sc-dev am: c20f6b52ab am: 81b70eaed2 am: 1bf9ad41ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15082876

Change-Id: If0c87c82b0ea6b48e672ec70a383ff3ade750a58
2021-06-25 16:29:03 +00:00
Schneider Victor-tulias 327eba923e Merge "Update Gesture navigation tutorial activity permissions" into sc-dev am: a217d6fccd am: 5c68d6e064 am: 67627b19f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15083216

Change-Id: I03a29ecb745cc8aecd5dfbbfe9804260c7c1c419
2021-06-25 16:28:57 +00:00
TreeHugger Robot b8be5f1966 Merge "Revert "Fix some touch issues during gesture nav transition"" into sc-dev am: c48d40475b am: 6a00bf853b am: b3065e1384
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15092224

Change-Id: I8e67a5b9cab40f7bf2cd78666682fc9e858b7a79
2021-06-25 16:28:52 +00:00
TreeHugger Robot b8ad75f87a [automerger skipped] Merge "resolve merge conflicts of a754e678a7 to sc-v2-dev" into sc-v2-dev am: 3e86b02d55 -s ours am: 2aac103477 -s ours
am skip reason: Merged-In I95a80b484516f634fa13347534810c7a51cecc8d with SHA-1 8bdb222a18 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098711

Change-Id: I63dcd445a24d61d05cf2ccdeb585055bb1c68df7
2021-06-25 16:28:47 +00:00
Steven Ng e565d6dbb0 Merge "Extra logging related to widget removal upon restore" into sc-dev am: 408a73ea76 am: a6453a09be am: e6d26322d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098572

Change-Id: I5667a8bcee9bae4181d5ab439b8a0a7dafd29ef3
2021-06-25 16:28:42 +00:00
TreeHugger Robot eff4a3b7c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4c979388e2 -s ours am: 3346c8a679 -s ours am: 58ff249acc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098014

Change-Id: I77ef433ee237d08ad1504752a117dccc2793b1f7
2021-06-25 16:28:37 +00:00
TreeHugger Robot 5deb5c732b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 00e3efc034 -s ours am: f0ba280cc4 -s ours am: 76695e3f31 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098012

Change-Id: Ie13458d2a11bbee6e8f605a28e52113a52971db1
2021-06-25 16:28:32 +00:00
TreeHugger Robot a809446120 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 39c65137ee -s ours am: 832c61cb0e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098016

Change-Id: Id31a49c20f51db71e515fa183908bce417674c83
2021-06-25 16:28:30 +00:00
TreeHugger Robot f56450ec71 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 39c65137ee -s ours am: 8dd1702d6c -s ours am: b4c3fe5d25 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098016

Change-Id: Ib402dbba07bd3b8df98b7c644802d0052b60eb0a
2021-06-25 16:28:26 +00:00
Winson Chung b7e99799f6 Merge "Tweak live tile rotation handling" into sc-dev am: 694734f133 am: 95e819d572
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15023837

Change-Id: I5f813121f308430cd5ce3741d41c827fd561b2e2
2021-06-25 16:28:22 +00:00
TreeHugger Robot 832c61cb0e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 39c65137ee -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098016

Change-Id: I1be3596fcd9b5f9625776416f0c3e4a03a7e95d7
2021-06-25 16:28:16 +00:00
TreeHugger Robot 1bf9ad41ae Merge "Update gesture navigation intent tutorial steps handling" into sc-dev am: c20f6b52ab am: 81b70eaed2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15082876

Change-Id: I6f30f351e5495f0580328c2ec71fd1ed11eed7db
2021-06-25 16:28:15 +00:00
Schneider Victor-tulias 67627b19f4 Merge "Update Gesture navigation tutorial activity permissions" into sc-dev am: a217d6fccd am: 5c68d6e064
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15083216

Change-Id: I8caf7ef099e3461cf7c840629a7cefb0ad179c0b
2021-06-25 16:28:11 +00:00
Winson Chung c6126f26cc Merge "Tweak live tile rotation handling" into sc-dev am: 694734f133 am: 68d222d294 am: 3a9d18372c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15023837

Change-Id: I5ba03a682fc1aa80a6c78f477b3d7a64605396b7
2021-06-25 16:28:10 +00:00
TreeHugger Robot b3065e1384 Merge "Revert "Fix some touch issues during gesture nav transition"" into sc-dev am: c48d40475b am: 6a00bf853b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15092224

Change-Id: I791b755d46acef1e85e1904377df0c0ba0428b07
2021-06-25 16:28:06 +00:00
TreeHugger Robot 2aac103477 [automerger skipped] Merge "resolve merge conflicts of a754e678a7 to sc-v2-dev" into sc-v2-dev am: 3e86b02d55 -s ours
am skip reason: Merged-In I95a80b484516f634fa13347534810c7a51cecc8d with SHA-1 8bdb222a18 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098711

Change-Id: I6c1a641c9573b6ad6e7105381a3b75905af6ded6
2021-06-25 16:28:02 +00:00
TreeHugger Robot 2aa17404a1 Merge "Update gesture navigation intent tutorial steps handling" into sc-dev am: c20f6b52ab am: cd34f3db33 am: 6b22845f58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15082876

Change-Id: I427eddbdc61784875072975007b7dec2907d6afe
2021-06-25 16:27:56 +00:00
Schneider Victor-tulias 21218cad4e Merge "Update Gesture navigation tutorial activity permissions" into sc-dev am: a217d6fccd am: 5f4261c585 am: 6f23cf0ceb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15083216

Change-Id: Ide39abcddc7066106fce0124e7620e41dd13458a
2021-06-25 16:27:50 +00:00
TreeHugger Robot e24effb10d Merge "Revert "Fix some touch issues during gesture nav transition"" into sc-dev am: c48d40475b am: e14ba668cb am: 5560978f64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15092224

Change-Id: I2f7dfc7343d55ae853ec451d88727bb79d7a65dd
2021-06-25 16:27:45 +00:00
TreeHugger Robot f8bd31e172 [automerger skipped] Merge "resolve merge conflicts of ec551791ab to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp am: e4372a530f -s ours
am skip reason: Merged-In I95a80b484516f634fa13347534810c7a51cecc8d with SHA-1 8bdb222a18 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15099330

Change-Id: Ic94318f86bc8d817b512aba1a56bb3bf465af4c4
2021-06-25 16:27:37 +00:00
Steven Ng e6d26322d1 Merge "Extra logging related to widget removal upon restore" into sc-dev am: 408a73ea76 am: a6453a09be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098572

Change-Id: I45cc52d2b8afa57ceeedef1c08219617ae455531
2021-06-25 16:24:10 +00:00
TreeHugger Robot 58ff249acc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4c979388e2 -s ours am: 3346c8a679 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098014

Change-Id: I314649b1a0147d4aac6b3b165f09c54fc3598019
2021-06-25 16:23:47 +00:00
TreeHugger Robot 76695e3f31 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 00e3efc034 -s ours am: f0ba280cc4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098012

Change-Id: Idf3b33c855d6e8f2010983359e0c19e008c7c1a1
2021-06-25 16:23:05 +00:00