Commit Graph

542466 Commits

Author SHA1 Message Date
Frank Li
8cb12b28a6 Merge "Adding NetworkStack Metrics/atoms" into rvc-dev am: 64a3cb03e7 am: dc78c3ba8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11629772

Change-Id: Ibe0825787e335e0d5b9dae8087523f750c8e2112
2020-06-12 05:11:11 +00:00
Automerger Merge Worker
b3bf6c02a8 Merge "Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36 am: 89a5c51eca" into rvc-d1-dev-plus-aosp 2020-06-12 05:11:08 +00:00
TreeHugger Robot
177e3d8fe5 Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36 am: 7dda5946b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11702457

Change-Id: I3fcdfe19ba9b2b51e16a013432ef634a446dabe7
2020-06-12 05:10:56 +00:00
TreeHugger Robot
c7f3db371d Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36 am: 89a5c51eca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11702457

Change-Id: I37fb271e9e780bff7ebc754a3f9e025f25575a18
2020-06-12 05:10:55 +00:00
TreeHugger Robot
a9e2502c8c Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36 am: 89a5c51eca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11702457

Change-Id: Ie78c3aee8916f5e1c3e7619c4b8cd91e3e0d0373
2020-06-12 05:10:54 +00:00
Automerger Merge Worker
b67569ee8e Merge "Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a am: 49efb08d79" into rvc-d1-dev-plus-aosp am: c490a815c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592

Change-Id: I194c9ee4b0d544aaf04857015ee7780fbe5178bf
2020-06-12 04:58:39 +00:00
Chalard Jean
e6527eef99 [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: 8aafdcc328 -s ours
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 c022b0c7ea is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835429

Change-Id: I819ea5e14c6eaf108ac7252768014aa5d33891b3
2020-06-12 04:58:29 +00:00
Chalard Jean
0a36671223 Merge "Document the limitation to a hundred callbacks." into rvc-dev am: 8aafdcc328
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835429

Change-Id: Ic82a23e6f949bd2c74c3dc49da516938f0603e2e
2020-06-12 04:58:27 +00:00
Frank Li
dc78c3ba8e Merge "Adding NetworkStack Metrics/atoms" into rvc-dev am: 64a3cb03e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11629772

Change-Id: Ibb7aa50863308e4364c16701d15f76c47725e707
2020-06-12 04:58:05 +00:00
Frank Li
f572adce1e Merge "Adding NetworkStack Metrics/atoms" into rvc-dev am: 64a3cb03e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11629772

Change-Id: I4b789b7c68ede5dd6d73cb5b1c4030855d49940f
2020-06-12 04:58:01 +00:00
Ruchir Rastogi
23319a29b8 Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a am: 40c4fad297 am: deb5941c88
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592

Change-Id: I3abf9f929f91189dfb78375aacfb6cb5932a2204
2020-06-12 04:57:50 +00:00
TreeHugger Robot
7dda5946b7 Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11702457

Change-Id: Id560b7d80d6e7130e4bc9828421305c0a7fd45db
2020-06-12 04:57:34 +00:00
TreeHugger Robot
89a5c51eca Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11702457

Change-Id: I3e8d0b9de32c121e2c9a68306f14dea97e8628d3
2020-06-12 04:57:31 +00:00
Chalard Jean
8aafdcc328 Merge "Document the limitation to a hundred callbacks." into rvc-dev 2020-06-12 04:54:02 +00:00
Ruchir Rastogi
78f4bb2fea Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a am: 40c4fad297 am: 09495218fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592

Change-Id: Icdeef51b41a4d1f25d9cc835903e025aa02114f6
2020-06-12 04:53:21 +00:00
Frank Li
64a3cb03e7 Merge "Adding NetworkStack Metrics/atoms" into rvc-dev 2020-06-12 04:50:57 +00:00
TreeHugger Robot
70bec8cc36 Merge "Help reduce falsing on the seek bar" into rvc-dev 2020-06-12 04:44:55 +00:00
Automerger Merge Worker
c490a815c2 Merge "Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a am: 49efb08d79" into rvc-d1-dev-plus-aosp 2020-06-12 04:42:41 +00:00
Ruchir Rastogi
6cc5dca172 Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a am: 49efb08d79
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592

Change-Id: I65ec2f8a807a74af1af1738b4b3a226290a30caa
2020-06-12 04:42:33 +00:00
Ruchir Rastogi
deb5941c88 Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a am: 40c4fad297
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592

Change-Id: I525b245d12ae4e29c2d70264b437f3b6c826d5ef
2020-06-12 04:42:23 +00:00
Ruchir Rastogi
09495218fc Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a am: 40c4fad297
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592

Change-Id: If6708759480aa14a7ff5d381d1f89c965ba0eee9
2020-06-12 04:42:19 +00:00
Automerger Merge Worker
44103695cb Merge "Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c am: bcd7297083 am: 484684091e" into rvc-qpr-dev-plus-aosp 2020-06-12 04:26:12 +00:00
Automerger Merge Worker
7cd5d622fd Merge "Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c am: 337ffc43d6 am: 7a12114217" into rvc-qpr-dev-plus-aosp 2020-06-12 04:26:00 +00:00
Beth Thibodeau
06fa961dd8 Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c am: bcd7297083 am: 484684091e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843853

Change-Id: I6862c18a0d2bbe7c4304edc059a7dd0413094a7c
2020-06-12 04:25:59 +00:00
Ruchir Rastogi
49efb08d79 Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592

Change-Id: Ibb041b389a8f2ce24f351c46bbe9500b877aeaf7
2020-06-12 04:25:53 +00:00
Beth Thibodeau
42a897949e Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c am: 337ffc43d6 am: 7a12114217
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843853

Change-Id: Ib837ffa68b147d3e4f352e561f98c7f58fb83217
2020-06-12 04:25:44 +00:00
Ruchir Rastogi
40c4fad297 Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592

Change-Id: I0eae405855a39047d0fa315c26e0831d8f613161
2020-06-12 04:25:39 +00:00
Beth Thibodeau
25995f3e00 Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c am: 337ffc43d6 am: 10288035a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843853

Change-Id: I2366e8eead9f2ae268e90784d46b5240b1108301
2020-06-12 04:25:35 +00:00
Ruchir Rastogi
003ef4903a Merge "Add libincident_test to MTS" into rvc-dev 2020-06-12 04:11:44 +00:00
Beth Thibodeau
484684091e Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c am: bcd7297083
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843853

Change-Id: I66b51251b3612e76329fc0f943630d4a6ab90e7f
2020-06-12 04:02:51 +00:00
Beth Thibodeau
7a12114217 Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c am: 337ffc43d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843853

Change-Id: I8136048af682c7d469b945042f122a0adae788e5
2020-06-12 04:02:31 +00:00
Beth Thibodeau
10288035a6 Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c am: 337ffc43d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843853

Change-Id: I46f16765640c2e6f8f31261be951992378f8997b
2020-06-12 04:02:29 +00:00
Yunfan Chen
125172c599 Merge "Remove IME surface when occured in multi-window mode" into rvc-dev am: b55bc82d13 am: c56f6b53b7 am: 8daf1bdbd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612967

Change-Id: Ib77b9507e160281b5a7b9518f88077ee74af985d
2020-06-12 03:57:41 +00:00
Yunfan Chen
f94c0351d1 Merge "Remove IME surface when occured in multi-window mode" into rvc-dev am: b55bc82d13 am: c56f6b53b7 am: d9c7811096
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612967

Change-Id: I27ede83a7b2308929bef9e22d9d1ce714ab14155
2020-06-12 03:57:31 +00:00
Yunfan Chen
a79d150a3a Merge "Remove IME surface when occured in multi-window mode" into rvc-dev am: b55bc82d13 am: 13212d164e am: a2351f080f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612967

Change-Id: I2fa284f6f456ea528a4d15fe2ac01c4457d10c8b
2020-06-12 03:57:13 +00:00
Automerger Merge Worker
f4380e7c92 Merge "Merge "Only add divider when it need to show" into rvc-dev am: a73d6ecb84 am: 82a8ca187c am: 06e6addad7" into rvc-qpr-dev-plus-aosp 2020-06-12 03:56:56 +00:00
Automerger Merge Worker
65e38b7e58 Merge "Merge "Only add divider when it need to show" into rvc-dev am: a73d6ecb84 am: 82a8ca187c" into rvc-d1-dev-plus-aosp am: 7d44d5a2f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612936

Change-Id: I29c1930244a104f7a90c67e107160d1c4b329c04
2020-06-12 03:56:48 +00:00
Tony Huang
310f45e4dd Merge "Only add divider when it need to show" into rvc-dev am: a73d6ecb84 am: 82a8ca187c am: 06e6addad7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612936

Change-Id: I290dda1cb66b0a82821a11ff51eb5b0d08ed1db4
2020-06-12 03:56:40 +00:00
Tony Huang
6bcf2f4762 Merge "Only add divider when it need to show" into rvc-dev am: a73d6ecb84 am: dbe759768c am: ed4937c342
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612936

Change-Id: Ia7f72b55c379b2a15f3b3247e361e423e78ab4ce
2020-06-12 03:56:03 +00:00
Beth Thibodeau
337ffc43d6 Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843853

Change-Id: Ibd140fd39103d096d099519d17c24f2119aeb0ca
2020-06-12 03:51:32 +00:00
Beth Thibodeau
bcd7297083 Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843853

Change-Id: Ib569729dd607d60d0897da86095bc3092ba86974
2020-06-12 03:51:21 +00:00
Yunfan Chen
d9c7811096 Merge "Remove IME surface when occured in multi-window mode" into rvc-dev am: b55bc82d13 am: c56f6b53b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612967

Change-Id: I6ff08fc32ff843de23631e621a69fe9d6d3c218a
2020-06-12 03:48:17 +00:00
Yunfan Chen
a2351f080f Merge "Remove IME surface when occured in multi-window mode" into rvc-dev am: b55bc82d13 am: 13212d164e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612967

Change-Id: I70040662b89e37015da805318d35c4e6aeb9352e
2020-06-12 03:47:39 +00:00
Yunfan Chen
8daf1bdbd9 Merge "Remove IME surface when occured in multi-window mode" into rvc-dev am: b55bc82d13 am: c56f6b53b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612967

Change-Id: Idda36bdd57aa3ddfbf83b27e41ff7ffc68932bfb
2020-06-12 03:47:37 +00:00
Automerger Merge Worker
7d44d5a2f8 Merge "Merge "Only add divider when it need to show" into rvc-dev am: a73d6ecb84 am: 82a8ca187c" into rvc-d1-dev-plus-aosp 2020-06-12 03:47:10 +00:00
Tony Huang
ed4937c342 Merge "Only add divider when it need to show" into rvc-dev am: a73d6ecb84 am: dbe759768c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612936

Change-Id: Iab51f9238ece0fc805ee50a9892d3c726c02fcab
2020-06-12 03:46:55 +00:00
Tony Huang
06e6addad7 Merge "Only add divider when it need to show" into rvc-dev am: a73d6ecb84 am: 82a8ca187c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612936

Change-Id: Ic6a169058797e4e52349a4ad51919955fb1d521b
2020-06-12 03:46:52 +00:00
Tony Huang
8e350afb0f Merge "Only add divider when it need to show" into rvc-dev am: a73d6ecb84 am: 82a8ca187c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612936

Change-Id: Iae7fd6a4b188e00c0deb11e84be91e4ce641f41b
2020-06-12 03:46:49 +00:00
Beth Thibodeau
fd10b83c2c Merge "Disable buttons with no action intent" into rvc-dev 2020-06-12 03:38:29 +00:00
Yunfan Chen
c56f6b53b7 Merge "Remove IME surface when occured in multi-window mode" into rvc-dev am: b55bc82d13
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612967

Change-Id: I6ac1a614edd2891ca801c80c76f6314917340bb1
2020-06-12 03:26:06 +00:00