PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,845 Commits 1 Branch 0 Tags
1cfbf165d94f86ba327ffde3a035a5f23692a0dc
Commit Graph

19488 Commits

Author SHA1 Message Date
Julia Reynolds
aaa0cc5238 Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: 941d437df6 am: cff74feef2 am: 03c0421dc4 
Change-Id: I23c953ca75db72ecbbe754d59a83cdb9b6e90441
 2020-03-24 22:00:27 +00:00
Julia Reynolds
e23b91a9b3 Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60 am: 7cad4c67df am: 465b7a2c95 
Change-Id: I39da1000218400d1c1253f5f42e88ba981fb8d04
 2020-03-24 21:59:32 +00:00
Julia Reynolds
941d437df6 Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd 
Change-Id: I065eb16003c13ed562242e1d9d2eb5deb6870415
 2020-03-24 21:42:44 +00:00
Julia Reynolds
79fd5811cd Merge "Update all conversations screen" into rvc-dev 2020-03-24 21:33:53 +00:00
Julia Reynolds
f611025053 Merge "Notification history updates" into rvc-dev am: 8d3741fbca 
Change-Id: Ia281dc883825831c64e9f12b2b5c82e42333e047
 2020-03-24 21:17:27 +00:00
Julia Reynolds
31f9705a60 Merge "Notification history updates" into rvc-dev am: 8d3741fbca 
Change-Id: If1386c89f4e0e90c84d57950351509c2b9a4173f
 2020-03-24 21:16:41 +00:00
Julia Reynolds
8d3741fbca Merge "Notification history updates" into rvc-dev 2020-03-24 21:07:35 +00:00
Julia Reynolds
2f0bd6552c Update all conversations screen 
Update text, and filter the lower section to match the new
header

Test: atest
Fixes: 151765526
Change-Id: I5bc052813745908df8602bf397434a76b294ba6c
 2020-03-24 19:37:13 +00:00
Julia Reynolds
8222a9a650 Notification history updates 
- New strings
- Fix a crash

Test: manual
Fixes: 151833727
Change-Id: I3b0ef5cd9b221be917c71043e5217a43bc5891d0
 2020-03-24 09:25:58 -04:00
Ben Murdoch
16398e5564 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 63aded6f67 am: cdcf827947 am: 7c7b42d06d 
Change-Id: I03fb1a0f60fac8c8ce9260331894b947bf0cd371
 2020-03-24 11:28:22 +00:00
Ben Murdoch
7b2154d996 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 
Change-Id: I4a67e3a9d94d63f0cc9cb6942acabd1e9c32b936
 2020-03-24 10:45:49 +00:00
Ben Murdoch
63aded6f67 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 
Change-Id: I822c63ede7d0f92dbfe724731350fc140db88ef5
 2020-03-24 10:45:25 +00:00
Ben Murdoch
7afced3599 Merge "Move strings related to user creation to SettingsLib." into rvc-dev 2020-03-24 10:25:21 +00:00
Arc Wang
766e874428 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: e446e42d63 am: 660cacfa0d am: 787f8a7635 
Change-Id: I394d039cd49428709ce3405d4461bc4c71c7b3b5
 2020-03-24 08:28:45 +00:00
Arc Wang
f47f38c9a2 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 
Change-Id: If075945a85a830f214b2d8a33bdba165593f0705
 2020-03-24 07:46:28 +00:00
Arc Wang
e446e42d63 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 
Change-Id: Ic73404a2c3392f1049786b5601a72316086eb900
 2020-03-24 07:46:26 +00:00
Arc Wang
e4b0989766 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev 
* changes:
  [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - II
  [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - I
 2020-03-24 07:25:17 +00:00
TreeHugger Robot
55fa8229a7 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 am: f5eac3f0cf am: 95d85c0e34 
Change-Id: I7335593a093a8e25c0296434e710f7ccd667d140
 2020-03-24 06:52:32 +00:00
TreeHugger Robot
437b0b66d4 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 
Change-Id: I15d091a2b9354b2f6039abc5d7f8d26befde577a
 2020-03-24 06:09:06 +00:00
TreeHugger Robot
c21f849fe7 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 
Change-Id: Ie488350d8a6ca7016bbaf7ace6bd7aed70568d49
 2020-03-24 06:08:49 +00:00
TreeHugger Robot
a33c8e8048 Merge "Update DND people Settings pages" into rvc-dev 2020-03-24 05:56:29 +00:00
TreeHugger Robot
ad20ab50e5 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 3052c27768 am: 008ce5e6e0 am: c9a3bbea99 
Change-Id: I723b4b699fa32dc2c06e873b6fce91fecafa256f
 2020-03-23 22:57:28 +00:00
TreeHugger Robot
8490a15ad9 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 
Change-Id: I93891a124e8237dbb5fe51408ef3b4ceae4d1965
 2020-03-23 18:35:57 +00:00
TreeHugger Robot
3052c27768 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 
Change-Id: I852b01136c7313ea2ce274b7508a555b75808a38
 2020-03-23 18:35:18 +00:00
TreeHugger Robot
a3fccb9cc0 Merge "Add strings for power menu settings" into rvc-dev 2020-03-23 18:09:37 +00:00
TreeHugger Robot
9b9b83f3cd Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa am: 7866eddfa5 am: fea8da24ee am: bc35ad85b8 
Change-Id: I141a416ad6c63161c8049193def2c2385a66d2bb
 2020-03-23 17:45:45 +00:00
TreeHugger Robot
38fab2476f Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa 
Change-Id: Ie994ae2bed19579385b5aa49f9303fc3778ea16a
 2020-03-23 16:46:04 +00:00
TreeHugger Robot
7866eddfa5 Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa 
Change-Id: I7b4cfa9895148b9837be25d19a02d2f7c1c19d1c
 2020-03-23 16:45:32 +00:00
Mady Mellor
25c3c680a5 Merge "String updates" into rvc-dev am: 159538d35a am: 9559e7d480 am: e07e3b53c8 am: a1c1b3095c 
Change-Id: Ie32b888ad8c971170583febf4cd46158dd4b8087
 2020-03-23 16:45:17 +00:00
TreeHugger Robot
43d9013aaa Merge "Redesign individual conversation page" into rvc-dev 2020-03-23 16:31:27 +00:00
Mady Mellor
9559e7d480 Merge "String updates" into rvc-dev am: 159538d35a 
Change-Id: I267fb8f17a5356c181f1943bef1dc17ffadda650
 2020-03-23 16:08:05 +00:00
Mady Mellor
e929e69810 Merge "String updates" into rvc-dev am: 159538d35a 
Change-Id: I83b0cecb2b975068a6ff5afe6f06114146dc923c
 2020-03-23 16:08:01 +00:00
Mady Mellor
159538d35a Merge "String updates" into rvc-dev 2020-03-23 15:43:29 +00:00
Ben Murdoch
7803f907c7 Move strings related to user creation to SettingsLib. 
Test: Build, manually check device.
Bug: 147653252
Bug: 152038380
Change-Id: I921d7907eca5c6bd6585f89e5dd5b6b6222bc745
 2020-03-23 14:23:23 +00:00
TreeHugger Robot
6f1ebe6d79 Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72 
Change-Id: I40f114a95b899c28f41ca1f899f0760297eb7953
 2020-03-23 14:21:30 +00:00
TreeHugger Robot
fae0dc47f8 Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72 
Change-Id: I227b803e7758ce75aca409e17ab2cfd6992accc3
 2020-03-23 14:19:48 +00:00
TreeHugger Robot
4d4c55ad72 Merge "Updates main page for Do Not Disturb" into rvc-dev 2020-03-23 14:01:46 +00:00
Fabian Kozynski
03b66becf6 Add strings for power menu settings 
Test: build
Bug: 152053344
Change-Id: I601037113a3191b814c5f65647fe0e520d9081ad
 2020-03-23 09:53:19 -04:00
TreeHugger Robot
221f0c9450 Merge "Show in UI if admin has disabled face auth" into rvc-dev am: 6f4a9bf11c am: 4a4190dc9d am: c2cd9cc5cd am: 17d22b0c3a 
Change-Id: Ie3bf838464bec5c1ded36a99c6cd28c26430b1e0
 2020-03-23 11:52:50 +00:00
TreeHugger Robot
4a4190dc9d Merge "Show in UI if admin has disabled face auth" into rvc-dev am: 6f4a9bf11c 
Change-Id: I8fb8f2eed514670d900c4dad4f46953ae8265249
 2020-03-23 11:16:50 +00:00
TreeHugger Robot
b0692bd6c5 Merge "Show in UI if admin has disabled face auth" into rvc-dev am: 6f4a9bf11c 
Change-Id: I494026cdde9a74e3e71051976cefb6c2633d67c8
 2020-03-23 11:16:12 +00:00
TreeHugger Robot
6f4a9bf11c Merge "Show in UI if admin has disabled face auth" into rvc-dev 2020-03-23 10:59:16 +00:00
Arc Wang
fafcd3b362 [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - II 
Some tests are removed because WifiTracerLib listens to most intents
and callbacks to Settings APP, most of the receiving intent tests are
removed.

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: Ie726938b7c6e94bbaf6479f6a8797a92d869ba8c
 2020-03-23 16:21:07 +08:00
TreeHugger Robot
8e19b032b2 Merge "Updates main page for Do Not Disturb" 2020-03-23 02:52:46 +00:00
Beverly
5cfb5aa52d Updates main page for Do Not Disturb 
Settings > Sound > Do Not Disturb
- Update strings, more descriptive summary for DND Apps summary
- Move top-level ordering of preferences
- Remove old unused DND strings

Test: make RunSettingsRoboTests7
Test: make ROBOTEST_FILTER=ZenModeBypassingAppsPreferenceControllerTest RunSettingsRoboTests
Test: manual
Bug: 151845457
Change-Id: I9c23c558a9d764702e966d22e5c6e5c5425e4d32
 2020-03-23 01:41:45 +00:00
Stanley Wang
8458bce360 Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 am: 76c2ec77e3 am: b9289ea2ef am: cc773fc5d9 
Change-Id: I47ac06c816e854398b1e7c0b62c89acd508bf462
 2020-03-21 06:47:58 +00:00
Stanley Wang
78e9bdf9b7 Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 
Change-Id: Iaeda191d1877ae40f0b3911cea911a876da97f0b
 2020-03-21 05:49:32 +00:00
Stanley Wang
6c6837424d Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c 
Change-Id: If6f30aa662c0fd4696722df8e7f31b49b7929157
 2020-03-21 05:49:25 +00:00
Stanley Wang
76c2ec77e3 Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 
Change-Id: I35d894cd31031fa8019ca7b6f1552dcd0b1c1412
 2020-03-21 05:49:13 +00:00
Stanley Wang
a8d78418c0 Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c 
Change-Id: I87df8f40a569b89d2275d5ce38e379eb3f9f96b9
 2020-03-21 05:48:43 +00:00