Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,038 Commits 1 Branch 0 Tags
6e5400a39bbb5dd5045cb9dee3ddd807ebe27478
Commit Graph

84038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
6e5400a39b Merge "[Provider Model] Show scanning sub-title once in the internet panel" into sc-dev am: 059b3fab8e am: 9d47792db0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980879

Change-Id: Icc34103b16345077cef323b4fdd14a749ffb4a56
 2021-06-16 09:09:35 +00:00
TreeHugger Robot
9d47792db0 Merge "[Provider Model] Show scanning sub-title once in the internet panel" into sc-dev am: 059b3fab8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980879

Change-Id: Idf4a96c0c47211b558546141c93c536f8a6398e1
 2021-06-16 08:54:32 +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
5b600efa65 Merge "Move testAlwaysRequireConsent to frameworks/base" into sc-dev am: 826df7ae78 am: a7d250d29b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984752

Change-Id: I019bfce5e71a50f3d296841e0b5697d38da69265
 2021-06-16 08:26:16 +00:00
Edgar Wang
313a8f3e63 Merge "Tweak SeekBarPreference to folow new Settings UX design" into sc-dev am: fce6e1772a am: a8136d8d43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980881

Change-Id: I25a6721bd1a1259811cde7f36e2d942490b228f8
 2021-06-16 08:26:07 +00:00
Kevin Chyn
c2b86c10d5 Merge "Move testAlwaysRequireConsent to frameworks/base" into sc-dev am: 826df7ae78 am: 663b21c48b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984752

Change-Id: I012aa570ae4fbdefc08588549adaead771dc3a4d
 2021-06-16 08:25:51 +00:00
Edgar Wang
dab9af73bf Merge "Tweak SeekBarPreference to folow new Settings UX design" into sc-dev am: fce6e1772a am: 221f0a023d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980881

Change-Id: Ibcc5da3d626a4b1209a741e3801bf0a9a4939b81
 2021-06-16 08:25:41 +00:00
Kevin Chyn
663b21c48b Merge "Move testAlwaysRequireConsent to frameworks/base" into sc-dev am: 826df7ae78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984752

Change-Id: I1838009dedd2ac3f6c4511379754816b5eaecddc
 2021-06-16 08:09:26 +00:00
Edgar Wang
221f0a023d Merge "Tweak SeekBarPreference to folow new Settings UX design" into sc-dev am: fce6e1772a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980881

Change-Id: I40d45fcba54a2975c2165b8e568a5475932fe340
 2021-06-16 08:09:18 +00:00
Kevin Chyn
a7d250d29b Merge "Move testAlwaysRequireConsent to frameworks/base" into sc-dev am: 826df7ae78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984752

Change-Id: I06c671aa0b468dac1893acf6754d9633360ed41a
 2021-06-16 08:08:16 +00:00
Edgar Wang
a8136d8d43 Merge "Tweak SeekBarPreference to folow new Settings UX design" into sc-dev am: fce6e1772a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980881

Change-Id: Idbbe5d2b13af8003fa54494ba3e4fe9e875658f0
 2021-06-16 08:07:54 +00:00
Kevin Chyn
826df7ae78 Merge "Move testAlwaysRequireConsent to frameworks/base" into sc-dev 2021-06-16 07:55:01 +00:00
Edgar Wang
fce6e1772a Merge "Tweak SeekBarPreference to folow new Settings UX design" into sc-dev 2021-06-16 07:54:47 +00:00
Automerger Merge Worker
333ed02859 Merge "Merge "Update to use ParentalControlsUtilsInternal for common logic" into sc-dev am: 44a0ddaa4c am: 17c78b63e0" into sc-v2-dev-plus-aosp 2021-06-16 06:46:48 +00:00
Kevin Chyn
eaa04db965 Merge "Update to use ParentalControlsUtilsInternal for common logic" into sc-dev am: 44a0ddaa4c am: 17c78b63e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972617

Change-Id: I94d43b8a33fb094b230933670d1395adebd2e8a2
 2021-06-16 06:46:37 +00:00
Kevin Chyn
65a73cc262 Merge "Update to use ParentalControlsUtilsInternal for common logic" into sc-dev am: 44a0ddaa4c am: 280958df64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972617

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

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

Change-Id: I696220ca9c471713a2a2bec4e205d2e782d616e6
 2021-06-16 06:46:18 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
a1dd2d6483 Merge "Integrate One handed mode shortcut preference" into sc-dev am: bfe1d39958 am: 3fd1df4e04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934755

Change-Id: I7ffe099c59923a6f26a1c5214ddc92414b4f1d2b
 2021-06-15 15:31:32 +00:00
TreeHugger Robot
d017b2031a [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 skip reason: subject contains skip directive

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

Change-Id: Iad1375504a4ab00c96b8f512ad1e03d155a171f0
 2021-06-15 15:31:28 +00:00
Bill Yi
7e156a74bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf3c5c098 -s ours am: cb28fd1d30 -s ours am: 9d3a9178ff -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: Ic8c2432093175f9dc2170aeb8b18bee75eb2bdd1
 2021-06-15 15:31:24 +00:00
TreeHugger Robot
d15259021a [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: I215da74523dde305bba0f106ff222c61353d39f9
 2021-06-15 15:31:06 +00:00
TreeHugger Robot
1baebdb976 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c2989e3d1c -s ours am: 8b70eba471 -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: I9a55b97c4d72e74cf82b3cb1df2d962ee7ebd2c1
 2021-06-15 15:31:05 +00:00