Jason Chiu
2de51f92f2
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: I69b8345c0d34a77326b7dd86f4ad52edeedc0b02
2020-06-18 15:09: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
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
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
Peter_Liang
22ed240aab
Fix the dark theme obscures the center marker of audio balance slider.
...
Root Cause:
The color of center marker is wrong.
Next:
The color of center marker is white when dark theme is enabled; Otherwise, it's black.
Bug: 159028208
Test: manual test & make RunSettingsRoboTests ROBOTEST_FILTER=BalanceSeekBarPreferenceTest & make RunSettingsRoboTests ROBOTEST_FILTER=BalanceSeekBarTest
Change-Id: Id2d548778d1275709448f4c009a8469216950d8c
Merged-In: Id2d548778d1275709448f4c009a8469216950d8c
(cherry picked from commit 34a873884d
)
2020-06-18 20:03:25 +08: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
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
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
TreeHugger Robot
25288095bc
Merge "Launch WallpaperPicker in a new task[Part2]" into rvc-d1-dev am: e47478ddcc
am: 41f4d72ea2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11881678
Change-Id: Ia0e523fe424056b0b9bfe4b6c934143373f5760e
2020-06-18 08:33:30 +00:00
TreeHugger Robot
9774deb533
Merge "Launch WallpaperPicker in a new task[Part2]" into rvc-d1-dev am: e47478ddcc
am: 65cb9c9c1d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11881678
Change-Id: I61cbd81b4872b34cb23bdf3d47c8496e94a63d3c
2020-06-18 08:33:15 +00:00
TreeHugger Robot
65cb9c9c1d
Merge "Launch WallpaperPicker in a new task[Part2]" into rvc-d1-dev am: e47478ddcc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11881678
Change-Id: I6594136afd56b93290c919e09c7e34b66bf62bb4
2020-06-18 08:20:08 +00:00
TreeHugger Robot
41f4d72ea2
Merge "Launch WallpaperPicker in a new task[Part2]" into rvc-d1-dev am: e47478ddcc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11881678
Change-Id: I25340023927d1cbb86b497979cfe9344f5fdd8a8
2020-06-18 08:19:55 +00:00
TreeHugger Robot
e47478ddcc
Merge "Launch WallpaperPicker in a new task[Part2]" into rvc-d1-dev
2020-06-18 08:06:13 +00:00
TreeHugger Robot
8da9a0813a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 21099bcb95
-s ours am: cdaf90029f
-s ours am: debdb0f32d
-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: Ie731009ffd14fd2a9618d002978cce38487952ba
2020-06-17 19:50:11 +00:00
TreeHugger Robot
debdb0f32d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 21099bcb95
-s ours am: cdaf90029f
-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: Ib158fe84fb02e799f0f86d53b002e679e409232a
2020-06-17 19:22:22 +00:00
TreeHugger Robot
cdaf90029f
[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: I93fce8d35db8a225adc0c8f7431007d512dd9d1e
2020-06-17 19:04:10 +00:00
TreeHugger Robot
21099bcb95
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-06-17 18:51:02 +00:00
Jason Chiu
0625bb4815
Fix the overlapping problem of the burst of slice updates
...
Implement a throttle in SliceBackgroundWorker to control slice updates.
Test: robotest
Fixes: 152366832
Change-Id: I8b65d1b57973e036b932172627aca506f4fae3a4
2020-06-18 02:18:38 +08:00
Bill Yi
553dcca790
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Id87875585903185c64f8ed91c03dd50ca9e06b39
2020-06-17 09:27:34 -07:00
Beverly
51fb73e512
Launch work dnd setting for work-profile apps
...
Test: manual
Fixes: 159178762
Change-Id: Ifa4c7f776e19f3aec87b5ef1f858c92cff46b30b
2020-06-17 11:57:19 -04:00