Commit Graph

61909 Commits

Author SHA1 Message Date
Fengjiang Li e793cfa668 Merge "Format switch case block of TouchInteractionService so that future change is not blocked by lint" into udc-dev am: 47f2dd6a11 am: e6b8e95820
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22650791

Change-Id: I4f11f5661072db7891a368b910c57b2b466c9238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 01:05:30 +00:00
Fengjiang Li d71de320af Merge "Format switch case block of TouchInteractionService so that future change is not blocked by lint" into udc-dev am: 47f2dd6a11 am: 71f28929d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22650791

Change-Id: I804245612427009c519e746f3e394b86e25a449a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 00:53:41 +00:00
Fengjiang Li 71f28929d1 Merge "Format switch case block of TouchInteractionService so that future change is not blocked by lint" into udc-dev am: 47f2dd6a11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22650791

Change-Id: I5b4af251711fb92f2d51263c2eb9b7b9706ec5d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 23:56:28 +00:00
Fengjiang Li e6b8e95820 Merge "Format switch case block of TouchInteractionService so that future change is not blocked by lint" into udc-dev am: 47f2dd6a11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22650791

Change-Id: I476cdd121c9b3ff7e26dd976d52362dc7d4b723b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 23:55:15 +00:00
Fengjiang Li 47f2dd6a11 Merge "Format switch case block of TouchInteractionService so that future change is not blocked by lint" into udc-dev 2023-04-14 23:18:31 +00:00
Fengjiang Li e12d344b61 Format switch case block of TouchInteractionService so that future change is not blocked by lint
Test: test launching app
Bug: 278092752
Change-Id: I6d3be682d653f7378bb4c9ce4b6a1048e49386dc
2023-04-14 12:43:27 -07:00
Federico Baron d1a7c49771 Merge changes Ic4c5cd96,I2cc2417f into udc-dev am: 087bf95bb6 am: 8bbecd761c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22633986

Change-Id: I5e0ab5f55b48cc84b2b22d691b34009f0c60f082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 19:08:44 +00:00
Federico Baron b169cf9914 Merge changes Ic4c5cd96,I2cc2417f into udc-dev am: 087bf95bb6 am: fcd64d87c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22633986

Change-Id: I44771c4b7df97418043c781b13af3bde1cc00874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 19:06:36 +00:00
Automerger Merge Worker 36141c2f99 Merge "Merge "Using a runtime generated layout for tests instead of defining xml" into udc-dev am: 348e518b2c am: 0d1ce188f7" 2023-04-14 19:05:47 +00:00
Sunny Goyal 5bd03e7167 Merge "Using a runtime generated layout for tests instead of defining xml" into udc-dev am: 348e518b2c am: 0d1ce188f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22578910

Change-Id: I75549a06e7ba4b17c269adf694b94e1c9ccbce96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 19:05:40 +00:00
Sunny Goyal e352d316e7 Merge "Using a runtime generated layout for tests instead of defining xml" into udc-dev am: 348e518b2c am: cb10852386
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22578910

Change-Id: Icd7e21d6a3886d0e4a2e6d06017af7f499e2995a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 19:05:31 +00:00
Federico Baron fcd64d87c5 Merge changes Ic4c5cd96,I2cc2417f into udc-dev am: 087bf95bb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22633986

Change-Id: I8b09f410965f161923795ea12ea8799aac6fd0f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 18:38:57 +00:00
Federico Baron 8bbecd761c Merge changes Ic4c5cd96,I2cc2417f into udc-dev am: 087bf95bb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22633986

Change-Id: I7b3bcfde287ec5e1f196614b3b861f8e46702491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 18:37:58 +00:00
Sunny Goyal 0d1ce188f7 Merge "Using a runtime generated layout for tests instead of defining xml" into udc-dev am: 348e518b2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22578910

Change-Id: I41651abd06e9c6c7b8b8ea5f4ee93202885ad081
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 18:37:55 +00:00
Sunny Goyal cb10852386 Merge "Using a runtime generated layout for tests instead of defining xml" into udc-dev am: 348e518b2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22578910

Change-Id: I38abe3973760f55f07b171e0d5d7457bbfd840ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 18:37:43 +00:00
Federico Baron 087bf95bb6 Merge changes Ic4c5cd96,I2cc2417f into udc-dev
* changes:
  Turn on flag for download app ux V3
  Improve color, contrast, and dimensions to match new spec for download icon
2023-04-14 18:14:49 +00:00
Sunny Goyal 348e518b2c Merge "Using a runtime generated layout for tests instead of defining xml" into udc-dev 2023-04-14 18:12:57 +00:00
Automerger Merge Worker c1a762538f Merge "Merge "Always suppress scrim for taskbar" into udc-dev am: e67092ee1b am: 4f133b341a" 2023-04-14 11:30:00 +00:00
Tiger Huang 8c25235ddf Merge "Always suppress scrim for taskbar" into udc-dev am: e67092ee1b am: 4f133b341a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22612902

Change-Id: I6d75d8528c3b3e4236e01b855e6a6988b2ced7cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 11:29:48 +00:00
Tiger Huang e749e35514 Merge "Always suppress scrim for taskbar" into udc-dev am: e67092ee1b am: 6b1e81f160
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22612902

Change-Id: I9924efff026ed6fd9830f7d191637b3757d7f0ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 11:29:36 +00:00
Tiger Huang 6b1e81f160 Merge "Always suppress scrim for taskbar" into udc-dev am: e67092ee1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22612902

Change-Id: Ie77a5f266eb0af91a494551ff91e0a9082b3f1a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 11:02:49 +00:00
Tiger Huang 4f133b341a Merge "Always suppress scrim for taskbar" into udc-dev am: e67092ee1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22612902

Change-Id: I6413eaf97bce6b2cda349f598a1eb1abfc7d6225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 11:01:59 +00:00
Tiger Huang e67092ee1b Merge "Always suppress scrim for taskbar" into udc-dev 2023-04-14 10:34:09 +00:00
Mike Schneider 6eb5472c4e Merge "Revert ag/22195243 and solve the initialization issue it was supposed to fix differently" into udc-dev am: 45894db9d5 am: b033a91de3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22603900

Change-Id: I679390096576aa3b6d77449f0ef74b558ce1eada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 07:42:38 +00:00
Mike Schneider 82eddd9876 Merge "Revert ag/22195243 and solve the initialization issue it was supposed to fix differently" into udc-dev am: 45894db9d5 am: 50ec631104
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22603900

Change-Id: Ic313fff04e5320233df9ad5b00180df237ca4b9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 07:41:19 +00:00
Mike Schneider b033a91de3 Merge "Revert ag/22195243 and solve the initialization issue it was supposed to fix differently" into udc-dev am: 45894db9d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22603900

Change-Id: I5434a1f11d6f5403e7edfcd34fa50bc7e89a3344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 07:14:41 +00:00
Mike Schneider 50ec631104 Merge "Revert ag/22195243 and solve the initialization issue it was supposed to fix differently" into udc-dev am: 45894db9d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22603900

Change-Id: Ic99e28ba908ebf3f01949c8fa34f5d7af63192c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 07:13:43 +00:00
Mike Schneider 45894db9d5 Merge "Revert ag/22195243 and solve the initialization issue it was supposed to fix differently" into udc-dev 2023-04-14 06:35:57 +00:00
Federico Baron 2523c4a98e Merge "Fix droptarget button wrong radius on hover" into udc-dev am: cc79886814 am: ebb2026e15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22627995

Change-Id: I53923dbe51f8d19ee34efb2c87e1f3dcc0d15043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 00:53:48 +00:00
Federico Baron e22f597178 Merge "Fix droptarget button wrong radius on hover" into udc-dev am: cc79886814 am: 36a5a138f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22627995

Change-Id: I37339be164465e0a62f32e5fe67faf842937f09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 00:53:24 +00:00
Federico Baron ebb2026e15 Merge "Fix droptarget button wrong radius on hover" into udc-dev am: cc79886814
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22627995

Change-Id: I43e9958a2e866308071433c9319cfe1b1719e13d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 00:26:37 +00:00
Federico Baron 36a5a138f4 Merge "Fix droptarget button wrong radius on hover" into udc-dev am: cc79886814
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22627995

Change-Id: I8a6d47a2a681c23c8c9813d72fc9919ddfdf45d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 00:26:31 +00:00
fbaron ff8b89cea4 Turn on flag for download app ux V3
Bug: 267272201
Test: Verify that when the flag is on the new app download animation is visible
Change-Id: Ic4c5cd9678d6eb5dd9d66114e82eb9d93d48fd46
2023-04-13 23:53:20 +00:00
Federico Baron 4ba9c11568 Improve color, contrast, and dimensions to match new spec for download icon
Here we update the values to the correct HCT values according to the specs, as well as the size of the icon

Bug: 267272201
Test: Turn on flag ENABLE_DOWNLOAD_APP_UX_V3 and download an app to see the changes.
Change-Id: I2cc2417f7500c4c08c41056bfeef3c33f4eab174
2023-04-13 23:53:20 +00:00
Federico Baron cc79886814 Merge "Fix droptarget button wrong radius on hover" into udc-dev 2023-04-13 23:50:12 +00:00
Automerger Merge Worker f14be10a8f Merge "Merge "Make all debug feature flags boot aware." into udc-dev am: 4c28cd49ca am: b9df2d66d7" 2023-04-13 23:04:41 +00:00
Stefan Andonian f26c200638 Merge "Make all debug feature flags boot aware." into udc-dev am: 4c28cd49ca am: bc8cca70c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22581093

Change-Id: I1da8efda2e00881bd100809065b3381fb4361b4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 23:04:31 +00:00
Stefan Andonian 43af58d131 Merge "Make all debug feature flags boot aware." into udc-dev am: 4c28cd49ca am: b9df2d66d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22581093

Change-Id: I58a424aa315593b46eae24cf168b79b3f360a1c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 23:04:31 +00:00
Stefan Andonian b9df2d66d7 Merge "Make all debug feature flags boot aware." into udc-dev am: 4c28cd49ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22581093

Change-Id: I53f33c49ec0d843bae9ed2fdfc4af1273330873e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 22:35:49 +00:00
Stefan Andonian bc8cca70c8 Merge "Make all debug feature flags boot aware." into udc-dev am: 4c28cd49ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22581093

Change-Id: I433d05c816a805b50afc8689afb2243e0e89c96a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 22:34:53 +00:00
Stefan Andonian 4c28cd49ca Merge "Make all debug feature flags boot aware." into udc-dev 2023-04-13 22:05:36 +00:00
Automerger Merge Worker 500b61a747 Merge changes from topic "am-d38654e08d584dccab8d45deae120eb0"
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fc7fa8f36b -s ours am: b7bcf70a9e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 228af26d0a -s ours am: 091e188555 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 5b31f73a5f -s ours am: 5a4141720e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 733358b46a -s ours am: 58200ebf1d -s ours
2023-04-13 21:26:47 +00:00
Bill Yi aa357ee3b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fc7fa8f36b -s ours am: b7bcf70a9e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib1df066d6bdab38988000768d680a5d7306d73bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 21:22:52 +00:00
Bill Yi 79ad2b5ca9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 228af26d0a -s ours am: 091e188555 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib03a9702cb1112902ad7b4ed4f7e390a2fafd98b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 21:22:44 +00:00
Bill Yi a68035e6fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 5b31f73a5f -s ours am: 5a4141720e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I47c3b8e3a44782c2f1c500d3446a6f15a1ad455a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 21:22:34 +00:00
Bill Yi 8cecba858f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 733358b46a -s ours am: 58200ebf1d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2821d70b304f2308ebe5e998f1e220a557f8543c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 21:22:25 +00:00
Bill Yi 2cd856abe9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fc7fa8f36b -s ours am: f74e2afd8e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7b51c013ed8ebb6b9385401e72b40031fd55da80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 21:21:09 +00:00
Bill Yi 03eabc7852 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 228af26d0a -s ours am: 66b67d963d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie95a1b69b5c8fc9d862acf15f756ae1cbcf2c485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 21:20:59 +00:00
Bill Yi b1a6ca75a1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 5b31f73a5f -s ours am: 9cf86bdaf2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6e1f1bea8bee1866cc059b5693517dfbedbfafd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 21:20:49 +00:00
Bill Yi cd02a33638 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 733358b46a -s ours am: 019c067e81 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icf340af37c5edacc560dca1a1b38a63f4ac554de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 21:20:43 +00:00