Commit Graph

36455 Commits

Author SHA1 Message Date
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
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
f164cb1976 Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev 2021-05-04 19:28:31 +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
cc28a0826e Merge "Add null check for app labels" into sc-dev 2021-05-04 17:03:37 +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
16f8b4c943 Merge "Update app usage page footer string" into sc-dev 2021-05-04 14:21:52 +00:00
Betty Chang
35e244754c Merge "Assign StaticIpConfiguration builder value to global variable" into sc-dev 2021-05-04 14:04:56 +00:00
TreeHugger Robot
31a697eb79 Merge "Remove the Summary of Backup in System Settings" into sc-dev 2021-05-04 14:00:49 +00:00
Wesley.CW Wang
531e6b23a2 Update app usage page footer string
- Use lower case string

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: Id4111256bdab5f74e31fed6d015b96fe687a4c7b
2021-05-04 21:13:25 +08:00
Jeremy Goldman
d6913243a1 Merge "If the CarrierConfigManager is still null, return that the preference is not available." into sc-dev 2021-05-04 09:30:04 +00:00
Jeremy Goldman
050f7a7657 If the CarrierConfigManager is still null, return that the preference is
not available.

Test: atest -c VideoCallingPreferenceControllerTest
Bug: 186594185
Change-Id: I4650d9f77f6a4a0cb84d6e20f02e4ab1d1841131
2021-05-04 15:05:53 +08:00
changbetty
01cc97f382 Assign StaticIpConfiguration builder value to global variable
[Root Cause]
Due to call by reference for Object, we pass the StaticIpConfiguration
to method. But in method we new the staticIpConfiguration builder
and re-assign builder to parameter, it will release when the method is ended.
The value in Builder will not be set to global variable.

[Solution]
Assign the value in StaticIpConfiguration builder to global variable
directly.

Bug: 186489618
Test: manual test
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
Change-Id: I1a6aee31e6977be42792440c3667db2557a20c4e
2021-05-04 14:40:31 +08:00
ykhung
973212adf7 Rename variables and refine the format style from ag/14346184
Bug: 14346184
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ie87f2dba2b87781ed5071adbc6f8a2aa45d1fd53
2021-05-04 11:59:07 +08:00
TreeHugger Robot
5ef4fa037e Merge "Fix unable to send file via OPP" into sc-dev 2021-05-04 03:00:23 +00:00
Edgar Wang
609d900f4d Remove the Summary of Backup in System Settings
Fix: 182357397
Test: manual and robotest
Change-Id: Ic6b08cfd23947af82fd1e9075dd5f698168127ac
2021-05-04 02:28:13 +00:00
Yi Jiang
18c97b595f Fixes 'no ripple effect' issue for screen attention setting
Preferences shouldn't be initialized at onAttach() because the settings
style hasn't been loaded yet. This change defers the preferences
initialization so that they comply with the settings style.

The change ag/14114425 is reverted due to b/186904496. This change
includes a fix for that issue.

Test: manually
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=com.android.settings.display
Bug: 183909540
Bug: 186904496

Change-Id: I317ce251f4d11e62c6592ee587c2919da4d45db3
2021-05-03 18:02:59 -07:00
Kevin Chyn
50dcf7955a Update combined settings summary
Display strings based on number of enrollments

Bug: 185804815
Test: manual on-device
Change-Id: I47be2a53b37c36b3136cd233001db7cadf123ae9
2021-05-03 16:15:56 -07:00
Kevin Chyn
a435a5a288 Update credential removal strings
1) Credential can no longer be removed for separate challenge profiles,
   so strings and supporting logic are also now removed
2) Updates existing strings for credential and fingerprint
3) Adds new strings for face
4) Adds new strings for face + fingerprint

Bug: 185180691
Test: manual on device

Change-Id: I2a850eb6644103e14ef2a670222e500c705a16cd
2021-05-03 16:15:55 -07:00
Kevin Chyn
08b7833120 Merge "Cancel enrollment when back or negative buttons pressed" into sc-dev 2021-05-03 23:15:03 +00:00
sallyyuen
5d567ff19f set enabled state of persist switch when Extra Dim state is changed
Bug: 186806715
Test: manual,
atest ReduceBrightColorsPersistencePreferenceControllerTest

Change-Id: Icad35cb6bc8ac3a6b8edf518d18898c277cca5e3
2021-05-03 15:17:00 -07:00
bsears
deb2acc9b3 Merge "Revert "Fixes 'no ripple effect' issue for screen attention setting"" into sc-dev 2021-05-03 22:08:44 +00:00
Kevin Chyn
33ba245149 Cancel enrollment when back or negative buttons pressed
Fixes: 183671394
Test: Go through enrollment flow and test various buttons
Change-Id: I8d3939de42ecd0a889f0c6d3c94002199285ef8b
2021-05-03 21:46:25 +00:00
Dmitri Plotnikov
501eea7fa2 Merge "Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers" into sc-dev 2021-05-03 20:40:25 +00:00
Trevor David Black
7c5484bc60 Update Android Settings for the latest Extra App Info design
Bug: b/185793841
Test: Settings -> Apps -> APP -> Extra App Info
Change-Id: I2067f7d5d773e2fd9c817504dda262fb5fd7e033
2021-05-03 19:05:15 +00:00
TreeHugger Robot
8d1fd73e89 Merge "Storage Settings Apps category shows image/video/audio APPs" into sc-dev 2021-05-03 18:11:03 +00:00
Dmitri Plotnikov
6417493b29 Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers
Bug: 186006876
Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests
Change-Id: I2e240aa15c87b4b9dcbe993b4b0b1111285ec3ff
2021-05-03 11:01:36 -07:00
bsears
30e9ba1e52 Revert "Fixes 'no ripple effect' issue for screen attention setting"
This reverts commit 20d1da2b62.

Reason for revert: Based on bisection, this is the likely root cause of b/186904496

Bug: 186904496
Change-Id: I0eaa026b52610d7ef4543c32791531971e68f8e6
2021-05-03 17:59:11 +00:00
TreeHugger Robot
80daf4fc49 Merge "Update apps icon in Sound > Media page to correct size." into sc-dev 2021-05-03 17:20:33 +00:00
Edgar Wang
da4d4b2e3b Update apps icon in Sound > Media page to correct size.
- MediaSwitchPreference should inherit AppSwitchPreference

Fix: 186609222
Test: visual
Change-Id: I18a8c42a9eab9601acc792117928a121a3c4b436
2021-05-04 00:08:59 +08:00
Yichi Chen
ffbea30a18 Merge "RefreshRatePrefCtr: Correct the check of peak refresh rate" into sc-dev 2021-05-03 14:59:47 +00:00
YUKAI HUNG
f988790908 Merge "Add new field for data interpolation usage" into sc-dev 2021-05-03 12:26:24 +00:00
Arc Wang
4cd89bb082 Storage Settings Apps category shows image/video/audio APPs
There is AOSP built in file browser for image/video/audio
file category, all APPs except games should be included in
Apps category.

- Shows image/video/audio APPs in APPs category.
- Count Image/Video/Audio APPs storage size to Apps storage size.
- Remove APP size & cache size for Images/Videos/Audios category.

Bug: 170918505
Test: atest StorageAsyncLoaderTest.java
Change-Id: I07e0a3a66a13f36b9e0cbde289d8ba90df4ae295
2021-05-03 20:17:58 +08:00
Ryan Lin
194015b774 Merge "Move Magnification Mode Settings to the main page" into sc-dev 2021-05-03 11:28:02 +00:00
Menghan Li
da60d4e842 Merge "[Material Next] Update accessibility tool footer style" into sc-dev 2021-05-03 11:13:28 +00:00
ykhung
0c7e50cb43 Add new field for data interpolation usage
reference the decription in cl/371645876

Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I944399dc205cad9b96fe22e82e4c651b4ccc4e37
2021-05-03 18:31:27 +08:00
Menghan Li
c7ddea6aa8 Merge "Hide the accessibility location preference when gesture navigation mode enabled." into sc-dev 2021-05-03 10:21:58 +00:00
menghanli
95aa089858 Hide the accessibility location preference when gesture navigation mode enabled.
If it's grey out, users don't have the alternative way in that page to enable it. According to the UX design, we should hide it if it is needed.

Bug: 186776534
Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=AccessibilityButtonLocationPreferenceControllerTest
Change-Id: If2f659da32345938e2930fde42365cd796571068
2021-05-03 15:12:43 +08:00
TreeHugger Robot
b0bd79d468 Merge "Update password & account settings icon size" into sc-dev 2021-05-03 06:52:54 +00:00
TreeHugger Robot
d32e0cf8a6 Merge "Fix the unaligned title of injected items" into sc-dev 2021-05-03 06:44:05 +00:00
Edgar Wang
a0d9c9186c Update password & account settings icon size
- Password app icon size should be 32dp

Bug: 186609741
Test: visual
Change-Id: Ifb86e568f8c073e3f27f1c17ea9dd94e9b47a5e4
2021-05-03 13:45:34 +08:00
Jason Chiu
8531d8795f Fix the unaligned title of injected items
Remove the summary space holder for the injected items that are not
assigned a summary or a summary uri.

Test: visual, robotest
Fixes: 187006845
Bug: 182357397

Change-Id: I7b3d165f0ffd771dd0110962c9e3159c4977d6e3
2021-05-03 12:22:36 +08:00
Wesley Wang
12bc0921ce Merge "Update batter saver page footer (1/2)" into sc-dev 2021-05-03 03:42:40 +00:00
YUKAI HUNG
16b60aa2d7 Merge "Refine the app/system section divider content show/hide rule" into sc-dev 2021-05-03 03:34:02 +00:00
TreeHugger Robot
6907a1feb8 Merge "[Security Report] Fix RequestToggleWiFiActivity overlaid issue" into sc-dev 2021-05-01 07:27:27 +00:00
TreeHugger Robot
fb2e8837f1 Merge "Add placeholder values to placeholder settings" into sc-dev 2021-04-30 14:12:51 +00:00