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

60064 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
168fe82aa5 Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 
Change-Id: Ie80135ad3fe7078fee32de117e2c543e7c3de83a
 2020-03-24 12:36:43 +00:00
TreeHugger Robot
87c0179c01 Merge "Re-enable ignored tests" into rvc-dev 2020-03-24 12:22:11 +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
c1f1682fbf Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 
Change-Id: I2cf40657d94d445a3582f7b64f6e02dbf8e77aa2
 2020-03-24 09:16:42 +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
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
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
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
a3fccb9cc0 Merge "Add strings for power menu settings" into rvc-dev 2020-03-23 18:09:37 +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
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
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
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
Raff Tsai
ffe91b44f8 Merge "Modify close app function." am: ce1f51128b am: 579878afcf 
Change-Id: I27fd2f9dbb6e852d53d02ef638d3a49abb32ac12
 2020-03-23 11:09:22 +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
Raff Tsai
579878afcf Merge "Modify close app function." am: ce1f51128b 
Change-Id: I80e83ae16c2a2f931604e864fb79ee1d02db6a0e
 2020-03-23 10:53:44 +00:00
Raff Tsai
ce1f51128b Merge "Modify close app function." 2020-03-23 10:32:29 +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
youtengliang
aa4f582931 Modify close app function. 
Test: atest com.android.settings.tests.perf
Change-Id: Ia504dd1185de1d33a21fec344871d4b0fabae953
 2020-03-23 09:29:28 +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
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
0d022fced2 Make Logic For Selecting Title Layout Consistent am: b02952a5d3 
Change-Id: Ie91236f0ec08795a7db45baf98844fc10fcb4dcb
 2020-03-23 07:55:47 +00:00
Bonian Chen
3ca9e69e2b Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 
Change-Id: I13bdb4cb0a9cf1cc8b7f9930a50a016d208acae3
 2020-03-23 06:36:27 +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
Treehugger Robot
456b2bf87b Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 
Change-Id: Id2bbc0a3596bb9a82ea066dc512b206dd8f8b7a1
 2020-03-23 06:18:45 +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
cbe5bbdcd5 Merge "Fixed NullPointerException" am: 5fb16be925 
Change-Id: Ie99fc2139875e0f8dfbfbe0bd31f55f135607996
 2020-03-23 06:00:05 +00:00
Treehugger Robot
5fb16be925 Merge "Fixed NullPointerException" 2020-03-23 05:45:38 +00:00
TreeHugger Robot
d582019b63 Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b 
Change-Id: I2573e4a5f478a60bc07424dec42b828ccb6e642e
 2020-03-23 02:42:30 +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
f51bd0decb Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 
Change-Id: I2406caf1ecdb217658c310f4db948c627adcf790
 2020-03-23 01:59:00 +00:00
tim peng
f8f1b271b1 Merge "Update header information in output switcher" into rvc-dev 2020-03-23 01:47:25 +00:00