Mark Chien
e35a89ef62
Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: 5f643bb4db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542
Change-Id: Ib91bb507b01b4b0e9994cb9edbadf21bc57e4886
2020-06-19 06:00:23 +00:00
Automerger Merge Worker
26016b54c5
Merge "[automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: 479c1cb24a -s ours" into rvc-d1-dev-plus-aosp
2020-06-19 06:00:23 +00:00
PETER LIANG
0284214e0c
[automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: 479c1cb24a -s ours
...
am skip reason: Change-Id Id2d548778d1275709448f4c009a8469216950d8c with SHA-1 22ed240aab is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664
Change-Id: If83b964e060e3c4a7af87b6f1c2eb614d2301158
2020-06-19 06:00:17 +00:00
TreeHugger Robot
53d99db577
Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083
Change-Id: I5a715f26585a7af1c142aac930f1e196e5ebcb10
2020-06-19 06:00:10 +00:00
PETER LIANG
18e02caa18
Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: c0ccd1eac1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664
Change-Id: Ie227f2a09632c63d60d72e25d2fe118732274a1b
2020-06-19 05:59:59 +00:00
Mark Chien
5f643bb4db
Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542
Change-Id: I63a125c5291f71811e2c010d946c0440c1eca29c
2020-06-19 05:45:00 +00:00
TreeHugger Robot
a68b7cc6bf
Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083
Change-Id: Idc85a865b5579bc08dbb4b0e6b92726bb2e6cf08
2020-06-19 05:44:52 +00:00
PETER LIANG
479c1cb24a
Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664
Change-Id: Ia7a45d3e919c7910b4c26d7d460a88d7917b5648
2020-06-19 05:44:47 +00:00
PETER LIANG
c0ccd1eac1
Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664
Change-Id: I9762f3d94e93f8e634ee3954770ed29a4fc5f411
2020-06-19 05:44:15 +00:00
Mark Chien
45a953b56c
Merge "Remove unused resource from TetherServiceTest" into rvc-dev
2020-06-19 05:43:36 +00:00
TreeHugger Robot
e8e4e4bafc
Merge "Remove the feature flag of contextual home V2" into rvc-dev
2020-06-19 05:06:12 +00:00
PETER LIANG
5d19a1f0d7
Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev
2020-06-19 05:04:40 +00:00
markchien
efb029c067
Remove unused resource from TetherServiceTest
...
TetherService is no longer query resource by itself after ag/11524847.
That CL miss to remove unused getResources code.
Now remove unused resource in this change.
Bug: 146918263
Test: atest TetherServiceTest
Change-Id: I3b0da2672246997aee16b11576ce5ae9bfe596dc
2020-06-19 03:37:38 +00:00
Jason Chiu
d489acb2e3
Remove the feature flag of contextual home V2
...
Bug: 159393461
Test: robotest & rebuild
Change-Id: If5f030b4c8bd5ef61bb722da9ae7f3ace0ac6e0e
2020-06-19 11:23:57 +08:00
TreeHugger Robot
83a98282b5
Merge "Update notification subtext" into rvc-dev am: 141153e789 am: 8006681905
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342
Change-Id: I3a45c0bae144e499e65fc2bc3eeb1ec4a5887d3b
2020-06-19 01:34:33 +00:00
TreeHugger Robot
73ebf35f81
Merge "Update notification subtext" into rvc-dev am: 141153e789 am: 385e9be34f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342
Change-Id: Ic83548d14318f9c96ead86ba9aca53e50e195337
2020-06-19 01:34:10 +00:00
TreeHugger Robot
8006681905
Merge "Update notification subtext" into rvc-dev am: 141153e789
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342
Change-Id: I27cc9ca8a606be820f8c4a3c9f3dd6af95f0388b
2020-06-19 01:16:49 +00:00
TreeHugger Robot
385e9be34f
Merge "Update notification subtext" into rvc-dev am: 141153e789
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342
Change-Id: I9f48f9e9fc98eee8ae3df94135c0baac9783429e
2020-06-19 01:16:42 +00:00
TreeHugger Robot
141153e789
Merge "Update notification subtext" into rvc-dev
2020-06-19 01:04:09 +00:00
Julia Reynolds
03a42fd844
Update notification subtext
...
Test: atest
Fixes: 159274325
Change-Id: Iff98b4b056bf7a3c6386063d6588a26607ee7525
2020-06-18 16:25:38 -04: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
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
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
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
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
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
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
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
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
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