PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,014 Commits 1 Branch 0 Tags
17ec2206f36cb428c041330fb99a5a20bf49da7b
Commit Graph

61014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
3f991e0778 Merge "Show in UI if admin has disabled face auth" into rvc-dev am: 6f4a9bf11c am: b0692bd6c5 
Change-Id: Ie69c2346ab1b0eb44000f1cedef1bf8b386fd4f5
 2020-03-23 11:30:12 +00:00
TreeHugger Robot
c2cd9cc5cd Merge "Show in UI if admin has disabled face auth" into rvc-dev am: 6f4a9bf11c am: 4a4190dc9d 
Change-Id: I43e8ad3674ea7207eca3b3af254db5aead8005f6
 2020-03-23 11:22:11 +00:00
Raff Tsai
cf990c239e Merge "Modify close app function." am: ce1f51128b am: 579878afcf am: ffe91b44f8 
Change-Id: I2b1dea5dc42fd7cf866933500935cf7e209321d4
 2020-03-23 11:21:59 +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
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
Calvin Pan
339b8e15ba Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab am: 70218097f4 
Change-Id: Ib445371d2ee2d1c44b10255f0e6d676d9f48b171
 2020-03-23 10:34:59 +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
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
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
ff3539af2c Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 am: a165e13de0 
Change-Id: I750710d381c728552d16f7b87aacf5ca673ced31
 2020-03-23 09:30:48 +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
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
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
731399ddf3 Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 0d022fced2 
Change-Id: If5a2be4cdf1c2466db2c7358b99096521f9df493
 2020-03-23 08:19:06 +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
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
db6759d985 Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 am: 3ca9e69e2b 
Change-Id: I78758d62bdb3a86cca1379e73f28cd5c7ac283a9
 2020-03-23 06:55:04 +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
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
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
Treehugger Robot
b301288cd7 Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b 
Change-Id: I6a04bfbb044435e987d4f141b98e457de35e9e14
 2020-03-23 06:25:45 +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
Automerger Merge Worker
f6465f9aa8 Merge "Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: 7f0a093f5c" into rvc-d1-dev-plus-aosp 2020-03-23 03:04:02 +00:00
TreeHugger Robot
47c78f4f72 Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: 7f0a093f5c 
Change-Id: Ia60fb17751ca5520b4b733c30312cb992696f02e
 2020-03-23 03:03:57 +00:00
TreeHugger Robot
742539e288 Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: d582019b63 
Change-Id: I94f44d842f761994649ba7ca1e0211c2c0a4cea4
 2020-03-23 03:03:54 +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
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
tim peng
a58a21ff01 Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: f51bd0decb 
Change-Id: I4935e45a9193949275f5300ee33e9cf421bc8079
 2020-03-23 02:14:15 +00:00
tim peng
7b1b527b13 Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: 30bc781200 
Change-Id: I81fae7c73c5bd96aabcae7156e0fef98a49ed633
 2020-03-23 02:13:40 +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