Commit Graph

69633 Commits

Author SHA1 Message Date
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
TreeHugger Robot
8dea25c0be Merge "Launch work dnd setting for work-profile apps" into rvc-dev am: ea45695190 am: 315695c17a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889174

Change-Id: Ia982a27b2c6c47d9d360738ef0f918d1320ec6ff
2020-06-18 15:25:52 +00:00
Jason Chiu
89fa11b70f Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b98492f am: 2de51f92f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837792

Change-Id: Ie9b8d0bd5a5c16a5edbc8d310f65bf3b94cffd88
2020-06-18 15:25:48 +00:00
Yanting Yang
ec3f5672b2 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: I602f53ff6ed4dab2989b0f30fe7b4ded6e58d267
2020-06-18 15:25:43 +00:00
TreeHugger Robot
6bc89177b4 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: I36af9646a2d8a9a88e2fcff66760720b636cf7fc
2020-06-18 15:25:39 +00:00
TreeHugger Robot
60362013cd Merge "Launch work dnd setting for work-profile apps" into rvc-dev am: ea45695190 am: 315695c17a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889174

Change-Id: Ic5ded0c154eb3fbded4855e2138606888f615f89
2020-06-18 15:25:34 +00:00
Jason Chiu
b87113d7e9 Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b98492f am: 2de51f92f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837792

Change-Id: I17ccb0c8684afdd21e3e953c51e1a120a2ff4f03
2020-06-18 15:25:29 +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
e61a21f4a0 [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: I1ec5502896d4e2bd84ee93235400eefe7b250e2f
2020-06-18 15:25:22 +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
TreeHugger Robot
315695c17a 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: I9f4afbcceebfc4eaf74e1ae1dd852a201a7c5404
2020-06-18 15:10:09 +00:00
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