PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,828 Commits 1 Branch 0 Tags
31f9705a60f84dda7a95a2bd3be0eb5c7cc94f45
Commit Graph

59828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
9559e7d480 Merge "String updates" into rvc-dev am: 159538d35a 
Change-Id: I267fb8f17a5356c181f1943bef1dc17ffadda650
 2020-03-23 16:08:05 +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
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
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
Calvin Pan
029ec754a3 Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab 
Change-Id: I0574aaf33278a82500809e7803b61e5e12b49eb9
 2020-03-23 10:23:31 +00:00
Calvin Pan
861d3446ab Merge "Clear the entries in updateState" into rvc-dev 2020-03-23 10:11:58 +00:00
Fiona Campbell
9eae2b7531 Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 
Change-Id: Ia027a69fd2e739aba88335a208644d9be663163b
 2020-03-23 09:04:26 +00:00
Fiona Campbell
9a712271f2 Merge "Fix displayed brightness value in settings." into rvc-dev 2020-03-23 08:54:26 +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
Eric Sandness
6d9451891a Make Logic For Selecting Title Layout Consistent am: b02952a5d3 
Change-Id: I3477638565f28b5ca4848fec6f85e8f4ea7a3e67
 2020-03-23 07:55:09 +00:00
Bonian Chen
3ebf728910 Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 
Change-Id: I61ecd339475067337dc1d58ec5ac24da1036377b
 2020-03-23 06:35:54 +00:00
Eric Sandness
b02952a5d3 Make Logic For Selecting Title Layout Consistent 
Align the logic for selecting between the setup and non-setup versions
of the lock screen settings title layout, with the logic used in
ChooseLockGeneric.  This means using
WizardManagerHelper.isAnySetupWizard, rather than
WizardManagerHelper.isDeviceProvisioned.

Fixes: 151552453
Test: Manually verify screens in consumer setup, enterprise setup, and
Settings app

Change-Id: I75cd9e509320b9ef9b929dd592f16e8130d80a6e
 2020-03-23 06:25:07 +00:00
Bonian Chen
31315e4172 Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev 2020-03-23 06:20:42 +00:00
calvinpan
8c6218013d Clear the entries in updateState 
When user select the prefer network type that will also invoke
updateState(), so need to clear the entries to prevent adding duplicate
item.

Bug: 152031192
Test: By manual.
Change-Id: I05c5eae658cf72bdf05f5007b4aeba575ab14d61
 2020-03-23 14:09:54 +08:00
TreeHugger Robot
7f0a093f5c Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b 
Change-Id: Icc3236048ae0cd07f4bb623bc59830332813584b
 2020-03-23 02:41:45 +00:00
TreeHugger Robot
dea87bd85b Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev 2020-03-23 02:07:56 +00:00
tim peng
30bc781200 Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 
Change-Id: I07b28fccc7cc1285506c18b5579350fbdcca23e2
 2020-03-23 01:58:34 +00:00
tim peng
f8f1b271b1 Merge "Update header information in output switcher" into rvc-dev 2020-03-23 01:47:25 +00:00
Arc Wang
263930d8b4 [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - I 
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: Id88a5c9276457e329840e72711bd06e51a03dd1f
 2020-03-23 09:42:35 +08: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
Stanley Wang
fb39c70875 Merge "Update Settings subtexts for R." into rvc-dev 2020-03-21 05:30:25 +00:00
Stanley Wang
61e7d2c24c Merge "Update Settings strings for R." into rvc-dev 2020-03-21 05:30:00 +00:00
TreeHugger Robot
17c6211285 Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b 
Change-Id: I5b2b39c33b525407b1b6da300dc853704f727061
 2020-03-21 03:14:30 +00:00
TreeHugger Robot
a4e3d5ef8b Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev 2020-03-21 02:58:15 +00:00