TreeHugger Robot
179a97663d
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: I23d20a3052c72bc4e804c2e0482df9405923732d
2021-06-16 08:53:43 +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
97bcdb184c
Merge "Move testAlwaysRequireConsent to frameworks/base" into sc-dev am: 826df7ae78
am: a7d250d29b
am: 5b600efa65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984752
Change-Id: I4cce7da05e46f07a0ef6f2709ca5779f187a0436
2021-06-16 08:26:57 +00:00
Edgar Wang
e753caed64
Merge "Tweak SeekBarPreference to folow new Settings UX design" into sc-dev am: fce6e1772a
am: a8136d8d43
am: 313a8f3e63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980881
Change-Id: Ic550d220c2a42899eaf9e44b1162eba7855f2e4f
2021-06-16 08:26:48 +00:00
Kevin Chyn
fb04f0dada
Merge "Move testAlwaysRequireConsent to frameworks/base" into sc-dev am: 826df7ae78
am: 663b21c48b
am: c2b86c10d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984752
Change-Id: Id8d2dfb217b005ac5693822300b1a23d69c25b9a
2021-06-16 08:26:28 +00:00
Edgar Wang
081a294559
Merge "Tweak SeekBarPreference to folow new Settings UX design" into sc-dev am: fce6e1772a
am: 221f0a023d
am: dab9af73bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980881
Change-Id: Ic060a982b0747e10aaf40d7c9ce16c3724f814b5
2021-06-16 08:26:20 +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
Bill Lin
5b702c70a2
Add One-handed mode entry point in a11y system controls
...
Integrate One-handed mode entry in AOSP Settings.
(Settings > A11y > System controls > One-handed mode)
The entry will show if vendor set below system property
* Property : ro.support_one_handed_mode
Otherwise, the entry will be hidden.
Test: manual check Settings UI
Settings > A11y > System controls > One-handed mode
Bug: 182144396
Change-Id: I699c576a87057274529ca46dee394c413a4cea2b
2021-06-16 16:18:58 +08:00
Kevin Chyn
c211d18e1b
Merge "Move testAlwaysRequireConsent to frameworks/base" into sc-dev am: 826df7ae78
am: aa2b29b5ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984752
Change-Id: I5b08be21aa233dcdb501075fd5527722b04bf538
2021-06-16 08:10:25 +00:00
Edgar Wang
70aa5739d4
Merge "Tweak SeekBarPreference to folow new Settings UX design" into sc-dev am: fce6e1772a
am: 618deb0691
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980881
Change-Id: I7405fe05ddf77999218e3de74225c73b8102acd4
2021-06-16 08:10:14 +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
aa2b29b5ba
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: I270cde62b70089dbd3da82a736ccc681eba436f5
2021-06-16 08:08:35 +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
618deb0691
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: I78154ac9c754b782a2657810036684d8d5c3405e
2021-06-16 08:07:56 +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
6f85f1e4aa
Merge "Merge "Update to use ParentalControlsUtilsInternal for common logic" into sc-dev am: 44a0ddaa4c
am: 17c78b63e0" into sc-v2-dev-plus-aosp am: 333ed02859
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972617
Change-Id: I984968702627c834d71b798230e95aacd0ca9353
2021-06-16 07:01:04 +00:00
Kevin Chyn
e508269647
Merge "Update to use ParentalControlsUtilsInternal for common logic" into sc-dev am: 44a0ddaa4c
am: 280958df64
am: 65a73cc262
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972617
Change-Id: Iffa2cf3b87c82846ec0238afb3bc8a75c75e2da2
2021-06-16 07:00:05 +00:00
Kevin Chyn
a46a2583e9
Merge "Convert biometrics to RestrictedPreference" into sc-dev am: 24b81dcffb
am: 70fabc4900
am: e0bf2693d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14926710
Change-Id: Ic2d8dd1d505413f70424ec70c675fc2baa68e425
2021-06-16 06:59:52 +00:00
Kevin Chyn
f5394d1158
Merge "Convert biometrics to RestrictedPreference" into sc-dev am: 24b81dcffb
am: 928f3a28dc
am: 9047c5baac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14926710
Change-Id: Icbd9f0a3c196db1119bf5735943ffb3a2e5d2d45
2021-06-16 06:59:00 +00:00
Kevin Chyn
8903432b39
Merge "Update to use ParentalControlsUtilsInternal for common logic" into sc-dev am: 44a0ddaa4c
am: 55fec6e32e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972617
Change-Id: Ia4b774b754d78f6595778c130129ff6c0e57c6bd
2021-06-16 06:47:11 +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
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
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
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
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