Kevin Chyn
678a57b0df
Merge changes from topic "kchyn-unicorn4a" into sc-dev
...
* changes:
Show biometric-specific dialog when appropriate
Add biometric strings to DeviceAdminStringProviderImpl
2021-06-17 01:27:00 +00:00
Joe Bolinger
a8808f7368
Add plumbing and placeholder screens for parental consent flow.
...
Bug: 188847063
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL --ez require_consent true
Test: atest com.android.settings.biometrics.ParentalConsentHelperTest
Change-Id: Ie136036d5f550775fd0b021979581a5d222f1b68
2021-06-16 09:58:19 -07:00
TreeHugger Robot
e3dbb8f637
Merge "[Provider Model] Show scanning sub-title once in the internet panel" into sc-dev am: 059b3fab8e
am: 46cd409eda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980879
Change-Id: I2293bc2f62f15a910223c69bbbcbad628d60119d
2021-06-16 09:09:15 +00:00
TreeHugger Robot
059b3fab8e
Merge "[Provider Model] Show scanning sub-title once in the internet panel" into sc-dev
2021-06-16 08:32:16 +00:00
Kevin Chyn
0b121f260d
Merge "Convert biometrics to RestrictedPreference" into sc-dev am: 24b81dcffb
am: 0f6dac59c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14926710
Change-Id: Ib153b57a8285a590d9e344cfda0c8ef4360a3bde
2021-06-16 06:46:17 +00:00
Kevin Chyn
24b81dcffb
Merge "Convert biometrics to RestrictedPreference" into sc-dev
2021-06-16 06:13:04 +00:00
Kevin Chyn
0c34d259a0
Show biometric-specific dialog when appropriate
...
1) We need to pass a "restriction" string from settings to the dialog,
otherwise the biometric dialog could be shown in non-biometric
flows
2) Updates ActionDisabledByAdminDialogHelper to pass the restrition
to be taken into consideration when creating the controller
3) Sets an optional onClickListener on the positive button.
Bug: 5788943
Test: atest ParentalControlsUtilsTest
Change-Id: Iedff7fef50e186b2779f061f37d3080c910d2179
2021-06-15 20:57:26 -07:00
Kevin Chyn
9af27677e9
Convert biometrics to RestrictedPreference
...
Bug: 188847063
Test: adb shell settings put secure com.android.settings.biometrics.ParentalControlsUtils.always_require_consent 1
Preference becomes gray with an info icon
Test: atest ParentalControlsUtilsTest
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER=CombinedBiometricStatusPreferenceControllerTest
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER=FingerprintStatusPreferenceControllerTest
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER=FaceStatusPreferenceControllerTest
Change-Id: I929c11606eec76063f7b060fdc5cb2b5f60a80e2
2021-06-15 19:57:04 -07:00
Sally
d98ee531c1
Add labels to intensity slider and flip labels
...
Labels are Dimmer and Brighter. As the slider value is lowered,
the dimming intensity is increased
Slider min = 100 - intensity max
Slider max = 100 - intensity min
Ex: If intensity max = 80, the slider min with be 20. If the user
moves the position to the minimum end we'll send 80 to Color DisplayManager
Test: atest ReduceBrightColorsIntensityPreferenceControllerTest,
manual
Bug: 190722076
Change-Id: Ib05ba38805b8fa1f68c144a3929027899df70abf
2021-06-15 15:59:33 +00:00
Weng Su
22ce63ff6f
[Provider Model] Show scanning sub-title once in the internet panel
...
- Show "Searching for network" sub-title once when the Wi-Fi list is
empty
Bug: 189912933
Test: manual test
atest -c InternetConnectivityPanelTest
Change-Id: I1681593461c35160d6337056b2097aa4fdd8c3f8
2021-06-15 22:58:26 +08:00
TreeHugger Robot
a8fcc6a678
Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev am: ab04f86066
am: 91d1b6640a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964828
Change-Id: Ic3e3f1c1364e529c57a01d332e2244d0615ec566
2021-06-15 13:01:36 +00:00
TreeHugger Robot
ab04f86066
Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev
2021-06-15 12:36:38 +00:00
TreeHugger Robot
ac44f3569a
Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev am: 1ce0d1117e
am: 479c1a1c5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934760
Change-Id: I7f9cf20b6aab539555df3e9644f2d499252f3467
2021-06-15 09:48:18 +00:00
Weng Su
58a651566f
[Provider Model] Remove Wi-Fi disconnect action
...
Bug: 189912933
Test: manual test
atest -c ProviderModelSliceTest
Change-Id: I964bf8de4f5eee1523943876567bf565ccb7f995
2021-06-15 17:43:31 +08:00
TreeHugger Robot
1ce0d1117e
Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev
2021-06-15 09:23:58 +00:00
TreeHugger Robot
bc895fd254
Merge "Revert "[Provider Model] Add WiFi toggle in internet panel"" into sc-dev am: 68079c7bd2
am: d441988494
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964819
Change-Id: I7bd0881b5314b0a7a82da64875aab5a990382871
2021-06-15 08:25:25 +00:00
TreeHugger Robot
68079c7bd2
Merge "Revert "[Provider Model] Add WiFi toggle in internet panel"" into sc-dev
2021-06-15 07:59:57 +00:00
Weng Su
28e5f4c2fc
Revert "[Provider Model] Add WiFi toggle in internet panel"
...
This reverts commit 04a4060225
.
Reason for revert: Need to split the functions for cherry picking to different branches
Bug: 189912933
Change-Id: I8c30a87c83e23b3df88ce2689d500626e1dd28d2
2021-06-15 04:10:13 +00:00
Jason Chang
3ab0d7b1b9
Merge changes from topic "OHM-newUI-Sys-Gesture" into sc-dev am: 5213fbced1
am: 7e61c806e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14804130
Change-Id: I0ba93c73c85b9c8120ed23fa3642921fe73fe87f
2021-06-12 12:06:55 +00:00
Jason Chang
5213fbced1
Merge changes from topic "OHM-newUI-Sys-Gesture" into sc-dev
...
* changes:
Update key visual changes for one handed mode settings
Remove redundant swipe down notification and one handed sub settings
2021-06-12 11:49:16 +00:00
TreeHugger Robot
5b4f9e63dc
Merge "[Provider Model] Add WiFi toggle in internet panel" into sc-dev am: 38df9ce8bb
am: 2ba6886bce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880638
Change-Id: I577afae3fa5b5c952a265951f66fccb183d45fcc
2021-06-12 11:07:24 +00:00
Weng Su
c4eb3b1320
[Provider Model] Hide W+ network if it's inactive
...
Bug: 187854575
Test: manual test
atest -c CarrierWifiTogglePreferenceControllerTest \
SubscriptionsPreferenceControllerTest
Change-Id: Ib99bc7fef38a99c1da1e365c2002ad30c617d445
2021-06-12 00:55:10 +00:00
Weng Su
04a4060225
[Provider Model] Add WiFi toggle in internet panel
...
- Move Wi-Fi toggle from menu button to slice row
- Remove Wi-Fi disconnect action
- Show scanning sub-title once only
Bug: 189912933
Test: manual test
atest -c InternetConnectivityPanelTest \
ProviderModelSliceTest
Change-Id: I2baf05362f5cd0a8ce94c7b3b2b112a7e9fe6894
2021-06-12 00:53:52 +00:00
Jason Chang
1c310ef44b
Remove redundant swipe down notification and one handed sub settings
...
1. Remove "Swipe down for notification" item code.
2. Remove "Exit when switching apps & "Timeout" items code.
Bug: 175851783
Test: build & verify Settings > System > Gestures
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedEnablePreferenceControllerTest"
Change-Id: I77be5ff5542f6310fa0b9649ddfc1d3c16fa4261
2021-06-11 03:30:10 +08:00
Jack Yu
9deb600326
Add a developer option to increase nfc stack log level
...
Easier to increase nfc stack log level.
Bug: 187083201
Test: enable/disable from developer option and check nfc log
Change-Id: I0675cbd535a2faf3b77b2842b03b7fb3b1b782fa
2021-06-11 00:37:14 +08:00
Weng Su
908d4ffadf
Revert "[Provider Model] Replace WiFi panel to Internet panel"
...
This reverts commit c33f69673a
.
Reason for revert: Because Wi-Fi toggle design is rollback, resume the Wi-Fi panel as well.
Bug: 190563749
Merged-In: Ia214ff9abaa7f4f33c485ca9aa72f73749ce7fc3
Change-Id: Ia214ff9abaa7f4f33c485ca9aa72f73749ce7fc3
(cherry picked from commit 368852424c
)
2021-06-10 12:23:38 +00:00
Tom Hsu
b52f7484be
Merge "[Settings] Disable gear button if user is not admin." into sc-dev am: a2a570f60b
am: 979e486314
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819346
Change-Id: I65fe0a09a754637ece40a57eacc8b1c05741bf19
2021-06-10 04:29:08 +00:00
Tom Hsu
a2a570f60b
Merge "[Settings] Disable gear button if user is not admin." into sc-dev
2021-06-10 04:00:12 +00:00
Weng Su
1b11a28709
Merge "Revert "[Provider Model] Replace WiFi panel to Internet panel""
2021-06-10 03:17:01 +00:00
Weng Su
368852424c
Revert "[Provider Model] Replace WiFi panel to Internet panel"
...
This reverts commit c33f69673a
.
Reason for revert: Because Wi-Fi toggle design is rollback, resume the Wi-Fi panel as well.
Bug: 190563749
Change-Id: Ia214ff9abaa7f4f33c485ca9aa72f73749ce7fc3
2021-06-09 17:49:27 +00:00
Weng Su
e3d6d635bd
Merge "[Provider Model] Fix the panel non responsive issue" into sc-dev am: 635e57bd4e
am: c390be0a48
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14891919
Change-Id: I71c205542f369b7870dcfce4c7b6960cdb8d7a13
2021-06-09 10:47:34 +00:00
Weng Su
635e57bd4e
Merge "[Provider Model] Fix the panel non responsive issue" into sc-dev
2021-06-09 10:05:51 +00:00
Weng Su
8c29ff0a27
[Provider Model] Fix the panel non responsive issue
...
Bug: 187340277
Test: manual test
atest -c ProviderModelSliceTest
Change-Id: Ie27a5049b2cab05b7c7936395d0db85c3c594d96
2021-06-09 00:35:53 +08:00
YUKAI HUNG
b7f3344b58
Merge "Remove BatteryTipPolicyTest first to avoid blocking presubmit" into sc-dev am: f7b90c3a7f
am: 85d03642f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880237
Change-Id: I6029a1829a27d1da0f43c2eb3af74802ae385c6c
2021-06-08 14:10:41 +00:00
ykhung
ae1797ec46
Remove BatteryTipPolicyTest first to avoid blocking presubmit
...
Bug: 190150515
Test: make SettingsGoogleRoboTests
Change-Id: If97e0853d7904919f54f4c4b970380f6fb40efc6
2021-06-08 19:04:55 +08:00
Giuliano Procida
7362a2b843
Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev am: ef0e09f7a3
am: d26cb5c9a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880698
Change-Id: Id629bec6759ee8611f842d7ee7c840fe077a298e
2021-06-08 10:04:28 +00:00
Giuliano Procida
ef0e09f7a3
Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev
2021-06-08 09:55:58 +00:00
Edgar Wang
cdff5c6ceb
Revert "Apply SettingsLib SeekBarPreference to Settings"
...
Revert submission 13422386-seekbar-sc-dev
Reason for revert: build broken in SettingsGoogle
Reverted Changes:
I0c2d0d5fb:Apply SettingsLib SeekBarPreference to SettingsGoo...
I1844bb3b0:Apply SettingsLib SeekBarPreference to a11y vibrat...
Ia3e4adec8:Apply SettingsLib SeekBarPreference to a11y vibrat...
Iadee57e9d:Apply SettingsLib SeekBarPreference to a11y vibrat...
I219878716:Apply SettingsLib SeekBarPreference to Settings
I959f5672c:Create SettingsLibSeekBarPreference
I92545a69c:Apply SettingsLib SeekBarPreference to a11y vibrat...
Change-Id: Ie6c3b0dc072e044796abdb33fca305f9f9d47c4d
Bug: 176818438
2021-06-08 09:47:51 +00:00
Edgar Wang
79f237ef42
Merge "Apply SettingsLib SeekBarPreference to Settings" into sc-dev am: 4aad4a88a7
am: 5863ab2406
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13422705
Change-Id: I1326a91377255abf12cc4a40e2268c8609ca7c90
2021-06-08 08:22:13 +00:00
Edgar Wang
4aad4a88a7
Merge "Apply SettingsLib SeekBarPreference to Settings" into sc-dev
2021-06-08 07:23:54 +00:00
tom hsu
f7811dfd09
[Settings] Disable gear button if user is not admin.
...
- Mobile settings include many settings which second user shall not
modify, so make gear button disabled to avoid second user want to try.
Bug: 184303943
Test: Maunal test passeded
Test: atest passed.
Change-Id: Ic04fa71772df4ac424965ad2ca95733b1e15d6a7
2021-06-08 15:03:00 +08:00
Edgar Wang
d6b5bbb5cb
Apply SettingsLib SeekBarPreference to Settings
...
Bug: 176818438
Test: robotest
Change-Id: I219878716457ce4bb7cad251bccf5d50d93030a5
2021-06-07 18:09:19 +00:00
Kevin Han
8fc4e9d496
Merge "Move unused apps count calculation to bg thread" into sc-dev am: 603cd6c44c
am: 71c447494a
am: 8e813a0fbc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795269
Change-Id: I42dedf8798bc6af57347c0d5f6ec672622a0ac80
2021-06-05 00:13:10 +00:00
Kevin Han
603cd6c44c
Merge "Move unused apps count calculation to bg thread" into sc-dev
2021-06-04 23:35:55 +00:00
Arc Wang
e9c5a06eff
Set storage volume spinner invsible when only 1 volume am: 1beae1bf91
am: 10e549ac37
am: e6f4c37dca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14831304
Change-Id: Iff52b0bf9c89821b190bed8f01f7281bd34ab947
2021-06-04 09:49:16 +00:00
Arc Wang
1beae1bf91
Set storage volume spinner invsible when only 1 volume
...
Bug: 189390166
Test: atest StorageSelectionPreferenceControllerTest
Change-Id: I93e5fbf50153580ec60c146959d21e61f556c18c
2021-06-04 07:25:30 +00:00
Kevin Han
8df22e7cd9
Move unused apps count calculation to bg thread
...
Move the somewhat expensive calculation of the "Unused apps" count to
the background thread
Initially, the "Unused apps" preference is unavailable. When the bg work
finishes and we see we have a non-zero number of unused apps, we display
the preference and update the summary text.
Bug: 187996287
Test: atest HibernatedAppsPreferenceControllerTest
Test: measure latency of displaying preferences w/ custom trace points
Change-Id: Idb0d836fd8f4bcdd2605a7d59703a7ed53bcd6d4
2021-06-03 19:14:25 -07:00
TreeHugger Robot
7233b95761
Merge "Further refactoring on ActionDisabledByAdminDialog classes." into sc-dev am: 9e1e5ddb72
am: 1744af0d97
am: 282050ce95
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14700128
Change-Id: Ic30fef16736f22437770a8365cf4d8c50ef39fdb
2021-06-01 21:06:04 +00:00
TreeHugger Robot
9e1e5ddb72
Merge "Further refactoring on ActionDisabledByAdminDialog classes." into sc-dev
2021-06-01 20:13:24 +00:00
Zoey Chen
511be24bbf
Merge "[ProviderModel] Use category to separate physical SIM and e-SIM" into sc-dev am: c968a80ff6
am: 67551e8dd2
am: fe8f6a1c99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732243
Change-Id: If6761df2973935dde4080c29899314bdbccc92d6
2021-06-01 03:21:17 +00:00