PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
75,073 Commits 1 Branch 0 Tags
2d17c1de222038e43da7d3014558e052c7500edc
Commit Graph

75073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
d43819f810 Merge "Restore original importance when unblocking notif channel" into rvc-qpr-dev am: 8fca94f56c am: 8870591ab3 am: 29aad71c6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12139829

Change-Id: Iec588d59a9e0a1272aea1ea9d9a70417b992c44b
 2020-07-14 00:33:57 +00:00
Julia Reynolds
796af9d51b Update font family am: 1a44a98f34 am: 63a9f32547 am: a00e6960ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12139828

Change-Id: Iee0d5decc56966919c39446b1b26c624239c599a
 2020-07-14 00:32:55 +00:00
TreeHugger Robot
29aad71c6e Merge "Restore original importance when unblocking notif channel" into rvc-qpr-dev am: 8fca94f56c am: 8870591ab3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12139829

Change-Id: If460eff74cfc509c5e49bf98f1742a1de187805d
 2020-07-14 00:01:36 +00:00
Julia Reynolds
a00e6960ea Update font family am: 1a44a98f34 am: 63a9f32547 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12139828

Change-Id: I84e1d696e29a2099ed671e83e4c1f579bfd55bd9
 2020-07-14 00:01:18 +00:00
TreeHugger Robot
8870591ab3 Merge "Restore original importance when unblocking notif channel" into rvc-qpr-dev am: 8fca94f56c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12139829

Change-Id: I3a2a93b4cc2f0e5630f51635cc9313845bb05015
 2020-07-13 23:46:24 +00:00
Julia Reynolds
63a9f32547 Update font family am: 1a44a98f34 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12139828

Change-Id: I3a4d2eb6abcbf531f94f21c23abe85070f71bd84
 2020-07-13 23:46:10 +00:00
TreeHugger Robot
8fca94f56c Merge "Restore original importance when unblocking notif channel" into rvc-qpr-dev 2020-07-13 23:34:13 +00:00
Julia Reynolds
2700b83c48 Restore original importance when unblocking notif channel 
Test: atest
Fixes: 62355992
Change-Id: I5d764d0ade68b2ce5708ae79e9ef488ab57bb141
(cherry picked from commit e2a8266328)
 2020-07-13 20:13:43 +00:00
Julia Reynolds
1a44a98f34 Update font family 
For notification settings, to match the inline settings

Test: manual
Fixes: 153886531
Change-Id: Ie338080bd35a8dc2715330f3b82c272b0be81d54
(cherry picked from commit edb8dd0ec4)
 2020-07-13 20:11:20 +00:00
Automerger Merge Worker
8f63a8890b Merge "Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 03edb83f56" into rvc-d1-dev-plus-aosp am: b1a75b7f66 am: b5ec6fafda am: b9035f6bab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: Ie57fa5a2f470d963542b3f4c0cb0f5ccda11c27b
 2020-07-13 17:59:47 +00:00
Automerger Merge Worker
7a8d2df9e3 Merge "Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 03edb83f56 am: ffda931026" into rvc-qpr-dev-plus-aosp am: 567afca630 am: 8cbd1da319 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: I8bf8ed0a4f75e93ece1726ac2f1e53765686c6f1
 2020-07-13 17:59:22 +00:00
Lucas Dupin
7ef1c73e6a Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 91ba077612 am: 162d505e14 am: 82c3503d1e am: 01327140f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: Id6e9b86be6934b8e492fa400ed15ec759bc1576d
 2020-07-13 17:58:48 +00:00
Automerger Merge Worker
b9035f6bab Merge "Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 03edb83f56" into rvc-d1-dev-plus-aosp am: b1a75b7f66 am: b5ec6fafda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: I4641201953b949f2c65fbd097971d66a6605d68b
 2020-07-13 17:45:12 +00:00
Automerger Merge Worker
8cbd1da319 Merge "Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 03edb83f56 am: ffda931026" into rvc-qpr-dev-plus-aosp am: 567afca630 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: I9d0068dfb4c2a9d1617eb0ee80e8440463c5b0a5
 2020-07-13 17:44:33 +00:00
Lucas Dupin
01327140f1 Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 91ba077612 am: 162d505e14 am: 82c3503d1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: I947c54909a719e97562c69664cdd66a30a7207dc
 2020-07-13 17:43:25 +00:00
Automerger Merge Worker
b5ec6fafda Merge "Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 03edb83f56" into rvc-d1-dev-plus-aosp am: b1a75b7f66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: I541df011c1d6a5a4e9ab2ffa687fd8434d26e691
 2020-07-13 17:27:15 +00:00
Automerger Merge Worker
567afca630 Merge "Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 03edb83f56 am: ffda931026" into rvc-qpr-dev-plus-aosp 2020-07-13 17:27:04 +00:00
Lucas Dupin
ec9b9a4fd8 Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 03edb83f56 am: ffda931026 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: I64eff205c0e01330ddeacdcc97e0da304dfbb40a
 2020-07-13 17:26:35 +00:00
Lucas Dupin
82c3503d1e Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 91ba077612 am: 162d505e14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: I7734d178ac6cbd93a76d258c7edc22434d76ad19
 2020-07-13 17:26:32 +00:00
Jiashen Wang
838aa43cc0 Initial setup for slot change receiver migration 
Initial setup for migrating SlotChangehandler from LPA to Settings
Bug: 160819212
Bug: 153811431
Test: Manually tested on Pixel 4 to make sure SlotChangeReceiver can get
slot change events correctly.

Change-Id: Id95f2db875ba08250f4740536742627500b74f0d
 2020-07-13 10:22:04 -07:00
Automerger Merge Worker
b1a75b7f66 Merge "Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 03edb83f56" into rvc-d1-dev-plus-aosp 2020-07-13 17:14:03 +00:00
Lucas Dupin
162d505e14 Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 91ba077612 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: Iebc0844230afdb44868f4f1a6245808aee291dfb
 2020-07-13 17:13:42 +00:00
Lucas Dupin
ffda931026 Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 03edb83f56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: Id71cee5d2db2623b3d66203075d4c34405322bed
 2020-07-13 17:13:39 +00:00
Lucas Dupin
b0f831f3e5 Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 03edb83f56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: Iaaeaf39246920eb1abc651247f5cd8b5787b7d2e
 2020-07-13 17:13:32 +00:00
Lucas Dupin
03edb83f56 Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: I4fc62150f05b1d59bcd77fe7566dd334f1d8931d
 2020-07-13 16:55:39 +00:00
Lucas Dupin
91ba077612 Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: Ie6859a17ba1f1d420f231ba6d9385a48ce442923
 2020-07-13 16:55:38 +00:00
Lucas Dupin
9b01b8510a Merge "Delete media feature flag" into rvc-dev 2020-07-13 16:44:15 +00:00
TreeHugger Robot
0847c68ddd Merge "Fix test case fail" am: 7024116829 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12124569

Change-Id: Iafeb049a375fdc7d69bf17cc2986bc55dca6af3a
 2020-07-13 03:53:42 +00:00
TreeHugger Robot
7024116829 Merge "Fix test case fail" 2020-07-13 03:42:57 +00:00
timhypeng
b5527e329b Fix test case fail 
Bug: 160956047
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib975e906aefc44c59a8465a586832d92664f5147
 2020-07-13 10:29:11 +08:00
TreeHugger Robot
79b2186d23 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: d90229ba2e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12132157

Change-Id: Ib448b86c0ddf00d4c83072f4a709dd97aaadf0af
 2020-07-11 01:30:21 +00:00
TreeHugger Robot
d90229ba2e Merge "Import translations. DO NOT MERGE" 2020-07-11 01:20:50 +00:00
TreeHugger Robot
56a165ac0f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 8539f2ac35 -s ours am: a1bd62eb2e -s ours am: d10325dd23 -s ours am: d673020489 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12131136

Change-Id: Iafa7beccb7c75c6a530ae4043aa73d07ff2a1c3b
 2020-07-10 23:35:31 +00:00
TreeHugger Robot
ef15fbeee3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 8539f2ac35 -s ours am: 830ca9712d -s ours am: 2ca966ce1d -s ours am: a7f4f39196 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12131136

Change-Id: I8d086686a84c576eaf4157f71579a94fdd8c3bad
 2020-07-10 23:35:22 +00:00
TreeHugger Robot
d673020489 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 8539f2ac35 -s ours am: a1bd62eb2e -s ours am: d10325dd23 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12131136

Change-Id: I04309ba7b4ce75a0f02bd0accb5cee03cf0d2680
 2020-07-10 23:19:31 +00:00
TreeHugger Robot
a7f4f39196 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 8539f2ac35 -s ours am: 830ca9712d -s ours am: 2ca966ce1d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12131136

Change-Id: I9e6032cf12ff8729f27424fc83c2d81e1581de71
 2020-07-10 23:19:03 +00:00
Bill Yi
f3fa14812c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I40d92298a2a8268cae383b82336b27faa54148aa
 2020-07-10 16:16:00 -07:00
TreeHugger Robot
d10325dd23 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 8539f2ac35 -s ours am: a1bd62eb2e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12131136

Change-Id: I881da842e0c7c122b40dec21ef9fc704b1de4546
 2020-07-10 23:03:44 +00:00
TreeHugger Robot
2ca966ce1d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 8539f2ac35 -s ours am: 830ca9712d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12131136

Change-Id: I1782ed6e9152ff153745ba5057b1402e0a90da41
 2020-07-10 23:02:57 +00:00
TreeHugger Robot
830ca9712d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 8539f2ac35 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12131136

Change-Id: I6bfae0272a2f47e3a0866c2c57550c54e15b90fc
 2020-07-10 22:48:06 +00:00
TreeHugger Robot
a1bd62eb2e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 8539f2ac35 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12131136

Change-Id: Iee0af28a4ca9f2b681ded43a5a027998b62ed2c2
 2020-07-10 22:47:58 +00:00
TreeHugger Robot
58cffc40b2 Merge "Increase expand/collapse tap target" into rvc-qpr-dev am: 35e0d32d0e am: b8a8fef548 am: 10b5400c25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12130259

Change-Id: I7ec8f26e5ffd0324e6cfdfe5f05a7c931e67e070
 2020-07-10 22:38:48 +00:00
TreeHugger Robot
8539f2ac35 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-07-10 22:35:54 +00:00
TreeHugger Robot
10b5400c25 Merge "Increase expand/collapse tap target" into rvc-qpr-dev am: 35e0d32d0e am: b8a8fef548 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12130259

Change-Id: I67ccd275a165f33402af3d2f04243269fe3841dd
 2020-07-10 22:25:07 +00:00
TreeHugger Robot
b8a8fef548 Merge "Increase expand/collapse tap target" into rvc-qpr-dev am: 35e0d32d0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12130259

Change-Id: I4998fdace936dc05a40a80ee0602a2c0568607e7
 2020-07-10 22:12:12 +00:00
TreeHugger Robot
35e0d32d0e Merge "Increase expand/collapse tap target" into rvc-qpr-dev 2020-07-10 21:54:53 +00:00
Automerger Merge Worker
51e9285bbb Merge "[automerger skipped] Import translations. DO NOT MERGE am: d7102ca072 -s ours am: 046179f99d -s ours am: d76e6deb71 -s ours" into rvc-qpr-dev-plus-aosp am: c756748079 -s ours am: 6ede7a2404 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12129920

Change-Id: Id60936b9cb85756c0448618c666ec40789e2665f
 2020-07-10 21:53:59 +00:00
Automerger Merge Worker
d1ae53326f Merge "[automerger skipped] Import translations. DO NOT MERGE am: d7102ca072 -s ours am: 24cc569d89 -s ours" into rvc-d1-dev-plus-aosp am: 2e00e85c60 -s ours am: 191f37bf59 -s ours am: 94ce9f4360 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12129920

Change-Id: I2174d8deb5d7f87ec5bb084138da1c4b0b45ab09
 2020-07-10 21:52:15 +00:00
Bill Yi
fa8b4a2468 [automerger skipped] Import translations. DO NOT MERGE am: d7102ca072 -s ours am: 046179f99d -s ours am: d124fd13df -s ours am: 98e8a034fc -s ours am: 23289c92fb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12129920

Change-Id: I551bfd8fbfe7cb6b473123e648897685eba19866
 2020-07-10 21:50:57 +00:00
Automerger Merge Worker
6ede7a2404 Merge "[automerger skipped] Import translations. DO NOT MERGE am: d7102ca072 -s ours am: 046179f99d -s ours am: d76e6deb71 -s ours" into rvc-qpr-dev-plus-aosp am: c756748079 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12129920

Change-Id: I27f1c763938a562de575554b4b8fb5386b32da5e
 2020-07-10 21:37:23 +00:00