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 |
|
TreeHugger Robot
|
2d7d0f535c
|
Merge "Add OWNERS file for TARE robotests."
|
2021-06-16 03:20:42 +00: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 |
|
TreeHugger Robot
|
4089ad990f
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 51f4ffc818 -s ours am: 575e06dbb1 -s ours am: bf67fa399d -s ours am: d017b2031a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981155
Change-Id: Ia3056da9ad77a4de1261b9b1d65795faa4aaf967
|
2021-06-15 15:35:21 +00:00 |
|
Bill Yi
|
ce9c38e43c
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf3c5c098 -s ours am: cb28fd1d30 -s ours am: 9d3a9178ff -s ours am: 7e156a74bd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981156
Change-Id: I4b726aab526d8116db2ce1c0173e6663635c72bb
|
2021-06-15 15:35:15 +00:00 |
|
TreeHugger Robot
|
f91c018bc3
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c2989e3d1c -s ours am: 8b70eba471 -s ours am: 1baebdb976 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981161
Change-Id: I34f415a9407ca9c7fe43f796a8b0973c70f1d080
|
2021-06-15 15:35:10 +00:00 |
|
TreeHugger Robot
|
56994a75f9
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 59205fce57 -s ours am: bff71db6fb -s ours am: a5bffcc5b2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981158
Change-Id: Iaf80c3d1e9036a89cb93fab0c07d95eb14b06665
|
2021-06-15 15:35:04 +00:00 |
|
TreeHugger Robot
|
41c635e298
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 51f4ffc818 -s ours am: 575e06dbb1 -s ours am: 82906da38d -s ours am: d50cb3f9df -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981155
Change-Id: I5de4d1bfeb1460628f21cae625df61edfbd8caf5
|
2021-06-15 15:34:57 +00:00 |
|
Bill Yi
|
09b9aae8d4
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf3c5c098 -s ours am: cb28fd1d30 -s ours am: b536f17a93 -s ours am: 45403527b9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981156
Change-Id: I5b5de576de2ad362cba36f5014c7c10193640baf
|
2021-06-15 15:34:51 +00:00 |
|
TreeHugger Robot
|
11c290af4c
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 33ddf7c74d -s ours am: d22c1aaaeb -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: I9e425e2857f457b81e73ba4d156a24075a81b231
|
2021-06-15 15:34:26 +00:00 |
|
Bill Yi
|
e4dec43c81
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b8fbafa3 -s ours am: c42235e677 -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: I43f46e1bb2535fa9a250d9bade806fefec8de2b9
|
2021-06-15 15:34:23 +00:00 |
|
TreeHugger Robot
|
8d694a6948
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 33ddf7c74d -s ours am: d22c1aaaeb -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: I0c0594d5b037d35c13634bb6be695f5e1a108cda
|
2021-06-15 15:34:21 +00:00 |
|
Bill Yi
|
4ca76e5213
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b8fbafa3 -s ours am: c42235e677 -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: I5fe840eb53eb3da644934c71e7ecca433f6c841a
|
2021-06-15 15:34:18 +00:00 |
|
TreeHugger Robot
|
bd39d782b2
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c2989e3d1c -s ours am: 27f38d3b75 -s ours am: 61ad461a0a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14981161
Change-Id: I7535d3ffa78ab2cc41ab89701824f1d2b48013eb
|
2021-06-15 15:33:56 +00:00 |
|