Commit Graph

73044 Commits

Author SHA1 Message Date
Yanting Yang
2ae4e5159a Merge "Avoid NPE when screen title is null" into rvc-dev am: c8e0d2e755 am: ab6813af23 am: 0a567e4bba am: f225f9838d am: 59ccc8618a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882411

Change-Id: I8a804b00d43efcaa85a2e29b7c47c6be28915502
2020-06-18 17:54:03 +00:00
Yanting Yang
59ccc8618a Merge "Avoid NPE when screen title is null" into rvc-dev am: c8e0d2e755 am: ab6813af23 am: 0a567e4bba am: f225f9838d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882411

Change-Id: I52ddbba9500c3534457115b9e0bb643934c8107c
2020-06-18 17:49:34 +00:00
TreeHugger Robot
5d32d6c768 [automerger skipped] Merge "Workaround for Recent app icon disappear" into rvc-dev am: 52707fce4f am: 4a4f006894 am: bf683c416e am: 6229bf3e70 -s ours am: 975e7b09e3 -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: I3667e10a542eaaad561bd28567e49e902790f4c0
2020-06-18 17:48:47 +00:00
TreeHugger Robot
dfa966b965 Merge "Add new Always on display slice" into rvc-dev am: 16e1cd296a am: d2ea0b8e37 am: b62744bdab am: e03da6b5bd am: ecacc31fbc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11736609

Change-Id: I6ad98c5097fe289c99390e1e61ade642d7aac0af
2020-06-18 17:46:24 +00:00
TreeHugger Robot
975e7b09e3 [automerger skipped] Merge "Workaround for Recent app icon disappear" into rvc-dev am: 52707fce4f am: 4a4f006894 am: bf683c416e am: 6229bf3e70 -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: Ia7055e50c942e1aeefa0d67ee351c4b2638482e8
2020-06-18 17:39:46 +00:00
TreeHugger Robot
ecacc31fbc Merge "Add new Always on display slice" into rvc-dev am: 16e1cd296a am: d2ea0b8e37 am: b62744bdab am: e03da6b5bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11736609

Change-Id: I4916b08e19cea2106bda0f596ba62ea2cede0d06
2020-06-18 17:37:51 +00:00
TreeHugger Robot
29cc50c852 [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: 0babdca7fd -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: I2eef768e6915f0ec5f3c1456a92ca042b19159c8
2020-06-18 17:24:17 +00:00
TreeHugger Robot
cf2921db08 Merge "Add new Always on display slice" into rvc-dev am: 16e1cd296a am: d2ea0b8e37 am: d8f4506ff6 am: e172697745 am: fad1507e16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11736609

Change-Id: Icd03f5a8a065721e4038eabdb692dd2d3c999210
2020-06-18 17:23:53 +00:00
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
3189e60573 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 am: 94fd5e55fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524847

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

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

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

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

Change-Id: I0b3ccbb94130edfde8cc901e0f93b2a517059af3
2020-06-18 16:13:00 +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
Yanting Yang
f225f9838d Merge "Avoid NPE when screen title is null" into rvc-dev am: c8e0d2e755 am: ab6813af23 am: 0a567e4bba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882411

Change-Id: I80a74d9356e27e5262e66674329be6c4bb2e218e
2020-06-18 15:45:57 +00:00
TreeHugger Robot
6229bf3e70 Merge "Workaround for Recent app icon disappear" into rvc-dev am: 52707fce4f am: 4a4f006894 am: bf683c416e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862420

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

Change-Id: If472e08880bab730a07714a0fd41530955b78304
2020-06-18 15:45:38 +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
Mark Chien
99cf01a376 Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev am: 5bd41e573b am: fd865bc7df am: ffdde8abc0 am: 25f27bd646 am: 64888829d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11716805

Change-Id: I95e1c59702fcf054b818445a00bda205eafbcfb9
2020-06-18 15:27:23 +00:00
Yanting Yang
0a567e4bba Merge "Avoid NPE when screen title is null" into rvc-dev am: c8e0d2e755 am: ab6813af23
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882411

Change-Id: I09b2994d5ba4aedbac0a68b94b9672ff076dea13
2020-06-18 15:25:23 +00:00
TreeHugger Robot
bf683c416e Merge "Workaround for Recent app icon disappear" into rvc-dev am: 52707fce4f am: 4a4f006894
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862420

Change-Id: I26bc088db6b37f49ffca7cccda557e0df2c84883
2020-06-18 15:25:18 +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
b62744bdab 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: Ia00973ba8ab6819f6afb7afeda01b31d86f3cf0d
2020-06-18 15:24:51 +00:00
Yanting Yang
ab6813af23 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: I491d5d4b1e74abc320566d64326601dbe0b2ad31
2020-06-18 15:09:33 +00:00
TreeHugger Robot
4a4f006894 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: I1b22282644bb4f630ae02df36cdb9005119fb131
2020-06-18 15:09:01 +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
TreeHugger Robot
9cada24c2e Merge "Launch work dnd setting for work-profile apps" into rvc-dev am: ea45695190 am: ce685b4142 am: 4ce89147b7 am: 506b0cc65b am: 05c7f75b42
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889174

Change-Id: I37256c39abdcbb6a65aeb00bd809edf120a80a27
2020-06-18 14:54:28 +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