Julia Reynolds
883b81a164
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: I1f038032adaf46fe85436d58849b98b776c4c771
2021-04-23 15:03:09 +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
421693fdd3
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: Ie8b89d0afe3391285a354f2199bf28ad45826e7d
2021-04-23 12:02:40 +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
3610105af8
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: Ia9ee291c4f94262286c49baec745d7dab02c76d6
2021-04-23 11:52:03 +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
52fadc3573
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: I221eae9990a24d0fda82592f35c2778118292180
2021-04-23 09:28:18 +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
6ec9e24ffc
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: Id70444d201690e3761ed58411672dee486c5d51b
2021-04-23 09:19:57 +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
717f819218
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: Iffdcc3ea936efb24f207218dafe9dd485abc8b39
2021-04-23 09:09:54 +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
dad0eb94e4
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: I16cea24dc84c4b9fab588ef653765bf160942b15
2021-04-23 06:45:18 +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
bf44f32c56
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: I47eb5286bfd6df72188d3243a7375fe5ce9734af
2021-04-23 04:24:08 +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
42b1a028b9
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: I32fbd1fb4488fe93c575155c4ad548cecfcdf58b
2021-04-23 03:45:39 +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
2940baed92
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: Ibdf874748c46816cb6bc5a461c07274ba9157031
2021-04-23 03:36:03 +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
7a2f3f1fa9
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: I2e960bf97406e6595a85bc59bbebc45e543a19d9
2021-04-23 00:40:18 +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
f5b38060cd
[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: Ifc005a7040667ef80a9ddf78328e8a747913c060
2021-04-22 21:34:45 +00:00
Treehugger Robot
36395900da
[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: I9ba691b51d7696fbe42282019449c20630157433
2021-04-22 21:34:34 +00:00
Treehugger Robot
ead8fe4ab1
[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: Ic1e384e57524699a63c83b9deff38af89dac6e46
2021-04-22 21:34:27 +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
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
Treehugger Robot
06cedc7e3b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 631013489d -s ours am: ab17423f8f -s ours am: 802d9f3c8f -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1684487
Change-Id: Idcdaf021486a57421af5028cf3f42aa88889e8c4
2021-04-22 21:04:36 +00:00
Treehugger Robot
220ba05109
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: acc37353d7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1684488
Change-Id: Ieec4e25b4a582e782b410df438d401d1a328aac7
2021-04-22 20:55:37 +00:00
Treehugger Robot
dda5464180
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5d68dc45b3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683526
Change-Id: I74ccbff817c7d8e695e38a56e6a48c00df1a7d9b
2021-04-22 20:50:28 +00:00
Treehugger Robot
802d9f3c8f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 631013489d -s ours am: ab17423f8f -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1684487
Change-Id: I86c667f5d23e47d29443a055443f786b78922ada
2021-04-22 20:43:29 +00:00
Treehugger Robot
ab17423f8f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 631013489d -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1684487
Change-Id: I5a0298e75ff4adce5487c6e86153d5364e95f7c0
2021-04-22 20:26:17 +00:00
Treehugger Robot
acc37353d7
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-04-22 20:01:33 +00:00
TreeHugger Robot
45aeddbe7e
Merge "Change "Manage location services" to "Location services"" into sc-dev am: 9064ecd051
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14271284
Change-Id: Ied722649f6f4886c39d49c4026fde2fd2c156f98
2021-04-22 19:38:59 +00:00
Treehugger Robot
5d68dc45b3
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-04-22 19:24:09 +00:00
Treehugger Robot
631013489d
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-04-22 19:20:30 +00:00
TreeHugger Robot
9064ecd051
Merge "Change "Manage location services" to "Location services"" into sc-dev
2021-04-22 19:16:34 +00:00
Julia Reynolds
e6fbc5877e
Add enterprise popup to notif lockscreen settings
...
Test: Robotests, manual with TestDPC
Fixes: 137638270
Change-Id: I22c492d1455cd0a3b6036333cd51a13d87d8a475
2021-04-22 14:55:26 -04:00
Yu-Han Yang
2e177b234e
Change "Manage location services" to "Location services"
...
Also updates its icon.
Bug: 180533061
Test: on device
Change-Id: I1ceaa82bd30b05435cff65905b01af5a6c41bac6
2021-04-22 10:51:28 -07:00
Bill Yi
86cf8dc82f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I74a0174984401e63ae86978bb3d472cb6422c1ce
2021-04-22 10:33:24 -07:00
Bill Yi
183d5436b6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I670023c95e90df9d083ad0359c70b19195ccfb02
2021-04-22 10:31:33 -07:00