PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,221 Commits 1 Branch 0 Tags
3e85d80578ffaa89a96ae3f74edc612b4dd78ea5
Commit Graph

89221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Chyn
280958df64 Merge "Update to use ParentalControlsUtilsInternal for common logic" into sc-dev am: 44a0ddaa4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972617

Change-Id: Id4f76650ab5ae8f906eb9cba64e465c65ec57cf4
 2021-06-16 06:34:12 +00:00
Kevin Chyn
17c78b63e0 Merge "Update to use ParentalControlsUtilsInternal for common logic" into sc-dev am: 44a0ddaa4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972617

Change-Id: I5ca66b5d001708cbd9b28a125c383fe2fb6f4de1
 2021-06-16 06:33:50 +00:00
Kevin Chyn
928f3a28dc Merge "Convert biometrics to RestrictedPreference" into sc-dev am: 24b81dcffb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14926710

Change-Id: I3924b671dbe1336e39fd153b5b809a2e3b7e3669
 2021-06-16 06:33:49 +00:00
Kevin Chyn
55fec6e32e Merge "Update to use ParentalControlsUtilsInternal for common logic" into sc-dev am: 44a0ddaa4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972617

Change-Id: Ife10fc8ec4813deb4e36c8ef404c9ef5106de7b9
 2021-06-16 06:33:09 +00:00
Kevin Chyn
70fabc4900 Merge "Convert biometrics to RestrictedPreference" into sc-dev am: 24b81dcffb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14926710

Change-Id: I4e7bbaea57094840b1ae0b0a1184bcb759a913f5
 2021-06-16 06:33:07 +00:00
Kevin Chyn
0f6dac59c2 Merge "Convert biometrics to RestrictedPreference" into sc-dev am: 24b81dcffb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14926710

Change-Id: I2f24f3bd62f5a369c18ef12a721a36b28d3be4bb
 2021-06-16 06:32:50 +00:00
Kevin Chyn
44a0ddaa4c Merge "Update to use ParentalControlsUtilsInternal for common logic" into sc-dev 2021-06-16 06:13:17 +00:00
Kevin Chyn
24b81dcffb Merge "Convert biometrics to RestrictedPreference" into sc-dev 2021-06-16 06:13:04 +00:00
Sunny Shao
794a894aa7 Fix testGetDeviceOwnerDisclosure test case fail 
- Remove the learn more part which already include in the FooterPreference.

Fixes: 190889944
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.enterprise.EnterprisePrivacyFeatureProviderImplTest
Change-Id: Ia6b7962019a3ec30b72ca6d64159811ab98fc13b
 2021-06-16 13:40:55 +08:00
Kevin Chyn
35aa93d8d2 Pass context and enforcedAdmin to onClickListener 
These are apparently not available / not initialized in the
constructor. So, let's just pass it in from known entry points.

Bug: 188847063
Test: Builds
Change-Id: I5467f341ccf017ddfb31ef9fc4ef1756ebb65939
 2021-06-15 20:57:30 -07: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
Sunny Shao
9fa4bb8ffa Fix the toggle button flicker problem when display 
- Root cause: the side effect of the parallel controller loading.
- Solution: disable the parallel approach and remove the entry point
  of parallel approach in DashboardFragment.

Fixes: 187838753
Test: Robo test for AppInfoDashboardFragment, ConfigureNotificationSettings,
      ConnectedDeviceDashboardFragment, DevelopmentSettingsDashboardFragment,
      NetworkDashboardFragment, DashboardFragment
Change-Id: If3b09c4fd6f33042e0ed38704f08e855ab8f5377
 2021-06-16 11:41:10 +08:00
TreeHugger Robot
2d7d0f535c Merge "Add OWNERS file for TARE robotests." 2021-06-16 03:20:42 +00:00
Kevin Chyn
fc19953d28 Add biometric strings to DeviceAdminStringProviderImpl 
Bug: 190067596
Test: manual
Change-Id: I3a8f94fd6b2730164dff263f068543abd8d4d18b
 2021-06-15 19:58:53 -07:00
Kevin Chyn
add8de49e9 Move testAlwaysRequireConsent to frameworks/base 
Bug: 188847063
Test: atest ParentalControlsUtilsTest
Change-Id: I1c374b0e0e051a2e911d4586f7f2f9928c9de260
 2021-06-15 19:58:47 -07:00
Kevin Chyn
ee3ca1506a Update to use ParentalControlsUtilsInternal for common logic 
Bug: 188847063
Test: atest ParentalControlsUtilsTest
Change-Id: I14ba3683f846ad7ff6e9f2eb5013d9033556e706
 2021-06-15 19:58:41 -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
Joshua Mccloskey
569f043f20 Merge "Update multi biometric flow for SUW" into sc-dev am: 19baf0df84 am: c5b5317ef2 am: cf0bcde113 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972625

Change-Id: I70ce1860cf302305c297a73e6903f0adc9188995
 2021-06-16 00:59:15 +00:00
Joshua Mccloskey
c908a54c4e Merge "Update multi biometric flow for SUW" into sc-dev am: 19baf0df84 am: 5214307f79 am: e9649e3d09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972625

Change-Id: I2676ba0432dd01884b693b23180e1e983d2b9bf9
 2021-06-16 00:59:00 +00:00
Joshua Mccloskey
cf0bcde113 Merge "Update multi biometric flow for SUW" into sc-dev am: 19baf0df84 am: c5b5317ef2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972625

Change-Id: I9117a171d4322c43f7fa543e092c76c0d1a64468
 2021-06-16 00:34:40 +00:00
Joshua Mccloskey
e9649e3d09 Merge "Update multi biometric flow for SUW" into sc-dev am: 19baf0df84 am: 5214307f79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972625

Change-Id: I8db3d12ed220e7f3913c10e70ddd8421b6b7fa87
 2021-06-16 00:34:21 +00:00
Joshua Mccloskey
79294dfb70 Merge "Update multi biometric flow for SUW" into sc-dev am: 19baf0df84 am: 8f06c94891 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972625

Change-Id: I7f8dd822cef340cd7d9b4376956ae2a90965b03b
 2021-06-16 00:33:53 +00:00
Peter Wang
7210f1138a Merge "Use translated name ("SIM") for default profile display name ("CARD")" into sc-dev am: faac8d0f4b am: 6fb591f769 am: 4d7d0bf049 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14947994

Change-Id: I67bb74703a5260f78b7e991a30a4146cd8a048f1
 2021-06-16 00:24:32 +00:00
Peter Wang
400ad9e31b Merge "Use translated name ("SIM") for default profile display name ("CARD")" into sc-dev am: faac8d0f4b am: a9d081fb66 am: 999e19ee8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14947994

Change-Id: I0f6668d468286c311cd11738f787b503183d836b
 2021-06-16 00:24:11 +00:00
Joshua Mccloskey
5214307f79 Merge "Update multi biometric flow for SUW" into sc-dev am: 19baf0df84 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972625

Change-Id: I2ef317f99c2f27223b31646ba74129426e32f253
 2021-06-16 00:19:49 +00:00
Joshua Mccloskey
8f06c94891 Merge "Update multi biometric flow for SUW" into sc-dev am: 19baf0df84 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972625

Change-Id: Ie397576862690543e8a086b0d31ce2b515a24988
 2021-06-16 00:19:06 +00:00
Joshua Mccloskey
c5b5317ef2 Merge "Update multi biometric flow for SUW" into sc-dev am: 19baf0df84 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972625

Change-Id: I4e54f9189a9e47dc043ded6fbae1ce1e0656d9a3
 2021-06-16 00:18:57 +00:00
Peter Wang
4d7d0bf049 Merge "Use translated name ("SIM") for default profile display name ("CARD")" into sc-dev am: faac8d0f4b am: 6fb591f769 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14947994

Change-Id: Id07ebce31feb4eb63872bdb6e338ba4eb209369e
 2021-06-16 00:09:57 +00:00
Peter Wang
999e19ee8e Merge "Use translated name ("SIM") for default profile display name ("CARD")" into sc-dev am: faac8d0f4b am: a9d081fb66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14947994

Change-Id: I9c22393c0faf6df8fab96d635cf3ece396974dc9
 2021-06-16 00:09:29 +00:00
Peter Wang
3a942538d2 Merge "Use translated name ("SIM") for default profile display name ("CARD")" into sc-dev am: faac8d0f4b am: a9e0a0d2c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14947994

Change-Id: Icdd781c5e4f5ea3db4e54e07980511e0e6bf55e9
 2021-06-16 00:09:22 +00:00
Joshua Mccloskey
19baf0df84 Merge "Update multi biometric flow for SUW" into sc-dev 2021-06-16 00:07:16 +00:00
Peter Wang
a9d081fb66 Merge "Use translated name ("SIM") for default profile display name ("CARD")" into sc-dev am: faac8d0f4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14947994

Change-Id: Ic5c1d44105acd3f77cbcb0e0666440b184f97ba9
 2021-06-15 23:56:05 +00:00
Peter Wang
6fb591f769 Merge "Use translated name ("SIM") for default profile display name ("CARD")" into sc-dev am: faac8d0f4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14947994

Change-Id: I340b7f256b0df90d50a90320fd5628968332bd6e
 2021-06-15 23:55:21 +00:00
Peter Wang
a9e0a0d2c9 Merge "Use translated name ("SIM") for default profile display name ("CARD")" into sc-dev am: faac8d0f4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14947994

Change-Id: I417868c232c53c08e45b80ff01de012259d7a09a
 2021-06-15 23:54:11 +00:00
Peter Wang
faac8d0f4b Merge "Use translated name ("SIM") for default profile display name ("CARD")" into sc-dev 2021-06-15 23:42:24 +00:00
Edgar Wang
1e3c0115a5 Tweak SeekBarPreference to folow new Settings UX design 
Bug: 186068091
Test: visual verify
Change-Id: I2cd7f57a75f8512080e9b5e891c27db6297b0729
 2021-06-16 03:47:36 +08:00
Kweku Adams
0c451aab4d Add OWNERS file for TARE robotests. 
Bug: 189850067
Test: N/A
Change-Id: Idf19cbc56c7c797f53e35faedab1c9ebde66f490
 2021-06-15 11:32:55 -07:00
TreeHugger Robot
ef5bbc682c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 33ddf7c74d -s ours am: d22c1aaaeb -s ours am: d15259021a -s ours am: e2a9ccb1bd -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14974729

Change-Id: I806d53712e09f99838a93d82c3bc07e8bcadc665
 2021-06-15 15:55:57 +00:00
Bill Yi
81577538e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b8fbafa3 -s ours am: c42235e677 -s ours am: cd62dd50ca -s ours am: 7b2eb38321 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981152

Change-Id: I847f722b7f3504d86eab853998a8c28fa0ae83a8
 2021-06-15 15:55:45 +00:00
TreeHugger Robot
e2a9ccb1bd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 33ddf7c74d -s ours am: d22c1aaaeb -s ours am: d15259021a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14974729

Change-Id: I4fc3cb4426e6c761baa69944e86a661ac13fbc27
 2021-06-15 15:52:08 +00:00
Bill Yi
7b2eb38321 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b8fbafa3 -s ours am: c42235e677 -s ours am: cd62dd50ca -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981152

Change-Id: I8d1c99ea0caa38a6a45cd1401ef84fd40dc9560d
 2021-06-15 15:52:03 +00:00
TreeHugger Robot
199892790e Merge "Integrate One handed mode shortcut preference" into sc-dev am: bfe1d39958 am: 2ab7842fd3 am: a44653afd5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934755

Change-Id: I51473a9095f6815710f34e567b41be5679616566
 2021-06-15 15:51:52 +00:00
TreeHugger Robot
a44653afd5 Merge "Integrate One handed mode shortcut preference" into sc-dev am: bfe1d39958 am: 2ab7842fd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934755

Change-Id: Icf6d5acfcec494f060ba8c5e8b97be367bf40c1c
 2021-06-15 15:51:39 +00:00
TreeHugger Robot
385bd0d343 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 33ddf7c74d -s ours am: d22c1aaaeb -s ours am: 8d694a6948 -s ours am: 5af65de4c4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14974729

Change-Id: Ic8af91b562950b5ef784dd607deff13fdf5efb17
 2021-06-15 15:51:39 +00:00
Bill Yi
07b5e0a585 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b8fbafa3 -s ours am: c42235e677 -s ours am: 4ca76e5213 -s ours am: dded88366d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981152

Change-Id: I0733ab9392a7031929281bef2a58fd649f9d00c6
 2021-06-15 15:51:26 +00:00
TreeHugger Robot
5af65de4c4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 33ddf7c74d -s ours am: d22c1aaaeb -s ours am: 8d694a6948 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14974729

Change-Id: I5eb038b0a2dba25dbac0b12952b566903bfc9ed1
 2021-06-15 15:43:35 +00:00
Bill Yi
dded88366d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b8fbafa3 -s ours am: c42235e677 -s ours am: 4ca76e5213 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981152

Change-Id: I64e1a997b40be1bc1643f638477f357d116493d9
 2021-06-15 15:43:25 +00:00
TreeHugger Robot
96afc3f795 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 33ddf7c74d -s ours am: d22c1aaaeb -s ours am: 11c290af4c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14974729

Change-Id: I224a79e5c22abaca214624d46d545d0abff6368c
 2021-06-15 15:43:09 +00:00
Bill Yi
8f5a38a42e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b8fbafa3 -s ours am: c42235e677 -s ours am: e4dec43c81 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981152

Change-Id: I761996ba39e691c17fd698877afc143bd81349b1
 2021-06-15 15:42:41 +00:00
TreeHugger Robot
718bc4a9e3 Merge "Integrate One handed mode shortcut preference" into sc-dev am: bfe1d39958 am: 3fd1df4e04 am: a1dd2d6483 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934755

Change-Id: I40e166c48a5ec1b1f4dff60d6b831e1169d2e098
 2021-06-15 15:35:27 +00:00