Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,763 Commits 1 Branch 0 Tags
2829bfbc5c61debaa45c966d7aafcf3840c65ef4
Commit Graph

30960 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
7cad4c67df Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60 
Change-Id: Iddede304e44b2526287d15a56acda47420855532
 2020-03-24 21:25:51 +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
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
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
Zoey Chen
61b66a28d9 Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev 2020-03-24 09:05:00 +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
Bonian Chen
77f2788f82 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: 0a5211a6d5 am: aec1582388 am: 2a25cd5c22 
Change-Id: I3bd85778b588901160779683cb19b5c34c970d21
 2020-03-24 08:12:52 +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
Bonian Chen
0a5211a6d5 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 
Change-Id: I42831f5540acd25bc6129ca14ad42b1717cf9e98
 2020-03-24 07:15:24 +00:00
Bonian Chen
9a0f633600 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev 2020-03-24 07:03:52 +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
f5eac3f0cf Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 
Change-Id: I2795824b08a4c7943ebb8e19ecbb2cd8cc3cdfa8
 2020-03-24 06:31:21 +00:00
Treehugger Robot
2b8bde162f Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0 
Bug: 150258187
Change-Id: I6b363bd609d580d547cb59851f5bfaba57ef7154
(cherry picked from commit 7c62cbd97e)
Merged-In: I6b363bd609d580d547cb59851f5bfaba57ef7154
 2020-03-24 06:21:25 +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
a33c8e8048 Merge "Update DND people Settings pages" into rvc-dev 2020-03-24 05:56:29 +00:00
Bonian Chen
073f483d86 [Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API 
Replace SubscriptionManager#addOnSubscriptionsChangedListener API in
order to compatible with legacy design.

Bug: 151838951
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SubscriptionsChangeListenerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=ActiveSubsciptionsListenerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SimStatusDialogControllerTest
Change-Id: Ib98ce0dcbf18b6f48a6f267dd9e7be017d571157
 2020-03-24 11:51:23 +08: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
fea8da24ee Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa am: 7866eddfa5 
Change-Id: I515f324a16bab7590f0a863e9a04448ab5f1e536
 2020-03-23 17:05:16 +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
43d9013aaa Merge "Redesign individual conversation page" into rvc-dev 2020-03-23 16:31:27 +00:00
TreeHugger Robot
236330ac81 Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72 am: fae0dc47f8 
Change-Id: I9a5e16d435a3455ac30d54ccdafb430bd388f4d7
 2020-03-23 14:49:22 +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
4d4c55ad72 Merge "Updates main page for Do Not Disturb" into rvc-dev 2020-03-23 14:01:46 +00: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
Calvin Pan
581d53b038 Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab am: 029ec754a3 am: 20376f98be am: 97fe9bd1b9 
Change-Id: I6cdd284d86fb1820819b00230810dac04ff39b0a
 2020-03-23 11:09:15 +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
Calvin Pan
20376f98be Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab am: 029ec754a3 
Change-Id: I05c17062a5b67f3c5bbbb721e88e7b7c3914bbef
 2020-03-23 10:34:21 +00:00
Calvin Pan
70218097f4 Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab 
Change-Id: I67ac551c8498d9029a0c61ef7d1672fae0f2b18f
 2020-03-23 10:23:56 +00:00
Calvin Pan
861d3446ab Merge "Clear the entries in updateState" into rvc-dev 2020-03-23 10:11:58 +00:00
Fiona Campbell
56df409d78 Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 am: 9eae2b7531 am: 87f9d9aff7 am: 7f434778a3 
Change-Id: I0a671c288791bbd5a6521e4fdffcfb6af4a47724
 2020-03-23 10:05:50 +00:00
Fiona Campbell
87f9d9aff7 Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 am: 9eae2b7531 
Change-Id: I3b876975c5b706b181ff2ab56f41a0b03a45a17d
 2020-03-23 09:29:43 +00:00
Fiona Campbell
a165e13de0 Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 
Change-Id: Ia2626e63c27344c591b8a54b8cec8bf0973e020e
 2020-03-23 09:04:51 +00:00
Fiona Campbell
9a712271f2 Merge "Fix displayed brightness value in settings." into rvc-dev 2020-03-23 08:54:26 +00:00
Eric Sandness
077047738f Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 6d9451891a am: 0bf7413ff2 am: 1a50bf5f6f 
Change-Id: Ie81292b994e769fac375f96eaa47f06de071f377
 2020-03-23 08:49:46 +00:00
Eric Sandness
0bf7413ff2 Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 6d9451891a 
Change-Id: Ie8144a556fa767e274ececbeb58f87844cdd31a9
 2020-03-23 08:18:48 +00:00
Eric Sandness
0d022fced2 Make Logic For Selecting Title Layout Consistent am: b02952a5d3 
Change-Id: Ie91236f0ec08795a7db45baf98844fc10fcb4dcb
 2020-03-23 07:55:47 +00:00
Bonian Chen
7c4b785a83 Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 am: 3ebf728910 am: caaae4627e am: 928ddce1f0 
Change-Id: Ie611255390be747ee6282a310f2f9924a7361d0d
 2020-03-23 07:15:54 +00:00
Treehugger Robot
7c62cbd97e Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0 
Change-Id: I6b363bd609d580d547cb59851f5bfaba57ef7154
 2020-03-23 07:08:39 +00:00
Bonian Chen
caaae4627e Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 am: 3ebf728910 
Change-Id: I659ecc4aae14fcb0bbba8af558c65adabb566bed
 2020-03-23 06:54:36 +00:00