Chloris Kuo
77fa05dc62
Merge "NAS setting onboarding string change" into sc-dev am: b0ab98b92d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14268599
Change-Id: I1872255fcac53357986df39a1a98f7fa82fd3234
2021-04-23 19:36:21 +00:00
Chloris Kuo
b0ab98b92d
Merge "NAS setting onboarding string change" into sc-dev
2021-04-23 19:17:36 +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
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
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
87c38148d1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I055bcbb06e11c7241ed3cac9d80f332fd6569d18
2021-04-23 11:35:31 +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
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
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
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
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
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
Yanting Yang
4c36506dd4
Add a new summary for homepage preference of security
...
Bug: 183586663
Test: rebuilt
Change-Id: Ia494ca0283afa9dbb4610422f3c7b8504a1f67e8
2021-04-22 12:14:42 +00:00
TreeHugger Robot
48f6cdad57
Merge "Replace to correct footer preference style" into sc-dev am: 913dd4c8a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14271576
Change-Id: Ibfff6750188ff6b7b050bd6603baa95b51e41ff8
2021-04-22 10:59:42 +00:00
TreeHugger Robot
913dd4c8a0
Merge "Replace to correct footer preference style" into sc-dev
2021-04-22 10:42:55 +00:00
Tsung-Mao Fang
a58b144822
Replace to correct footer preference style
...
Test: Rebuilt apk and see the result
Fix: 186078568
Change-Id: I24ee2371dd51b8be4aa69d51d08c534117978ff2
2021-04-22 17:28:26 +08:00
Wesley Wang
e72ac29cde
Merge "Update app usage page active time format" into sc-dev am: 6ffcf8bfa9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14264141
Change-Id: Ibf9616b42812495a371aee299e435875c44649ce
2021-04-22 09:12:52 +00:00
Wesley Wang
6ffcf8bfa9
Merge "Update app usage page active time format" into sc-dev
2021-04-22 08:52:39 +00:00
Joy Babafemi
bc92aa5fb1
Merge "Add UWB Settings" into sc-dev am: a1fe5ec083
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14240457
Change-Id: I5e735a07c27060927342e123e5b6df36c4d6445b
2021-04-22 07:56:36 +00:00
Jeremy Goldman
ba2ac59d50
Merge "Make gear symbol in "Mobile Data Usage" RTL friendly" into sc-dev am: ef7fd39f91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233634
Change-Id: I8810188d7670e61633be0cada0f55e7c98ed0af1
2021-04-22 07:56:17 +00:00
Joy Babafemi
a1fe5ec083
Merge "Add UWB Settings" into sc-dev
2021-04-22 07:39:12 +00:00
Jeremy Goldman
ef7fd39f91
Merge "Make gear symbol in "Mobile Data Usage" RTL friendly" into sc-dev
2021-04-22 07:26:10 +00:00
TreeHugger Robot
be4d09f4fe
Merge "Update the style for collapsing toolbar" into sc-dev am: ea2a359561
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199749
Change-Id: Id807ab2c348cdde21aaf11ccd8074cd33a39b590
2021-04-22 06:46:20 +00:00
TreeHugger Robot
ea2a359561
Merge "Update the style for collapsing toolbar" into sc-dev
2021-04-22 06:40:23 +00:00
Joy Babafemi
a5672945ae
Add UWB Settings
...
Screenshot 1: https://screenshot.googleplex.com/5wjKkioeehZnz74
Screenshot 2: https://screenshot.googleplex.com/AtaufsUgLgVk2Ur
Test: Robotest
Bug: 183254940
Change-Id: Ibd2e3f3ad9596dddbdd23d7f2ad5e03768648faf
2021-04-22 06:16:35 +00:00
PETER LIANG
9387dcc992
Merge "Fix the entire text is aligned middle of the Vision setting screen." into sc-dev am: f71aad11e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14265788
Change-Id: I6e16c1cf9e1c6462844b28903fe3724b0bf68888
2021-04-22 00:51:28 +00:00
PETER LIANG
f71aad11e3
Merge "Fix the entire text is aligned middle of the Vision setting screen." into sc-dev
2021-04-22 00:41:41 +00:00
Neil Fuller
1ce7157d63
Merge "Remove restriction for "Use location..."" into sc-dev am: 33aa65b3cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14251331
Change-Id: I89c59f36081d244a722f726e950e23a327afe0b1
2021-04-21 20:00:47 +00:00
Neil Fuller
33aa65b3cc
Merge "Remove restriction for "Use location..."" into sc-dev
2021-04-21 19:54:41 +00:00
Chloris Kuo
61bb91658f
NAS setting onboarding string change
...
Bug: 185112379
Bug: 185535840
Test: manual test on device
Change-Id: Ieb7ea74398ac333b4adc722ea54b30b9f89d02a1
2021-04-21 12:15:52 -07:00