PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,656 Commits 1 Branch 0 Tags
5e3232cc63002f4b347f0ca0ac12f4819516a07c
Commit Graph

81656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Goldman
c5cf69b1cf Create unit test for the VpnInfoPreference 
Currently the Settings VPN library doesn't including much testing
support, so this is intended as a start, in order to improve reliability
and stability of the area.

Test: atest -c VpnInfoPreferenceTest
Bug: 187245804
Change-Id: Id5acb699e0a68f479f3b0b6e6614c2e4e43b163b
 2021-05-05 14:27:36 +08:00
Stanley Wang
07148777f1 Merge "Fix the "Video call" can be searched on unsupported device." into sc-dev am: 2248941d43 am: afea6e4c5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424445

Change-Id: I26cb7e66b3cba46120e074b33347c3ee54a9f2ac
 2021-05-05 05:52:37 +00:00
Stanley Wang
afea6e4c5e Merge "Fix the "Video call" can be searched on unsupported device." into sc-dev am: 2248941d43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424445

Change-Id: I2ab17ac6a58ac9781c030b79af03dbd12d79385e
 2021-05-05 05:38:12 +00:00
Stanley Wang
2248941d43 Merge "Fix the "Video call" can be searched on unsupported device." into sc-dev 2021-05-05 05:07:47 +00:00
Alex Salo
20cc79cb28 Merge "Fix NullPointerException in SmartAutoRotateCameraStateController" into sc-dev am: c26fabff2a am: 1a1a77572c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14162986

Change-Id: Icb3ee44d90d6a1ebc7f3d4a1780d346bd16b1ca5
 2021-05-05 04:31:07 +00:00
Stanley Wang
be0628458b Merge "Use MainSwitchPreference on Bubbles, Screen Saver and One-Handed mode pages." into sc-dev am: 9abe5df134 am: addda4b71c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14160600

Change-Id: I16744a0582b8646ac3ccd45077e12fb8bf1b8179
 2021-05-05 04:30:24 +00:00
Arc Wang
0e7e1f7e08 Merge "Cleanup Storage Settings" into sc-dev am: 3576b10330 am: e22843f6ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408668

Change-Id: Id0f5f2cc4c6613e04314b023847ce645c588f06c
 2021-05-05 04:30:16 +00:00
Alex Salo
1a1a77572c Merge "Fix NullPointerException in SmartAutoRotateCameraStateController" into sc-dev am: c26fabff2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14162986

Change-Id: If76335c6a297dd8d35a5b8e672a0f42535ad9123
 2021-05-05 04:17:02 +00:00
Alex Salo
c26fabff2a Merge "Fix NullPointerException in SmartAutoRotateCameraStateController" into sc-dev 2021-05-05 04:12:38 +00:00
Stanley Wang
addda4b71c Merge "Use MainSwitchPreference on Bubbles, Screen Saver and One-Handed mode pages." into sc-dev am: 9abe5df134 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14160600

Change-Id: I4bb2cf7a32c1e47536d8d3809f86c7a260078a66
 2021-05-05 03:40:21 +00:00
Arc Wang
e22843f6ea Merge "Cleanup Storage Settings" into sc-dev am: 3576b10330 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408668

Change-Id: I7bb2dfc3a1b056e9c7014ccb388cf678a412a20a
 2021-05-05 03:40:06 +00:00
Stanley Wang
81524c89cc Fix the "Video call" can be searched on unsupported device. 
The non-indexable does not work due to the NPE.

Fixes: 186594185
Test: robo test and see the search result.
Change-Id: Idc733b3521a774fa8b61a853aa078f50afc331cb
 2021-05-05 11:32:10 +08:00
Stanley Wang
9abe5df134 Merge "Use MainSwitchPreference on Bubbles, Screen Saver and One-Handed mode pages." into sc-dev 2021-05-05 03:19:26 +00:00
Arc Wang
3576b10330 Merge "Cleanup Storage Settings" into sc-dev 2021-05-05 03:13:37 +00:00
lesl
26128e8722 wifi: Use new API for wifi data usage function 
For wifi, a old API: buildTemplateWifiWildcard will includes the merged
wifi which is included to mobile usage. It should not double count
again. Call new API: buildTemplateWifi with
NetworkId: NetworkTemplate.WIFI_NETWORKID_ALL
and null subscriberId to get non-merged wifi usage.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppDataUsageTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppDataUsagePreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryPreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageUtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsDumpServiceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageInfoControllerTest
Test: Manual Test, wifi data usage count correctly.
Bug: 176396812
Change-Id: Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb
 2021-05-05 10:33:34 +08:00
Jeremy Goldman
b1570edfb2 Merge "Set summary if VPN is AlwaysOn Type" into sc-dev am: da602e196e am: 132a00da76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424438

Change-Id: Ied8f51bbdd8534bbaee0bcda37d0bccd3eedca5d
 2021-05-05 02:27:06 +00:00
Jeremy Goldman
132a00da76 Merge "Set summary if VPN is AlwaysOn Type" into sc-dev am: da602e196e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424438

Change-Id: I438e0ecb5e77cd729736ff191791c54e66fd3bc7
 2021-05-05 01:34:43 +00:00
Jeremy Goldman
da602e196e Merge "Set summary if VPN is AlwaysOn Type" into sc-dev 2021-05-05 01:06:01 +00:00
TreeHugger Robot
b80efae71c Merge "Fix back navigation in biometric enrollment." into sc-dev am: 619321198c am: 048c7bc414 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14427973

Change-Id: I03acb6436aadeb072c5f2b2c5370ac300a653902
 2021-05-05 00:08:46 +00:00
TreeHugger Robot
048c7bc414 Merge "Fix back navigation in biometric enrollment." into sc-dev am: 619321198c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14427973

Change-Id: I5da539730bb27549ada5ee86ea8e2b63b04d8a97
 2021-05-04 23:55:00 +00:00
TreeHugger Robot
619321198c Merge "Fix back navigation in biometric enrollment." into sc-dev 2021-05-04 23:23:39 +00:00
Joe Bolinger
43d978bd7b Fix back navigation in biometric enrollment. 
Using the back buttons can cause a crash in at least two cases. Skipping
face enrollment and then starting/stopping any enrollment can lead to
an invalid token and failed HAT request. Backing out of the activity and
restarting it can also lead to using a stale token that fails.

Fix: 179336333
Test: manual on device
Change-Id: I0c1133e4c3d9c97997043ddc9374aa3cfc4f1c97
 2021-05-04 14:43:17 -07:00
Kevin Chyn
5dcb3ddada Merge changes from topic "credential-removal-strings" into sc-dev am: 177d76986a am: 84ed4f464b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14365935

Change-Id: Ida951fe688069a17c743493aec34d6d75a240c3d
 2021-05-04 20:58:13 +00:00
Kevin Chyn
4fd518ce10 Update credential removal strings am: a435a5a288 am: 611ba57c24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14357317

Change-Id: Ic1e2c25fdc3a829fb3e6aea744c173e7c8885d5a
 2021-05-04 20:58:12 +00:00
Amit Mahajan
77f50475bf Merge "Get rid of redundant mSubId." into sc-dev am: e2de71a6a4 am: a2a7d3f43c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14354534

Change-Id: I2b77a345f3db7ef3dc297e96c33ce046d090baa7
 2021-05-04 20:57:58 +00:00
Kevin Chyn
84ed4f464b Merge changes from topic "credential-removal-strings" into sc-dev am: 177d76986a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14365935

Change-Id: I86295d5aca4a11f6e5cb7200872759ec135c05f1
 2021-05-04 20:37:55 +00:00
Kevin Chyn
611ba57c24 Update credential removal strings am: a435a5a288 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14357317

Change-Id: I1722306ad83ec74222caf94bc0f19969aefb1902
 2021-05-04 20:37:54 +00:00
Amit Mahajan
a2a7d3f43c Merge "Get rid of redundant mSubId." into sc-dev am: e2de71a6a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14354534

Change-Id: I92161200e399a481e7ce007b705282ddbc89031c
 2021-05-04 20:37:37 +00:00
Yi Jiang
a3cf23855d Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev am: f164cb1976 am: 905739a64a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14418428

Change-Id: I2d80d6504211b2ec38a6ba3b84c3f0fe93f515dc
 2021-05-04 20:24:37 +00:00
Kevin Chyn
177d76986a Merge changes from topic "credential-removal-strings" into sc-dev 
* changes:
  Update combined settings summary
  Update credential removal strings
 2021-05-04 20:13:00 +00:00
Amit Mahajan
e2de71a6a4 Merge "Get rid of redundant mSubId." into sc-dev 2021-05-04 20:11:56 +00:00
Yi Jiang
905739a64a Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev am: f164cb1976 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14418428

Change-Id: Ic298270f318f24a0caba69fd9539a451bd03a762
 2021-05-04 20:04:17 +00:00
Yi Jiang
f164cb1976 Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev 2021-05-04 19:28:31 +00:00
Wesley Wang
09a1d75d36 Merge "Update battery help message layout" into sc-dev am: 0df7148f1e am: 821b7f350d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424446

Change-Id: Ief09aed3653000905c610b386996e9f9fbf617c8
 2021-05-04 18:30:46 +00:00
Trevor Black
f01cfa2977 Merge "Update Android Settings for the latest Extra App Info design" into sc-dev am: b6f2f39d27 am: 80938e8cbf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327037

Change-Id: I69c7308167c04f46e8ddb920431ce932e0df0a84
 2021-05-04 18:30:00 +00:00
Wesley Wang
821b7f350d Merge "Update battery help message layout" into sc-dev am: 0df7148f1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424446

Change-Id: If6ba9494309ef39d6f31900ecc3c56dbfe473068
 2021-05-04 18:06:49 +00:00
Trevor Black
80938e8cbf Merge "Update Android Settings for the latest Extra App Info design" into sc-dev am: b6f2f39d27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327037

Change-Id: I305d9bc385b3c88e59f66e15dbbe9707a205b244
 2021-05-04 18:05:59 +00:00
Wesley Wang
0df7148f1e Merge "Update battery help message layout" into sc-dev 2021-05-04 17:54:11 +00:00
Trevor Black
b6f2f39d27 Merge "Update Android Settings for the latest Extra App Info design" into sc-dev 2021-05-04 17:38:26 +00:00
TreeHugger Robot
e3f2bf6a01 Merge "Add null check for app labels" into sc-dev am: cc28a0826e am: d1bd4abb65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14426523

Change-Id: If9c4160367c669e629664e7ef17e4420c0cb346a
 2021-05-04 17:34:30 +00:00
TreeHugger Robot
d1bd4abb65 Merge "Add null check for app labels" into sc-dev am: cc28a0826e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14426523

Change-Id: Ied8336db7eb951c06934f7706e6a14fc4f70e572
 2021-05-04 17:21:06 +00:00
TreeHugger Robot
cc28a0826e Merge "Add null check for app labels" into sc-dev 2021-05-04 17:03:37 +00:00
Jan Tomljanovic
f58d3e2766 Merge "Launch SecurityHub fragment on SECURITY_SETTINGS intent when available." into sc-dev am: b6cea338a0 am: 6a9f5af516 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339810

Change-Id: I861a1673670ec0c272c836f0a46702f66cc7ee0d
 2021-05-04 15:57:58 +00:00
Sally Yuen
bec8248367 Merge "set enabled state of persist switch when Extra Dim state is changed" into sc-dev am: 478b218230 am: f2289dff47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414318

Change-Id: I4ff62959d08b1b0cfc81a6969aab0fe4a620c0ca
 2021-05-04 15:56:40 +00:00
Jan Tomljanovic
6a9f5af516 Merge "Launch SecurityHub fragment on SECURITY_SETTINGS intent when available." into sc-dev am: b6cea338a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339810

Change-Id: I7495b5a4d428c6bbc283f30ce71c1736835942cb
 2021-05-04 15:46:34 +00:00
Sally Yuen
f2289dff47 Merge "set enabled state of persist switch when Extra Dim state is changed" into sc-dev am: 478b218230 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414318

Change-Id: I29f486badbfc0e68d5737611bec4fc01d2f74526
 2021-05-04 15:45:30 +00:00
Julia Reynolds
bdcb525982 Add null check for app labels 
Test: manual
Fixes: 187173056
Change-Id: I1affd901bc644597e4af7fc65c81f919c8589ed5
 2021-05-04 11:40:09 -04:00
Jan Tomljanovic
b6cea338a0 Merge "Launch SecurityHub fragment on SECURITY_SETTINGS intent when available." into sc-dev 2021-05-04 15:35:43 +00:00
Sally Yuen
478b218230 Merge "set enabled state of persist switch when Extra Dim state is changed" into sc-dev 2021-05-04 15:26:12 +00:00
TreeHugger Robot
5a9fd7ff53 Merge "Update app usage page footer string" into sc-dev am: 16f8b4c943 am: 1c108d1e86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424447

Change-Id: I0fd8f5767b2d5142a881decf441602e921eab833
 2021-05-04 14:40:29 +00:00