Commit Graph

87554 Commits

Author SHA1 Message Date
YUKAI HUNG
57fbe19791 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: Id6677c175a7ba6f54a0cad3a210c2c75ecb7f5b9
2021-04-23 04:06:59 +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
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
2489d5c5fb 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: I7f0311208c4e853b6c5bd44843ebe4fc591bf359
2021-04-23 03:38:18 +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
fc7ed5bd5c 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: I990a827611a37ff67865a23c02efea02aed8dbf2
2021-04-23 03:38:00 +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
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
a00832822f 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: Idd43c43be38c92b94aebd20c365e847e4f939161
2021-04-23 00:42:12 +00: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
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
Kevin Chyn
7920117a1a Do not auth in settings if UDFPS
Fixes: 185670313
Test: manual
Change-Id: I0ccc85aa05807f54a38ff69a81f87e6a63be9504
2021-04-22 14:44:25 -07:00
Treehugger Robot
e15549a3df [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: I42acb88a6fe3ea4c0225f41b425282b3d3f18487
2021-04-22 21:37:08 +00:00
Treehugger Robot
7812b2e833 [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: I5f5bddffe57811a64a04e7cc55bdec08209ed041
2021-04-22 21:36:59 +00:00
Treehugger Robot
f84734902b [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: Ia2b9313143c3f64dcd85c2602270899af4f1c92c
2021-04-22 21:35:51 +00: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
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
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
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
884490487e 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: Ia94df098b5262c4c67367fc6fbbb130085957b52
2021-04-22 19:39:56 +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
6696250643 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: I8685bc48d16c10aa7cb5cb08165adbf0613fef96
2021-04-22 19:38:14 +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
Bill Yi
fbcfe8af01 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I814358b71ad2829789f1d9ac0711e369dddd11e4
2021-04-22 10:28:15 -07:00
Evan Severson
77d4991716 Merge "Update mic/camera toggles api" into sc-dev am: cbc3bc5acd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14193836

Change-Id: I518be9807c174b7e01bc25fc3239f17faa1788f1
2021-04-22 16:43:25 +00:00