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
|
fce6e1772a
|
Merge "Tweak SeekBarPreference to folow new Settings UX design" into sc-dev
|
2021-06-16 07:54:47 +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
|
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 |
|
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
|
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
|
19baf0df84
|
Merge "Update multi biometric flow for SUW" into sc-dev
|
2021-06-16 00:07:16 +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 |
|
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
|
d22c1aaaeb
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 33ddf7c74d -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: I7e6506656caa7aa169958a446318a53ebab58ff0
|
2021-06-15 15:30:43 +00:00 |
|
Bill Yi
|
c42235e677
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b8fbafa3 -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: I4fbcf1ae14ce66253ed94265bcb3dbb32c9cdc92
|
2021-06-15 15:30:28 +00:00 |
|
TreeHugger Robot
|
f499ee9d0c
|
Merge "Integrate One handed mode shortcut preference" into sc-dev am: bfe1d39958
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934755
Change-Id: I38a3b51522cd0d5d2d26559c5ea7dde930ccd4ed
|
2021-06-15 15:29:58 +00:00 |
|
TreeHugger Robot
|
bfe1d39958
|
Merge "Integrate One handed mode shortcut preference" into sc-dev
|
2021-06-15 15:25:13 +00:00 |
|
TreeHugger Robot
|
8328eff4dd
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
|
2021-06-15 15:18:05 +00:00 |
|
TreeHugger Robot
|
e438ee94a1
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 51f4ffc818 -s ours am: 575e06dbb1 -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: I021f7e67cc85b52f108146e5a01282983c9204ba
|
2021-06-15 15:16:43 +00:00 |
|
TreeHugger Robot
|
4a60392fe6
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
|
2021-06-15 15:15:14 +00:00 |
|
TreeHugger Robot
|
33ddf7c74d
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
|
2021-06-15 15:14:44 +00:00 |
|
TreeHugger Robot
|
575e06dbb1
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 51f4ffc818 -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: I39c51016f6aa5fd5f6133bf3ef730c68faa39755
|
2021-06-15 15:13:28 +00:00 |
|
Bill Yi
|
aa175423f6
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf3c5c098 -s ours am: cb28fd1d30 -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: I5d736fa841ac0ceac2511564a5eb1731fa6d2380
|
2021-06-15 15:13:01 +00:00 |
|
TreeHugger Robot
|
d99ea16f1f
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c2989e3d1c -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: I887130ef39d637d70471d18562c506f1a87663bc
|
2021-06-15 15:12:49 +00:00 |
|
TreeHugger Robot
|
c1a7c656d7
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 59205fce57 -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: I3fa36283732c14f8863e22d9086b685d9ec33f55
|
2021-06-15 15:12:34 +00:00 |
|
Bill Yi
|
cb28fd1d30
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf3c5c098 -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: If2412a5d6b1ec925ca9b9e8404b75110519b9809
|
2021-06-15 15:12:33 +00:00 |
|
TreeHugger Robot
|
51f4ffc818
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
|
2021-06-15 15:02:11 +00:00 |
|
TreeHugger Robot
|
c2989e3d1c
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
|
2021-06-15 14:57:42 +00:00 |
|
TreeHugger Robot
|
59205fce57
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
|
2021-06-15 14:56:52 +00:00 |
|
Zimuzo Ezeozue
|
fdfebb9ff9
|
Merge "Turn off transcoding notification by default" into sc-dev am: 653e7c91c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964377
Change-Id: I88a6a60d78ee4e0b5fc37cdbb73c4b70f082466b
|
2021-06-15 13:59:20 +00:00 |
|
Bill Yi
|
af994f1ee2
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie1f5759a3bb75dc44970be04baff77093925ef39
|
2021-06-15 13:50:46 +00:00 |
|
Zimuzo Ezeozue
|
653e7c91c8
|
Merge "Turn off transcoding notification by default" into sc-dev
|
2021-06-15 13:49:19 +00:00 |
|
Bill Yi
|
94ab13af15
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8ed8b655dd1025abc355482a2b85489c47f8cb6e
|
2021-06-15 13:41:45 +00:00 |
|
Bill Yi
|
acf3c5c098
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibdaa7a59ef596ef9bbcd939ba148b62c972100c4
|
2021-06-15 13:37:16 +00:00 |
|
Bill Yi
|
532ae047f0
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia1ba0b60387c6aa399159adb1d5f0f5dc2bb9f79
|
2021-06-15 13:33:58 +00:00 |
|
Bill Yi
|
249bbe6eb2
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I73596799727795b1b40049069e52ee2980ffd937
|
2021-06-15 13:29:45 +00:00 |
|
Bill Yi
|
e2b8fbafa3
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I38b2b159f3e0003a8ad9702a5b24c88cf8b5d7cc
|
2021-06-15 13:25:35 +00:00 |
|
Bill Yi
|
e9ab5389ac
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie1af168b28b1e86dfb6a741a8ef269dfb4011691
|
2021-06-15 13:22:05 +00:00 |
|
Bill Yi
|
a333febed9
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic1ba09681a73f7f35074acdfcd16e282b4100f8d
|
2021-06-15 13:20:30 +00:00 |
|
Menghan Li
|
b75edfa43d
|
Merge "Add strings for use accessibility gesture" into sc-dev am: 92aaef1dac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934763
Change-Id: Id84c3120ee7e2155df932246f997415143c4b69e
|
2021-06-15 12:49:27 +00:00 |
|
TreeHugger Robot
|
91d1b6640a
|
Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev am: ab04f86066
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964828
Change-Id: Ic475adfb73db01568b37e557b6ba7b418de694fe
|
2021-06-15 12:49:15 +00:00 |
|
Menghan Li
|
92aaef1dac
|
Merge "Add strings for use accessibility gesture" into sc-dev
|
2021-06-15 12:43:16 +00:00 |
|
TreeHugger Robot
|
ab04f86066
|
Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev
|
2021-06-15 12:36:38 +00:00 |
|
Syaoran Kuo
|
294c9201ea
|
Merge "Fix resource id not match issue." into sc-dev am: 66eaa371ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880643
Change-Id: I3108b14e2d0433fcd365487dca02d9819d27aab7
|
2021-06-15 11:36:07 +00:00 |
|
Syaoran Kuo
|
66eaa371ff
|
Merge "Fix resource id not match issue." into sc-dev
|
2021-06-15 10:48:58 +00:00 |
|
Peter Wang
|
655375feff
|
Merge "Use BC theme for ChooseSimActivity" into sc-dev am: 03d2f8d749
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942792
Change-Id: Ia0bf224ad24c0d8a4913f3bc80eeec7cbf499f1d
|
2021-06-15 10:18:26 +00:00 |
|
Peter Wang
|
03d2f8d749
|
Merge "Use BC theme for ChooseSimActivity" into sc-dev
|
2021-06-15 10:02:34 +00:00 |
|
Peter Wang
|
d368e85c2e
|
Use translated name ("SIM") for default profile display name ("CARD")
Bug: 186156909
Test: Local
Change-Id: Icb8e5e7afb64d28e1ff7567882288fb1621dbe9a
|
2021-06-15 02:59:21 -07:00 |
|