Commit Graph

33301 Commits

Author SHA1 Message Date
TreeHugger Robot 441e5b76b9 Merge "Log tap on pause app." into ub-launcher3-rvc-dev 2020-06-04 19:09:08 +00:00
TreeHugger Robot 7a41d1e909 Merge "Log tap on app info within task menu." into ub-launcher3-rvc-dev 2020-06-04 19:09:05 +00:00
Zak Cohen e4ad2ce1e2 Screenshots - move to new api that uses image bundle.
Bug: 157380566
Bug: 156757117
Test: local
Change-Id: I5d688abc87a89ae93e2e2f9a0e13410c511cc15e
2020-06-04 11:32:10 -07:00
TreeHugger Robot 5782d683f8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into ub-launcher3-rvc-dev am: fb4fa0c4c7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7a401a1e131c7974c0c35b6c689855200c7c3db0
2020-06-04 16:57:50 +00:00
TreeHugger Robot 6648acceef [automerger skipped] Merge "Import translations. DO NOT MERGE" into ub-launcher3-rvc-dev am: 0b5610b040 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8a44570ddfaf3954aff2f05696aa45c69b36b6a0
2020-06-04 16:57:37 +00:00
TreeHugger Robot fb4fa0c4c7 Merge "Import translations. DO NOT MERGE" into ub-launcher3-rvc-dev 2020-06-04 16:41:44 +00:00
TreeHugger Robot 0b5610b040 Merge "Import translations. DO NOT MERGE" into ub-launcher3-rvc-dev 2020-06-04 16:34:49 +00:00
Adam Cohen fa6e021ce6 Merging from ub-launcher3-rvc-dev @ build 6557059
Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-rvc-dev_rvc-dev_6557059.html

Change-Id: I9c0912f26445d454f71c4f0f63d45b184726db3d
Merged-In: I280025d9e58626fe725fe24ca60c28e89d0cee74
2020-06-04 15:02:12 +00:00
Zak Cohen c34893823d Resolve markers - Fix build break. am: 1e7b4b850f am: 910e895a99 am: 188092646c am: 3f2f1f74e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11725363

Change-Id: I38570cf3b016a57000eb0067a45a9f20298babfa
2020-06-04 05:56:21 +00:00
Zak Cohen c9ed2a5e46 Resolve markers - Fix build break. am: 1e7b4b850f am: bb4cb00ff0 am: 40c8cf14d7 am: d821dbe38a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11725363

Change-Id: I2d21bd87f1781549d35263a92858c66a664e7413
2020-06-04 05:56:04 +00:00
Zak Cohen 69dbab51db resolve merge conflicts of 67feabb46e to master
Change-Id: Ia3765c419242e8720e4b4df3999d70db9603bdb2
2020-06-04 05:42:53 +00:00
Automerger Merge Worker 9f1d759ffa Merge "Screenshots - move to new api that uses image bundle. am: 1b5923e5e5 am: 2cd83a3fe3" into rvc-d1-dev-plus-aosp am: 3be40590c0 am: abb3c73154
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11727200

Change-Id: I68038997f776850c679e9ace4ed54bb0ca11a749
2020-06-04 05:38:53 +00:00
Zak Cohen cd349049d7 Screenshots - move to new api that uses image bundle. am: 1b5923e5e5 am: 2cd83a3fe3 am: 277f26c4f1 am: 49e2922b0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11727200

Change-Id: Ie80e009fd6ce0e1c70b82ebd785d4cb29d92f2f5
2020-06-04 05:38:09 +00:00
Zak Cohen 3f2f1f74e1 Resolve markers - Fix build break. am: 1e7b4b850f am: 910e895a99 am: 188092646c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11725363

Change-Id: Id3391364294cd31df671c6ae22e0348bd58cf317
2020-06-04 04:56:05 +00:00
Zak Cohen d821dbe38a Resolve markers - Fix build break. am: 1e7b4b850f am: bb4cb00ff0 am: 40c8cf14d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11725363

Change-Id: I87009c59fc77f5eeb2846d41744411a7b44a886b
2020-06-04 04:55:56 +00:00
Zak Cohen 67feabb46e Resolve markers - Fix build break. am: 1e7b4b850f am: 910e895a99 am: fcbe280fdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11725363

Change-Id: Ieec8c5f605fcc8881cd482647cd19958e4bbf9b2
2020-06-04 04:55:30 +00:00
Zak Cohen 40c8cf14d7 Resolve markers - Fix build break. am: 1e7b4b850f am: bb4cb00ff0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11725363

Change-Id: I720e5fc0d11926268a6d4d78eb6b9c111a837cfc
2020-06-04 04:39:17 +00:00
Zak Cohen fcbe280fdc Resolve markers - Fix build break. am: 1e7b4b850f am: 910e895a99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11725363

Change-Id: I34fd11734e012a23b6263ec9a9ba7c006c9acdb4
2020-06-04 04:39:02 +00:00
Zak Cohen 188092646c Resolve markers - Fix build break. am: 1e7b4b850f am: 910e895a99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11725363

Change-Id: I47e2ae41a374111d922ef24a9df31e97f23c69e5
2020-06-04 04:39:00 +00:00
Zak Cohen 0a49ec78da Resolve markers - Fix build break. am: 1e7b4b850f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11725363

Change-Id: I828eb043cb8ca0465469f57a26da208ee82912a5
2020-06-04 04:27:47 +00:00
Zak Cohen bb4cb00ff0 Resolve markers - Fix build break. am: 1e7b4b850f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11725363

Change-Id: I057b13f7ae6464fc7a2c1fd28efbfd8a8592f583
2020-06-04 04:27:26 +00:00
Zak Cohen 910e895a99 Resolve markers - Fix build break. am: 1e7b4b850f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11725363

Change-Id: Ic1ce220a36c1c4e34e1e3bbdfea8b07250245240
2020-06-04 04:27:18 +00:00
Zak Cohen c1ea2b4d8f resolve merge conflicts of 2e0a297ddc to master
Change-Id: I98c38ef84aa72ab0c5b41f88f61690995da74fef
2020-06-04 04:25:38 +00:00
Zak Cohen 1e7b4b850f Resolve markers - Fix build break.
Test: local compile
Bug: 156757117

Change-Id: I95cdfa34ecde95768f82a14463a4b91cf5012d8e
2020-06-04 04:07:34 +00:00
Automerger Merge Worker abb3c73154 Merge "Screenshots - move to new api that uses image bundle. am: 1b5923e5e5 am: 2cd83a3fe3" into rvc-d1-dev-plus-aosp am: 3be40590c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11727200

Change-Id: I7037352673dd0540c9fe292d43e5b5c5949abf09
2020-06-04 03:59:27 +00:00
Zak Cohen 49e2922b0e Screenshots - move to new api that uses image bundle. am: 1b5923e5e5 am: 2cd83a3fe3 am: 277f26c4f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11727200

Change-Id: I2c77b42f369879648bad51ec400bc3986568211d
2020-06-04 03:59:13 +00:00
Zak Cohen 2e0a297ddc Screenshots - move to new api that uses image bundle. am: 1b5923e5e5 am: 604ceb545b am: 58d3ce5542
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11727200

Change-Id: I02caa96b469de2e29b373bb63e8e23b46bb98dbc
2020-06-04 03:58:44 +00:00
Automerger Merge Worker 3be40590c0 Merge "Screenshots - move to new api that uses image bundle. am: 1b5923e5e5 am: 2cd83a3fe3" into rvc-d1-dev-plus-aosp 2020-06-04 03:42:51 +00:00
Zak Cohen 58d3ce5542 Screenshots - move to new api that uses image bundle. am: 1b5923e5e5 am: 604ceb545b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11727200

Change-Id: If9f63a665f2343ef7e7b0ab4dfb6ff8878ec14bc
2020-06-04 03:42:06 +00:00
Zak Cohen db6361e9ea Screenshots - move to new api that uses image bundle. am: 1b5923e5e5 am: 2cd83a3fe3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11727200

Change-Id: Ibe8598abdf0f2e3ed0040b7b4f38ce7d27456ac0
2020-06-04 03:41:54 +00:00
Zak Cohen 277f26c4f1 Screenshots - move to new api that uses image bundle. am: 1b5923e5e5 am: 2cd83a3fe3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11727200

Change-Id: I4defa5156d5e94964aae3b8471633501ba1e2f87
2020-06-04 03:41:49 +00:00
Zak Cohen b84818f67d Screenshots - move to new api that uses image bundle. am: 1b5923e5e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11727200

Change-Id: Ia78aab6b92e82cb635b6dc46cbcf6af22b7a8722
2020-06-04 03:23:34 +00:00
Zak Cohen 604ceb545b Screenshots - move to new api that uses image bundle. am: 1b5923e5e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11727200

Change-Id: I53fb67901bb8792148b9a816971e6444a6856337
2020-06-04 03:23:11 +00:00
Zak Cohen 2cd83a3fe3 Screenshots - move to new api that uses image bundle. am: 1b5923e5e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11727200

Change-Id: Ie1f907568384cc40ec38b810e4ac57e2a8ec2e93
2020-06-04 03:23:08 +00:00
Andy Wickham 0425762c4e Merge "Adds Assistant Sandbox tutorial." into ub-launcher3-rvc-dev am: ad6a4dceea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11688618

Change-Id: Ib10371ca89ee88a66722f7db13f127e4f3ece8ef
2020-06-04 01:43:04 +00:00
Andy Wickham ad6a4dceea Merge "Adds Assistant Sandbox tutorial." into ub-launcher3-rvc-dev 2020-06-04 01:30:22 +00:00
android-build-team Robot 3eae38e9c9 Snap for 6557338 from e557bac0a1 to rvc-release
Change-Id: I79e2b2a4a9d3ec541d232bda6c155979dca1aa37
2020-06-04 01:07:58 +00:00
Adam Cohen f903d2c910 Merging from ub-launcher3-rvc-dev @ build 6557059
Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-rvc-dev_rvc-dev_6557059.html

Change-Id: I280025d9e58626fe725fe24ca60c28e89d0cee74
2020-06-04 00:56:51 +00:00
Zak Cohen 1af62e2323 Revert "Shared Lib - add stub for handleImageBundleAsScreenshot." am: f2a6d5b70f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11727199

Change-Id: I583606daecfc260c20eed3a527d1d6ace1cb8a6f
2020-06-04 00:10:48 +00:00
Bill Yi 54a995162c Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I83d3a32c7a0ebd4275c563c1a794ab07c69d779c
2020-06-04 00:08:38 +00:00
Bill Yi f2d2d1e084 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I0322065edda96559d79a8fbda5d05354b8460fda
2020-06-04 00:08:26 +00:00
Adam Cohen 966e7ba405 [automerger skipped] Merging from ub-launcher3-rvc-dev @ build 6552182 am: e557bac0a1 am: a203a72143 -s ours am: 2fb63ca806 -s ours am: afd6a98f9d -s ours
am skip reason: Change-Id I795aafd151c6ce53077e1aebb97567eedd84f274 with SHA-1 e557bac0a1 is in history

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

Change-Id: I9bacf508ca71fd31c16e7475ae9600d36b98b23e
2020-06-03 23:41:57 +00:00
Adam Cohen d2f45abc42 [automerger skipped] Merging from ub-launcher3-rvc-dev @ build 6552182 am: e557bac0a1 am: b44fe59a6f am: 9d09bfbf38 -s ours am: ed2e462ec0 -s ours
am skip reason: Change-Id I795aafd151c6ce53077e1aebb97567eedd84f274 with SHA-1 e557bac0a1 is in history

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

Change-Id: I9b295c6b9d35dd4c918dd7519594c8c6a48454db
2020-06-03 23:41:17 +00:00
Adam Cohen 080ff36715 [automerger skipped] Merging from ub-launcher3-rvc-dev @ build 6552182 am: e557bac0a1 am: b44fe59a6f am: cf0cd2a35a am: a7c707f445 -s ours
am skip reason: Change-Id I795aafd151c6ce53077e1aebb97567eedd84f274 with SHA-1 5ca2980e54 is in history

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

Change-Id: I42ed4b15e2861f718aa23f3eb2351135b154b054
2020-06-03 23:40:58 +00:00
Zak Cohen 1b5923e5e5 Screenshots - move to new api that uses image bundle.
Bug: 157380566
Bug: 156757117
Test: local
Change-Id: I5d688abc87a89ae93e2e2f9a0e13410c511cc15e
2020-06-03 23:30:42 +00:00
Zak Cohen f2a6d5b70f Revert "Shared Lib - add stub for handleImageBundleAsScreenshot."
This reverts commit 1e60bb54ca.

Reason for revert: Stub not needed

Change-Id: I71e5bb38e37042addaaff75423bc47209d56a20b
2020-06-03 23:29:20 +00:00
Adam Cohen afd6a98f9d [automerger skipped] Merging from ub-launcher3-rvc-dev @ build 6552182 am: e557bac0a1 am: a203a72143 -s ours am: 2fb63ca806 -s ours
am skip reason: Change-Id I795aafd151c6ce53077e1aebb97567eedd84f274 with SHA-1 e557bac0a1 is in history

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

Change-Id: I4133458e3ed8ac504349445b12425f34017e48e9
2020-06-03 23:28:58 +00:00
Adam Cohen ed2e462ec0 [automerger skipped] Merging from ub-launcher3-rvc-dev @ build 6552182 am: e557bac0a1 am: b44fe59a6f am: 9d09bfbf38 -s ours
am skip reason: Change-Id I795aafd151c6ce53077e1aebb97567eedd84f274 with SHA-1 e557bac0a1 is in history

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

Change-Id: Ic0a9bc6d7b65f114722594c28869680f2e34e571
2020-06-03 23:28:39 +00:00
Adam Cohen a7c707f445 Merging from ub-launcher3-rvc-dev @ build 6552182 am: e557bac0a1 am: b44fe59a6f am: cf0cd2a35a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11707957

Change-Id: Ic4fa00fe7be32b5584cd7221c7377bb35b975458
2020-06-03 23:28:22 +00:00
Adam Cohen 2fb63ca806 [automerger skipped] Merging from ub-launcher3-rvc-dev @ build 6552182 am: e557bac0a1 am: a203a72143 -s ours
am skip reason: Change-Id I795aafd151c6ce53077e1aebb97567eedd84f274 with SHA-1 e557bac0a1 is in history

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

Change-Id: I0d82e42e6aab3a9cc50db38a59eb7ddff092d448
2020-06-03 23:15:05 +00:00