Bill Yi
472cfd26b7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 700eca8b5f
-s ours am: d7726af0d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295545
Change-Id: I7dbd5ab0244c08c7fc48f961303aa2fac0eb84b1
2021-04-23 17:27:10 +00:00
Bill Yi
d7726af0d1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 700eca8b5f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295545
Change-Id: I3092aed10393846f2becc03c781ad2ad48102142
2021-04-23 17:07:07 +00:00
TreeHugger Robot
dcfbd36abd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f92d565f22
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295608
Change-Id: Ia330a01ba3b646c0d8350eb82de0b76753e0a78e
2021-04-23 16:55:15 +00:00
TreeHugger Robot
dbeb8728c8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 45a5592fd7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295606
Change-Id: I22dc20b37955b13799ab5ade7189e89a42dadab0
2021-04-23 16:54:44 +00:00
TreeHugger Robot
291385e776
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-04-23 16:46:41 +00:00
TreeHugger Robot
3358ed3ca0
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-04-23 16:42:38 +00:00
TreeHugger Robot
f92d565f22
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-23 16:41:57 +00:00
TreeHugger Robot
45a5592fd7
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-23 16:35:48 +00:00
Julia Reynolds
c21bb5c3b6
Merge "Add enterprise popup to notif lockscreen settings" into sc-dev am: 16861ac068
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14284498
Change-Id: I6c4aac46dd8d2ef4600b8dc43a0bd8d7f3278f94
2021-04-23 15:03:11 +00:00
Julia Reynolds
16861ac068
Merge "Add enterprise popup to notif lockscreen settings" into sc-dev
2021-04-23 14:46:19 +00:00
TreeHugger Robot
9b43bd93d8
Merge "Use new api to get bluetooth device icon" into sc-dev am: 3bcd6bade2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14250087
Change-Id: I32dacad80f43ef6b68b88a27c2771de3123c2a75
2021-04-23 12:02:14 +00:00
TreeHugger Robot
3bcd6bade2
Merge "Use new api to get bluetooth device icon" into sc-dev
2021-04-23 11:59:04 +00:00
Almaz Mingaleev
06ef7696fb
Do not show toggle for location tz detection in search. am: 6be940f396
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14293706
Change-Id: Id4009c438479632b1e05f01d8da42a6e9888e920
2021-04-23 11:52:01 +00:00
Bill Yi
57e1df0472
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I29641778b72b6cf79af347767d69495bea56e07c
2021-04-23 11:42:52 +00:00
Bill Yi
ee5b17c8a1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I380ead0cca8c7c3204019cb27c34f2033e8aec97
2021-04-23 11:39:04 +00:00
Bill Yi
87c38148d1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I055bcbb06e11c7241ed3cac9d80f332fd6569d18
2021-04-23 11:35:31 +00:00
Bill Yi
85860acefb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I81bb5447f3b0622749e42bd560b1e02d67deb4da
2021-04-23 11:33:54 +00:00
Bill Yi
700eca8b5f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I51f96d5f1e2778626013b66df73ff8efe2acfb84
2021-04-23 11:24:40 +00:00
Almaz Mingaleev
6be940f396
Do not show toggle for location tz detection in search.
...
It also makes setting in line with "Set time zone
automatically", which is rendered w/o toggle on search page.
Bug: 185906072
Test: manually verified that toggle is not shown
Test: m -j30 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceControllerTest"
Change-Id: Ie71572c4a9b9bd6adf3660556363331e2943fd5b
2021-04-23 10:29:58 +00:00
TreeHugger Robot
bd01ad938e
Merge "Fix background inconsistency of the font size page in SUW" into sc-dev am: ea7b64a96d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14290949
Change-Id: I77701f6a34d957f2a6e808e1532ed190283424fb
2021-04-23 09:26:37 +00:00
TreeHugger Robot
ea7b64a96d
Merge "Fix background inconsistency of the font size page in SUW" into sc-dev
2021-04-23 09:21:28 +00:00
TreeHugger Robot
5040e279b7
Merge "Fix bluetooth settings will broadcast to anywhere when some cases" into sc-dev am: 47b254ad88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111132
Change-Id: Iba01e91551978d629c974b9a235129cd0aaea736
2021-04-23 09:19:33 +00:00
TreeHugger Robot
47b254ad88
Merge "Fix bluetooth settings will broadcast to anywhere when some cases" into sc-dev
2021-04-23 09:11:28 +00:00
TreeHugger Robot
b67629f5ae
Merge changes from topic "biometric_page" into sc-dev am: 3e6e4a1ad5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14276566
Change-Id: I706279a35be0d7c11b1926fcb74f67d68320e874
2021-04-23 09:09:41 +00:00
Mill Chen
5962e3bea4
Combined biometric settings implementation am: 7edebeef7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14140150
Change-Id: Id9aa983107826085edd174db27014a674590bb6c
2021-04-23 09:09:38 +00:00
TreeHugger Robot
3e6e4a1ad5
Merge changes from topic "biometric_page" into sc-dev
...
* changes:
Update confirming credential flow for biometric settings
Combined biometric settings implementation
2021-04-23 08:50:29 +00:00
Mill Chen
8843157b01
Update confirming credential flow for biometric settings
...
The combined biometrics settings has been integrating face and
fingerprint authentication together, so the confirming credential flow
has to be invoked before entering biometrics settings page.
Bug: 183449119
Test: manual
Change-Id: I3c0d059241cb10a254868c2e388c4d3b20305b10
2021-04-23 15:33:32 +08:00
Mill Chen
7edebeef7e
Combined biometric settings implementation
...
There will be multiple biometrics authentications existing at the same
time, so we added a new page for multiple biometrics to control
biometrics settings.
Bug: 183449119
Test: manual test
Change-Id: I359082caf771e07dfd5b24973cb8a3cf372c1b30
2021-04-23 15:18:08 +08:00
Sunny Shao
2ba1ab2222
Fix background inconsistency of the font size page in SUW
...
- Apply to SUW provided theme.
- Use isSetupWizardDayNightEnabled to decide which device's SUW supports dark mode.
Fixes: 184901818
Bug: 186076332
Test: manual test
Change-Id: I44c5f8ee19dac58dea7f5543840659c08aad4a39
2021-04-23 15:12:11 +08:00
Christine Franks
23b55a9af4
Merge "Support vendor modes in color mode preference" into sc-dev am: 10da1de13e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14128858
Change-Id: Ifb3a89d234bed0e850695bb93e272d3ee5bea024
2021-04-23 06:45:04 +00:00
Christine Franks
10da1de13e
Merge "Support vendor modes in color mode preference" into sc-dev
2021-04-23 06:31:18 +00:00
YUKAI HUNG
abd7565bb2
Merge "Avoid add preferenc again if it already in the PreferenceGroup" into sc-dev am: 81399d6fec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14281934
Change-Id: I4766849b966f04ef653137add44fcbe88aafb26f
2021-04-23 04:23:09 +00:00
YUKAI HUNG
81399d6fec
Merge "Avoid add preferenc again if it already in the PreferenceGroup" into sc-dev
2021-04-23 04:02:44 +00:00
Jason Hsu
e83ccb0297
Merge "Add string for search keywords in accessibility settings" into sc-dev am: 908a2ba2a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14288497
Change-Id: I833ba59f8ae60324668fb191d168808293a24796
2021-04-23 03:45:15 +00:00
Jason Hsu
908a2ba2a1
Merge "Add string for search keywords in accessibility settings" into sc-dev
2021-04-23 03:38:13 +00:00
Yanting Yang
d1c5ed42a4
Merge "Add a new summary for homepage preference of security" into sc-dev am: 3ab0a24370
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14281031
Change-Id: I18963565e80d0ed8b1458ccab221487d53c1b10d
2021-04-23 03:35:54 +00:00
Yanting Yang
3ab0a24370
Merge "Add a new summary for homepage preference of security" into sc-dev
2021-04-23 03:18:56 +00:00
ykhung
5c23d65901
Avoid add preferenc again if it already in the PreferenceGroup
...
Bug: 177406865
Bug: 185187729
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I69f5033c0a07d846c340b9871e69a2cdbe0bb2aa
2021-04-23 10:35:05 +08:00
jasonwshsu
2345006dfa
Add string for search keywords in accessibility settings
...
Bug: 184171842
Test: build pass
Change-Id: I622b8e919f588e73d05c8a45d10fde68c7352252
2021-04-23 10:09:42 +08:00
TreeHugger Robot
110950243d
Merge "Remove "See all" button" into sc-dev am: f05822549c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14283743
Change-Id: Icc8a2715e1c9d679cfbf8cc0786c66422919a86f
2021-04-23 00:40:17 +00:00
TreeHugger Robot
f05822549c
Merge "Remove "See all" button" into sc-dev
2021-04-23 00:23:16 +00:00
Christine Franks
cd61dd3359
Support vendor modes in color mode preference
...
Bug: 161299146
Test: atest SettingsUnitTests:ColorModePreferenceControllerTest and
atest SettingsUnitTests:ColorModePreferenceFragmentTest
Change-Id: I76ed54bb444170d4b8935f8f12bed599a946aa14
2021-04-22 16:50:43 -07:00
Treehugger Robot
9032f0d1e8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: acc37353d7
-s ours am: 220ba05109
-s ours am: a0a5760ff9
-s ours am: 16f3036c4b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1684488
Change-Id: Ia8f9af18ec70869a3cb74e53abca5bf41664538a
2021-04-22 21:35:42 +00:00
Treehugger Robot
73ea6768b2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5d68dc45b3
-s ours am: dda5464180
-s ours am: c17720247e
-s ours am: 929bde97a4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683526
Change-Id: I6dd4c081c42aef65f0884eec0178a9876273220e
2021-04-22 21:35:06 +00:00
Treehugger Robot
16f3036c4b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: acc37353d7
-s ours am: 220ba05109
-s ours am: a0a5760ff9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1684488
Change-Id: Iac64b675b986115c3c7330b2c23ab9f480da07d6
2021-04-22 21:34:14 +00:00
Treehugger Robot
929bde97a4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5d68dc45b3
-s ours am: dda5464180
-s ours am: c17720247e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683526
Change-Id: Ia8c36bb7fa55f3f114e08d60c7fb20ae9e0cb696
2021-04-22 21:33:55 +00:00
Treehugger Robot
d379ee8a9d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 631013489d
-s ours am: ab17423f8f
-s ours am: 802d9f3c8f
-s ours am: 06cedc7e3b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1684487
Change-Id: I860c9dc3351c4d4107664c28330167671a74b47e
2021-04-22 21:32:34 +00:00
Treehugger Robot
a0a5760ff9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: acc37353d7
-s ours am: 220ba05109
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1684488
Change-Id: Ia7a95d05a05529fba88972f0714683b2da4c5fc7
2021-04-22 21:12:58 +00:00
Treehugger Robot
c17720247e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5d68dc45b3
-s ours am: dda5464180
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683526
Change-Id: I9a1156f535c7cfd8d529ea4071c585db403ac314
2021-04-22 21:12:55 +00:00
Yu-Han Yang
1170a08d43
Remove "See all" button
...
Bug: 180533061
Test: on device
Change-Id: I0a0f54e3ae248ec9c26a2118b70a52e9beecfdd9
2021-04-22 14:07:51 -07:00