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
Yanting Yang
80ac68ca91
According to the enrolled status to show/hide face unlock results
...
In current design, we only check the hardware support for face unlock to
show/hide the face unlock results in Settings Search. However the face
settings page is not launchable when the user doesn't enroll the face
unlock. It will cause user confused that face unlock results is no
response when they click them. Therefore, it's more making sense to add
enrolled status checking to index the face unlock results.
Test: manual and robotests
Fixes: 157954564
Change-Id: I5dd36e15fe48d537ee499c73cc172fc913b39554
2020-06-19 12:32:33 +08:00
Jason Chiu
2e790e1859
Fix SecurityException while accessing Slice Uris
...
- There is SecurityException when accessing Slice Uris which are not in
Settings app.
- Rollback to the original mechanism, remove an unused latch, and
register a trivial callback
Fixes: 159195420
Test: robotest
Change-Id: Ice2cf5f928b0e6d0367bcc41c3912526e8f7bd7f
2020-06-19 04:17:43 +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
Automerger Merge Worker
06aea22edb
Merge "Merge "Update notification subtext" into rvc-dev am: 141153e789
am: 8006681905
am: 83a98282b5" into rvc-qpr-dev-plus-aosp am: 47e5e82520
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342
Change-Id: I7d7301f4d48e28023e93c61be30fc902ca35a4dd
2020-06-19 02:05:06 +00:00
TreeHugger Robot
27735f1e82
Merge "Update notification subtext" into rvc-dev am: 141153e789
am: 385e9be34f
am: ea0ee7e393
am: 8514127f53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342
Change-Id: I0f738b1e618bab8d83e1bc4ab473685eb9874b4f
2020-06-19 02:04:49 +00:00
TreeHugger Robot
3e032c93b5
Merge "Update notification subtext" into rvc-dev am: 141153e789
am: 385e9be34f
am: 73ebf35f81
am: 399e5e3d7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342
Change-Id: I2309a23cb2c461d5893571ef63561888ec14afcb
2020-06-19 02:04:33 +00:00
Automerger Merge Worker
47e5e82520
Merge "Merge "Update notification subtext" into rvc-dev am: 141153e789
am: 8006681905
am: 83a98282b5" into rvc-qpr-dev-plus-aosp
2020-06-19 01:47:42 +00:00
TreeHugger Robot
c4bea03abe
Merge "Update notification subtext" into rvc-dev am: 141153e789
am: 8006681905
am: 83a98282b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342
Change-Id: I1e901d446ef5dd3ea06d4fb7c40542e5245ccbe5
2020-06-19 01:47:38 +00:00
TreeHugger Robot
8514127f53
Merge "Update notification subtext" into rvc-dev am: 141153e789
am: 385e9be34f
am: ea0ee7e393
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342
Change-Id: I24b49415543c6bad8ad6934a3796381e87fae9e5
2020-06-19 01:47:34 +00:00
TreeHugger Robot
399e5e3d7e
Merge "Update notification subtext" into rvc-dev am: 141153e789
am: 385e9be34f
am: 73ebf35f81
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342
Change-Id: Icd6fedbb4767bb47b4c34e393044cf2d73aefd7b
2020-06-19 01:47:18 +00:00
TreeHugger Robot
ea0ee7e393
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: I1c9843d0c2c8c5ec12bf76f8a14be73d0c086b70
2020-06-19 01:34:40 +00: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
Beth Thibodeau
13f3e8f04b
[DO NOT MERGE] Add toggle for media resumption
...
Adds a toggle under Settings > Sound > Media to toggle media resumption
Bug: 154039093
Test: manual
Test: atest SettingsProviderTest
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="MediaControls"
Change-Id: I803c57031bc3252cab35c06ea124d1c22a3c3aeb
2020-06-18 23:58:34 +00:00
Alex Mang
4368da2e23
Merge "Add flag to allow NAS to indicate adjustments on notifications and solicit feedback."
2020-06-18 20:38:06 +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
1ea1b452ba
Merge "Launch work dnd setting for work-profile apps" into rvc-dev am: ea45695190
am: 315695c17a
am: 8dea25c0be
am: e18d40c005
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889174
Change-Id: I1a6a2efbd9cd4652e668b25321496440dceb5dd0
2020-06-18 17:56:20 +00:00
Jason Chiu
a4f729b04f
Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b98492f
am: 2de51f92f2
am: 89fa11b70f
am: dff50fcdc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837792
Change-Id: I7db1890985308a55b8fe8ca1e3f1fa87b47b6e09
2020-06-18 17:55:50 +00:00
Automerger Merge Worker
ab537332ea
Merge "Merge "Avoid NPE when screen title is null" into rvc-dev am: c8e0d2e755
am: ab6813af23
am: ec3f5672b2" into rvc-qpr-dev-plus-aosp am: d913c84cbc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882411
Change-Id: I5e61c23383cad558891d49276796bef5f9865c3c
2020-06-18 17:55:20 +00:00
Automerger Merge Worker
08c162d01e
Merge "Merge "Launch work dnd setting for work-profile apps" into rvc-dev am: ea45695190
am: 315695c17a
am: 60362013cd" into rvc-qpr-dev-plus-aosp am: b0decab32e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889174
Change-Id: Ib1a480f1af0570de0e436f3368409b8272a4fe49
2020-06-18 17:54:28 +00:00
TreeHugger Robot
300cf00d69
[automerger skipped] Merge "Workaround for Recent app icon disappear" into rvc-dev am: 52707fce4f
am: 4a4f006894
am: 6bc89177b4
am: 3085cb6ca4
-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: Ifbad760fd5000a45fb24a4276a12133fcfb440db
2020-06-18 17:53:15 +00:00
Jason Chiu
ae16968f54
Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b98492f
am: 2de51f92f2
am: b87113d7e9
am: 45a1dcf502
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837792
Change-Id: I5984fe29c33981fc994c69137e30d5e5e64743e0
2020-06-18 17:52:13 +00:00
Automerger Merge Worker
9c1762bca1
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 21099bcb95
-s ours am: d46390f21f
-s ours am: e61a21f4a0
-s ours" into rvc-qpr-dev-plus-aosp am: ef23b94d40
-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: I516e531e6cc855ea77a4d80e046ba24710216025
2020-06-18 17:50:59 +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
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
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
e18d40c005
Merge "Launch work dnd setting for work-profile apps" into rvc-dev am: ea45695190
am: 315695c17a
am: 8dea25c0be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889174
Change-Id: I8cf36b70d4b26933508824ec322ae7db306ec7df
2020-06-18 15:46:28 +00:00
Jason Chiu
dff50fcdc6
Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b98492f
am: 2de51f92f2
am: 89fa11b70f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837792
Change-Id: I0670196febfc41e86c54db1c0856fdeba2d32280
2020-06-18 15:46:21 +00:00
Automerger Merge Worker
d913c84cbc
Merge "Merge "Avoid NPE when screen title is null" into rvc-dev am: c8e0d2e755
am: ab6813af23
am: ec3f5672b2" into rvc-qpr-dev-plus-aosp
2020-06-18 15:46:20 +00:00
Automerger Merge Worker
b0decab32e
Merge "Merge "Launch work dnd setting for work-profile apps" into rvc-dev am: ea45695190
am: 315695c17a
am: 60362013cd" into rvc-qpr-dev-plus-aosp
2020-06-18 15:46:15 +00:00
Yanting Yang
0ef8ebc249
Merge "Avoid NPE when screen title is null" into rvc-dev am: c8e0d2e755
am: ab6813af23
am: ec3f5672b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882411
Change-Id: I1c68f21559467a8cf958b3a3bf18781db21b3f8b
2020-06-18 15:46:15 +00:00
TreeHugger Robot
ec4ed137d3
Merge "Launch work dnd setting for work-profile apps" into rvc-dev am: ea45695190
am: 315695c17a
am: 60362013cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889174
Change-Id: I6e6b2aad19d99eb7f098fd75f915fb7d3423e8ca
2020-06-18 15:46:09 +00:00
TreeHugger Robot
3085cb6ca4
Merge "Workaround for Recent app icon disappear" into rvc-dev am: 52707fce4f
am: 4a4f006894
am: 6bc89177b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862420
Change-Id: I9d25e5e8d0f65dd11bdad290fd61f3dd34d4905c
2020-06-18 15:46:08 +00:00
Jason Chiu
45a1dcf502
Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b98492f
am: 2de51f92f2
am: b87113d7e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837792
Change-Id: I0c502cc3e7663eb49d92692b154f7a51b81f818f
2020-06-18 15:46:04 +00:00
Automerger Merge Worker
ef23b94d40
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 21099bcb95
-s ours am: d46390f21f
-s ours am: e61a21f4a0
-s ours" into rvc-qpr-dev-plus-aosp
2020-06-18 15:46:02 +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
ca980dc7ce
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 21099bcb95
-s ours am: d46390f21f
-s ours am: e61a21f4a0
-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: I2b47cfc2b6a618e86cfa7dfe7f2f8fe3d9415334
2020-06-18 15:45:57 +00:00