PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
69,154 Commits 1 Branch 0 Tags
2eebd94c6c48f6e948025dd4f3f1eab1faa3224c
Commit Graph

69154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Julia Reynolds
03a42fd844 Update notification subtext 
Test: atest
Fixes: 159274325
Change-Id: Iff98b4b056bf7a3c6386063d6588a26607ee7525
 2020-06-18 16:25:38 -04: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
TreeHugger Robot
6229bf3e70 Merge "Workaround for Recent app icon disappear" into rvc-dev am: 52707fce4f am: 4a4f006894 am: bf683c416e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862420

Change-Id: I9d6b6e345499f0cc6d1bfb459100dba268fb69db
 2020-06-18 15:45:50 +00:00
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