Commit Graph

71582 Commits

Author SHA1 Message Date
TreeHugger Robot
0babdca7fd [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 21099bcb95 -s ours am: d46390f21f -s ours am: 09354ac9ea -s ours am: 1e768909d4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic6197e25b80483df263f2951f91d8958484a4c41
2020-06-18 17:21:52 +00:00
TreeHugger Robot
fad1507e16 Merge "Add new Always on display slice" into rvc-dev am: 16e1cd296a am: d2ea0b8e37 am: d8f4506ff6 am: e172697745
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11736609

Change-Id: Ia580c2641760145906c616f8e467359f033731f2
2020-06-18 17:03:40 +00:00
Automerger Merge Worker
94fd5e55fa Merge "Merge "Get entitlement configuration from intent extra" into rvc-dev am: 481816a97d am: b94412a653 am: a45cb9ab93" into rvc-qpr-dev-plus-aosp am: 402802ab9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524847

Change-Id: Ibfbeb41ecffa61f140e62b27488099bb912104e5
2020-06-18 16:01:19 +00:00
Mark Chien
64649a4d4f Merge "Get entitlement configuration from intent extra" into rvc-dev am: 481816a97d am: b94412a653 am: 3d4ad9fc7d am: 652b505042
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524847

Change-Id: I6d60abb57e5611ed29aca984771c45e24671e1da
2020-06-18 16:00:27 +00:00
Tim Peng
8765952280 Align Slice Row title icon with Panel icon in output switcher panel am: 7084631b4b am: 792d46527e am: e43b7bdc71 am: 6f602ba41a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882401

Change-Id: I565e718791b935879bce6a6638cef602f001ae76
2020-06-18 15:59:54 +00:00
Tim Peng
65905901eb Align Slice Row title icon with Panel icon in output switcher panel am: 7084631b4b am: 792d46527e am: 4a5d1b4c40 am: f4f545115d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882401

Change-Id: I5c447fc6a1f40d5c237ce4f268a342cc3f534639
2020-06-18 15:59:46 +00:00
Mark Chien
6e7014873c Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev am: 5bd41e573b am: fd865bc7df am: 8545e1c47d am: 9a31547623
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11716805

Change-Id: Ide4b265f8029e09c45587e23e3d0f1ae65f7ad88
2020-06-18 15:55:46 +00:00
TreeHugger Robot
1e768909d4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 21099bcb95 -s ours am: d46390f21f -s ours am: 09354ac9ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0d6e9b1124e3eb2dac6e8c7fdef7e1bd017af588
2020-06-18 15:45:29 +00:00
TreeHugger Robot
e172697745 Merge "Add new Always on display slice" into rvc-dev am: 16e1cd296a am: d2ea0b8e37 am: d8f4506ff6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11736609

Change-Id: I2979cc05c5432fd6521be0a333b6435df27c6128
2020-06-18 15:44:48 +00:00
TreeHugger Robot
09354ac9ea [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 21099bcb95 -s ours am: d46390f21f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I130d4466719f78f640361fca8e2501a9e2f4bf9e
2020-06-18 15:25:07 +00:00
TreeHugger Robot
d8f4506ff6 Merge "Add new Always on display slice" into rvc-dev am: 16e1cd296a am: d2ea0b8e37
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11736609

Change-Id: Ie5b5d8a242815d9c21537d6e41a7056136c3cc53
2020-06-18 15:24:53 +00:00
TreeHugger Robot
d46390f21f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 21099bcb95 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I147652b5f55b7554cefa4da80ce96db642b994b9
2020-06-18 15:08:34 +00:00
TreeHugger Robot
d2ea0b8e37 Merge "Add new Always on display slice" into rvc-dev am: 16e1cd296a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11736609

Change-Id: I79cee4ac6d5c40605be2a20c69cf39d213ceaa28
2020-06-18 15:08:07 +00:00
Mark Chien
64888829d8 Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev am: 5bd41e573b am: fd865bc7df am: ffdde8abc0 am: 25f27bd646
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11716805

Change-Id: Ib9a39c07692d00e807c6d9c2045712590fad1e63
2020-06-18 15:00:31 +00:00
Automerger Merge Worker
402802ab9f Merge "Merge "Get entitlement configuration from intent extra" into rvc-dev am: 481816a97d am: b94412a653 am: a45cb9ab93" into rvc-qpr-dev-plus-aosp 2020-06-18 14:54:32 +00:00
Mark Chien
f32711d336 Merge "Get entitlement configuration from intent extra" into rvc-dev am: 481816a97d am: b94412a653 am: a45cb9ab93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524847

Change-Id: I9850ed5aa8d4c38093151bcb1e7a178f6a8a182e
2020-06-18 14:54:24 +00:00
Mark Chien
652b505042 Merge "Get entitlement configuration from intent extra" into rvc-dev am: 481816a97d am: b94412a653 am: 3d4ad9fc7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524847

Change-Id: Ib5041d4e157cccf2c110a0676b3b9a62d8e6f050
2020-06-18 14:54:17 +00:00
Tim Peng
6f602ba41a Align Slice Row title icon with Panel icon in output switcher panel am: 7084631b4b am: 792d46527e am: e43b7bdc71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882401

Change-Id: I27c25e7a94339bd04410765ce1305770efe62b76
2020-06-18 14:54:06 +00:00
Tim Peng
f4f545115d Align Slice Row title icon with Panel icon in output switcher panel am: 7084631b4b am: 792d46527e am: 4a5d1b4c40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882401

Change-Id: I154df3c0a50effa4b4f6d1aa252699636d34f389
2020-06-18 14:52:40 +00:00
Mark Chien
9a31547623 Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev am: 5bd41e573b am: fd865bc7df am: 8545e1c47d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11716805

Change-Id: Ibae12f19b7a9fc13bf9a3664c6830563f89f0c7f
2020-06-18 14:52:01 +00:00
Mark Chien
25f27bd646 Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev am: 5bd41e573b am: fd865bc7df am: ffdde8abc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11716805

Change-Id: I23f09e63535e19fbc4b0fbcddde0bf4f0e16f5f7
2020-06-18 14:46:31 +00:00
TreeHugger Robot
05c7f75b42 Merge "Launch work dnd setting for work-profile apps" into rvc-dev am: ea45695190 am: ce685b4142 am: 4ce89147b7 am: 506b0cc65b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889174

Change-Id: I8940e8791c21403b1944cf2ce81746a0813931f2
2020-06-18 14:38:09 +00:00
Mark Chien
3d4ad9fc7d Merge "Get entitlement configuration from intent extra" into rvc-dev am: 481816a97d am: b94412a653
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524847

Change-Id: Idaafd6c560e990e68eacc9af9fba93fec9a266af
2020-06-18 14:34:18 +00:00
Tim Peng
e43b7bdc71 Align Slice Row title icon with Panel icon in output switcher panel am: 7084631b4b am: 792d46527e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882401

Change-Id: I640d4a5b32f4b01ed40e2da544ba2821e32247f2
2020-06-18 14:34:02 +00:00
Mark Chien
a45cb9ab93 Merge "Get entitlement configuration from intent extra" into rvc-dev am: 481816a97d am: b94412a653
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524847

Change-Id: Ic480b87cf77dc72cad7593140aa86d475d1425a3
2020-06-18 14:32:29 +00:00
Tim Peng
4a5d1b4c40 Align Slice Row title icon with Panel icon in output switcher panel am: 7084631b4b am: 792d46527e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882401

Change-Id: Ifaf9f1ea2869e0e40d8fc59981e4c9faae600f0a
2020-06-18 14:32:23 +00:00
Mark Chien
ffdde8abc0 Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev am: 5bd41e573b am: fd865bc7df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11716805

Change-Id: Ifc6dc80df6a0d453254661d8843f5a954c8cb212
2020-06-18 14:32:01 +00:00
Mark Chien
8545e1c47d Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev am: 5bd41e573b am: fd865bc7df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11716805

Change-Id: I2eef0c70273b80439014cebf7e924575f7a4c5ad
2020-06-18 14:30:41 +00:00
Mark Chien
b94412a653 Merge "Get entitlement configuration from intent extra" into rvc-dev am: 481816a97d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524847

Change-Id: I11233a13c5d6c0995521a2034d51fe080bf3295f
2020-06-18 14:28:08 +00:00
Tim Peng
792d46527e Align Slice Row title icon with Panel icon in output switcher panel am: 7084631b4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882401

Change-Id: Icd905fc40d880995d120536c9813c3145e1b2f06
2020-06-18 14:27:54 +00:00
TreeHugger Robot
506b0cc65b Merge "Launch work dnd setting for work-profile apps" into rvc-dev am: ea45695190 am: ce685b4142 am: 4ce89147b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889174

Change-Id: I6d2b4adfcf1421586b971c2b7028488306566f09
2020-06-18 14:25:58 +00:00
Mark Chien
fd865bc7df Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev am: 5bd41e573b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11716805

Change-Id: I5aca0bbac13b6b7b9f6d3abdefd1537f4cb8255b
2020-06-18 14:25:17 +00:00
TreeHugger Robot
4ce89147b7 Merge "Launch work dnd setting for work-profile apps" into rvc-dev am: ea45695190 am: ce685b4142
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889174

Change-Id: Ia76e93e5631dbd07f4c613977d11cb29182a36e8
2020-06-18 13:59:43 +00:00
TreeHugger Robot
ce685b4142 Merge "Launch work dnd setting for work-profile apps" into rvc-dev am: ea45695190
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889174

Change-Id: Iaf94f87697c7e7f4c86475f8c291502a1d441f22
2020-06-18 13:44:59 +00:00
TreeHugger Robot
ea45695190 Merge "Launch work dnd setting for work-profile apps" into rvc-dev 2020-06-18 13:32:43 +00:00
Jason Chiu
3e7ae1b547 Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b98492f am: e623f69f29 am: a4e005e0ef am: cab15b0d65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837792

Change-Id: I183c512bfec686df0e9c3de50fc7252ccff66663
2020-06-18 12:03:52 +00:00
Jason Chiu
cab15b0d65 Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b98492f am: e623f69f29 am: a4e005e0ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837792

Change-Id: I354149a6d6015e2a3b6b2d1aff190524279445f8
2020-06-18 11:49:19 +00:00
Jason Chiu
a4e005e0ef Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b98492f am: e623f69f29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837792

Change-Id: I7fa7892e91b9db37728930fcf70652b891ba765d
2020-06-18 11:36:26 +00:00
Jason Chiu
e623f69f29 Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b98492f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837792

Change-Id: Iaa2d45ff44dbf212886085bcee4433b7e4402886
2020-06-18 11:23:49 +00:00
Jason Chiu
251b98492f Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev 2020-06-18 11:06:42 +00:00
Yanting Yang
6bf232cbfe Merge "Avoid NPE when screen title is null" into rvc-dev am: c8e0d2e755 am: bdbcd02a09 am: 4f63c8d5a9 am: 93b72cdd79
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882411

Change-Id: I4cba8dc47afeea253f6f1738516fae5e3c896d95
2020-06-18 11:04:19 +00:00
Yanting Yang
93b72cdd79 Merge "Avoid NPE when screen title is null" into rvc-dev am: c8e0d2e755 am: bdbcd02a09 am: 4f63c8d5a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882411

Change-Id: I48e36e6aec542d54668326d8439deab481c3fb14
2020-06-18 10:52:22 +00:00
Yanting Yang
4f63c8d5a9 Merge "Avoid NPE when screen title is null" into rvc-dev am: c8e0d2e755 am: bdbcd02a09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882411

Change-Id: I6c7731402386659cd61c45e67c6edadb1759ec01
2020-06-18 10:41:47 +00:00
Yanting Yang
bdbcd02a09 Merge "Avoid NPE when screen title is null" into rvc-dev am: c8e0d2e755
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882411

Change-Id: Ib3c4bc91cc51a409b29455e4f00bc423b389a709
2020-06-18 10:21:11 +00:00
TreeHugger Robot
b325c152dd [automerger skipped] Merge "Workaround for Recent app icon disappear" into rvc-dev am: 52707fce4f am: dae8a5bff1 am: 037eb6b776 am: 6fca027244 -s ours
am skip reason: Change-Id I7a78ba47a0383a5e4c65bd461a15a8425beb1acb with SHA-1 b4a5f16b2f is in history

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

Change-Id: Iccc2e96c1c328a65b81f3c64d50bed62d3da41dc
2020-06-18 10:07:35 +00:00
Yanting Yang
c8e0d2e755 Merge "Avoid NPE when screen title is null" into rvc-dev 2020-06-18 09:58:47 +00:00
TreeHugger Robot
6fca027244 Merge "Workaround for Recent app icon disappear" into rvc-dev am: 52707fce4f am: dae8a5bff1 am: 037eb6b776
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862420

Change-Id: Ib28a3d9968aaba573d05d17cfb557ee1825a2bef
2020-06-18 09:52:45 +00:00
TreeHugger Robot
037eb6b776 Merge "Workaround for Recent app icon disappear" into rvc-dev am: 52707fce4f am: dae8a5bff1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862420

Change-Id: Iac142b41a16bf2fcfc3192801a2c3cfd00fd5a1c
2020-06-18 09:40:31 +00:00
TreeHugger Robot
dae8a5bff1 Merge "Workaround for Recent app icon disappear" into rvc-dev am: 52707fce4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862420

Change-Id: I0e19896545564be3c19be24c2ea2493c10b8f0d9
2020-06-18 09:19:46 +00:00
TreeHugger Robot
52707fce4f Merge "Workaround for Recent app icon disappear" into rvc-dev 2020-06-18 09:10:00 +00:00