PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,250 Commits 1 Branch 0 Tags
51e405d39c818fe1e3614cd6aaf05955e2da17a2
Commit Graph

60250 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
51e405d39c Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583 am: d6b3dae0a6 
Change-Id: I3481d092a29c9270d5c941ec1205cee631e7ef5f
 2020-03-25 00:21:36 +00:00
TreeHugger Robot
d6b3dae0a6 Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583 
Change-Id: Ia8fdd87b57d002382abf5be635d30ec40eee4895
 2020-03-25 00:07:58 +00:00
TreeHugger Robot
558095e583 Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 
Change-Id: I4a4e9d0ef55b07cee0207e73dba1b577d8aa1bc9
 2020-03-24 23:48:40 +00:00
TreeHugger Robot
d227755be8 Merge "[Settings] Avoid from Settings crash" into rvc-dev 2020-03-24 23:32:34 +00:00
Julia Reynolds
a9b755c116 Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: b5d726003f am: 46b8b3b4d2 
Change-Id: Id8e3f577e73d5e3bcd813cf9a9c13ed0c672d109
 2020-03-24 22:14:05 +00:00
Julia Reynolds
46b8b3b4d2 Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: b5d726003f 
Change-Id: Ib7c68ea80f4fa61b03de5cd72def8cd7b8c499a6
 2020-03-24 22:00:27 +00:00
Bonian Chen
dcf701efc3 [Settings] Avoid from Settings crash 
Avoid from crash when null pointer.

Bug: 152336444
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: I77314f697d8a99d77b9f5fe0a48ddbae69634743
 2020-03-25 05:48:37 +08:00
Julia Reynolds
b5d726003f Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd 
Change-Id: Icf2ce73480b62fb1853e0798b890cfbcbccc0191
 2020-03-24 21:42:03 +00:00
Julia Reynolds
1063516bd2 Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60 am: 575b3e8aaf 
Change-Id: I31f18a7bddbfa6f48f27e002e9aedfd57baa64d6
 2020-03-24 21:41:45 +00:00
Julia Reynolds
79fd5811cd Merge "Update all conversations screen" into rvc-dev 2020-03-24 21:33:53 +00:00
Julia Reynolds
575b3e8aaf Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60 
Change-Id: Ie8b990fbc370db99e26097612b5d760e51614b75
 2020-03-24 21:26:34 +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
TreeHugger Robot
bc63cbf00b Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd am: ed3f4c9d98 
Change-Id: I5341052f7220a84b802fa800aeb86e7195e7e8f0
 2020-03-24 13:11:31 +00:00
TreeHugger Robot
ed3f4c9d98 Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd 
Change-Id: I79a8ebd1fd0fe103749fdbc7047b6ce9c7202b4a
 2020-03-24 12:49:48 +00:00
TreeHugger Robot
875b0df3dd Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 
Change-Id: Ie3f31d838d91cf051524e81f1cac87dec0d84add
 2020-03-24 12:35:56 +00:00
TreeHugger Robot
87c0179c01 Merge "Re-enable ignored tests" into rvc-dev 2020-03-24 12:22:11 +00:00
Ben Murdoch
3e74710b10 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996 am: ffc010f55e 
Change-Id: I0665a3cdc28361591859a73748361002fa45d0b5
 2020-03-24 11:13:03 +00:00
Ben Murdoch
ffc010f55e Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996 
Change-Id: I08d7d6d5d17356c1903a814c68e572a7851657e0
 2020-03-24 10:57:24 +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
7afced3599 Merge "Move strings related to user creation to SettingsLib." into rvc-dev 2020-03-24 10:25:21 +00:00
Zoey Chen
775ae6b0fd Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700 am: 12952db603 
Change-Id: Ia58afd40f773cb257267263639c1911d4e1fd086
 2020-03-24 09:55:50 +00:00
Zoey Chen
12952db603 Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700 
Change-Id: I3a69d760a434d24130fad2abf4a5150a31087970
 2020-03-24 09:33:31 +00:00
Zoey Chen
2a0dd6f700 Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 
Change-Id: I75a262c21d215f8669c81056b581c5ffd734accb
 2020-03-24 09:16:28 +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
30966bffbc Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: f47f38c9a2 am: 6799768b24 
Change-Id: I4fff878cb2ed4085dcca5e886772f17935ba57da
 2020-03-24 08:22:47 +00:00
Arc Wang
6799768b24 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: f47f38c9a2 
Change-Id: I4a03387c230ee69638088f1158391ad16aea4881
 2020-03-24 08:08:21 +00:00
Bonian Chen
114c70c9dc Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: d2f98e4dad am: 3ffc55f1ce 
Change-Id: Ieca365bb9558a7ff9f42304237313c2afbc7b0d6
 2020-03-24 07:58:38 +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
Bonian Chen
3ffc55f1ce Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: d2f98e4dad 
Change-Id: Ibf4c8ae584bcd77145df0837a0301e811b95cfe4
 2020-03-24 07:38:03 +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
d2f98e4dad Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 
Change-Id: Iac958c3fa1bab2de8ea55fe4194590b3275180d5
 2020-03-24 07:15:13 +00:00
Bonian Chen
9a0f633600 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev 2020-03-24 07:03:52 +00:00
TreeHugger Robot
4a0e23b6b0 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 am: 0e2eab994d 
Change-Id: I731f652a3512f951b9553d2b35484ca71e55e624
 2020-03-24 06:39:09 +00:00
TreeHugger Robot
0e2eab994d Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 
Change-Id: I8b7b73e65f18c955bd82f38390ec88b5520e62ab
 2020-03-24 06:31:23 +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
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
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
4db41f15c7 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 3052c27768 am: 45df17b1cb 
Change-Id: Ib6a27db8af3990b3185c97d30bc336bd99f688cf
 2020-03-23 19:04:10 +00:00
TreeHugger Robot
45df17b1cb Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 3052c27768 
Change-Id: I408626ea9cc63dcd54c9d2c656148d0a4e101f82
 2020-03-23 18:50:07 +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
ddabc9111b Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa am: 7866eddfa5 am: c1b5526cc5 
Change-Id: I4305b2954a0b1c790373dfc1fc19b25ea8f6ddaf
 2020-03-23 17:18:50 +00:00
TreeHugger Robot
c1b5526cc5 Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa am: 7866eddfa5 
Change-Id: Ia203a689b3411b20bc30e80562389755bdbc4bdd
 2020-03-23 17:05:08 +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
TreeHugger Robot
43d9013aaa Merge "Redesign individual conversation page" into rvc-dev 2020-03-23 16:31:27 +00:00
Mady Mellor
415f8b549f Merge "String updates" into rvc-dev am: 159538d35a am: 9559e7d480 am: 2c59efa1b9 
Change-Id: I74591ad7a1d0ee9a0feec994c4033055dcfebe98
 2020-03-23 16:30:18 +00:00