PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,212 Commits 1 Branch 0 Tags
d42c216746ae658dd4b47d10def63dc13d6bf932
Commit Graph

73212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
25a8c13254 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: I3da9493dff22054dd6250a17d8ea6ed7a5226457
 2020-06-19 05:44:59 +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
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
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
d80e46e456 Merge "Merge "Update notification subtext" into rvc-dev am: 141153e789 am: 8006681905 am: 83a98282b5" into rvc-qpr-dev-plus-aosp am: 47e5e82520 am: 06aea22edb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342

Change-Id: I47caceb320e136605f05157f17fa2f9ed185442f
 2020-06-19 02:18:38 +00:00
TreeHugger Robot
0f27149ae3 Merge "Update notification subtext" into rvc-dev am: 141153e789 am: 385e9be34f am: ea0ee7e393 am: 8514127f53 am: 27735f1e82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342

Change-Id: I2673ce062f3fd35007d9c1fddb6eb6ebf02ff745
 2020-06-19 02:18:19 +00:00
TreeHugger Robot
4ea5dbccd9 Merge "Update notification subtext" into rvc-dev am: 141153e789 am: 385e9be34f am: 73ebf35f81 am: 399e5e3d7e am: 3e032c93b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342

Change-Id: Ic05c1d27275f5b0946f04371f94b7a1f6cbf1664
 2020-06-19 02:17:56 +00: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
f54b29f496 Merge "Add flag to allow NAS to indicate adjustments on notifications and solicit feedback." am: 4368da2e23 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10358923

Change-Id: I5da4a9e7e4fe4c5704ba8b9762bb130e7aac1655
 2020-06-18 20:41:44 +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
40d8640f38 Merge "Launch work dnd setting for work-profile apps" into rvc-dev am: ea45695190 am: 315695c17a am: 8dea25c0be am: e18d40c005 am: 1ea1b452ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889174

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

Change-Id: I00465271eb2242712bf5e17d93aaf44a8c4a87fc
 2020-06-18 18:04:55 +00:00
Automerger Merge Worker
242af39c30 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 am: ab537332ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882411

Change-Id: Ibb3e2c002eb525f06b7294c7f3c3b26200a21b95
 2020-06-18 18:00:01 +00:00
Automerger Merge Worker
511baf0c98 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 am: 08c162d01e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889174

Change-Id: I2e62a8e3a05d74a1d53dfb0a2c9a616b6cfecf45
 2020-06-18 17:59:37 +00:00
TreeHugger Robot
0e19eb6944 [automerger skipped] Merge "Workaround for Recent app icon disappear" into rvc-dev am: 52707fce4f am: 4a4f006894 am: 6bc89177b4 am: 3085cb6ca4 -s ours am: 300cf00d69 -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: Ibfd6670de5d48c1a02fc3f1c1a581a9a7d42080c
 2020-06-18 17:58:54 +00:00
Jason Chiu
75530d9eaf Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b98492f am: 2de51f92f2 am: b87113d7e9 am: 45a1dcf502 am: ae16968f54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837792

Change-Id: I9246adc76fe34746409d4ddfecbbb89e2c885c54
 2020-06-18 17:58:03 +00:00
Automerger Merge Worker
f3a35ce5c2 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: 9c1762bca1 -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: I3a592cf16a3f59a988f5ced82cda885fee9d0304
 2020-06-18 17:56:50 +00: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
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
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
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