Commit Graph

81228 Commits

Author SHA1 Message Date
Bill Yi
db0087f348 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5a160fbc8d -s ours am: 1282ff2016 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14141307

Change-Id: Icabab10a64fe9a75cc621cc8920d5a2e2dbf9e5e
2021-04-09 17:07:53 +00:00
Sally Yuen
2c2a558da1 Merge "Get Extra Dim availability through ColorDisplayManager" into sc-dev am: 550072d0fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14096656

Change-Id: Ief00c6b678c37b00f6628367cdcf5667d95fcd9f
2021-04-09 17:07:28 +00:00
Bill Yi
1282ff2016 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5a160fbc8d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14141307

Change-Id: I4310dd5f6b780fe43504bf0784457bea5e2e49ad
2021-04-09 16:27:24 +00:00
Sally Yuen
550072d0fa Merge "Get Extra Dim availability through ColorDisplayManager" into sc-dev 2021-04-09 16:21:32 +00:00
Rubin Xu
570b3c6dc6 Merge "Update titles & messages for password enrolment flows" into sc-dev am: 2f03bda6a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14018665

Change-Id: I8d90ea4f1169e1ba4874ef474459e5d47c55355a
2021-04-09 15:18:51 +00:00
Rubin Xu
2f03bda6a6 Merge "Update titles & messages for password enrolment flows" into sc-dev 2021-04-09 15:03:19 +00:00
Jason Chiu
19d7e023d9 Merge "Guard against NullPointerException when getActivity in PanelFragment" into sc-dev am: fecc24cc53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14124307

Change-Id: Ica964228721aece295bf4eb03cbef42d2b2eb7b0
2021-04-09 14:56:47 +00:00
Jason Chiu
fecc24cc53 Merge "Guard against NullPointerException when getActivity in PanelFragment" into sc-dev 2021-04-09 14:25:31 +00:00
Bill Yi
5a160fbc8d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I377d6f3d7f4af04a0cb9797fe95bff881b17e8b3
2021-04-09 06:59:47 -07:00
Rubin Xu
1ac05237ab Update titles & messages for password enrolment flows
Show different titles and description messages when
enrolling password under various conditions:
* personal lock verus work lock
* adding a new lock versus updating existing lock
* enrolling a PIN verus password versus pattern

Add icons to options in screen lock picker.

Add an option to redirect to work lock flow if the admin
has set device-wide password requirement.

Bug: 183922696
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Change-Id: I40417b113814659d3226a44eb7f9d553386e3c58
2021-04-09 14:35:36 +01:00
ykhung
cc54607410 Add kill-switch to distinguish chart or non-chart design am: cdd73e7fec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14127336

Change-Id: I4c6a4cab09710b8ef5f2966e9d0568b3a18e1a63
2021-04-09 10:57:34 +00:00
ykhung
cdd73e7fec Add kill-switch to distinguish chart or non-chart design
Bug: 184807417
Bug: 180607918
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Iacbb012209d552b58b774f90f5b0aeb60ce6d33d
2021-04-09 07:21:06 +00:00
Wesley Wang
5c579ac280 Merge "Support help message when battery is unavailable(1/2)" into sc-dev am: 57f27f7a30
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14124308

Change-Id: Ia2e689df96523cb9f77ab293e1e28426f60efaf3
2021-04-09 05:13:33 +00:00
TreeHugger Robot
96c4b4ffea Merge "wifi settings: Fix incorrect maximum compativibility toggle behavior" into sc-dev am: a586dc3a96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14124309

Change-Id: I8e16b99b2d0cfda302bbd8d07f54f6645cb8fa97
2021-04-09 05:13:09 +00:00
Wesley Wang
57f27f7a30 Merge "Support help message when battery is unavailable(1/2)" into sc-dev 2021-04-09 04:43:06 +00:00
TreeHugger Robot
a586dc3a96 Merge "wifi settings: Fix incorrect maximum compativibility toggle behavior" into sc-dev 2021-04-09 04:33:36 +00:00
TreeHugger Robot
699dff5ed6 Merge "Add icons to Manage location services and App location permissions" into sc-dev am: 036a0c8877
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14102791

Change-Id: I5483b01e164588d8c39aed15d5310577ab753d35
2021-04-09 04:05:49 +00:00
TreeHugger Robot
036a0c8877 Merge "Add icons to Manage location services and App location permissions" into sc-dev 2021-04-09 03:51:39 +00:00
ykhung
f7f0201cfe Add getBatteryHistory method to query data from SettingsIntelligence am: 318cc18f25
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14119822

Change-Id: Id034a41583d421ef2b1cef6bcc2003470ed814b4
2021-04-09 03:43:45 +00:00
Wesley.CW Wang
756028aadd Support help message when battery is unavailable(1/2)
- Present help preference when battery is unavailable

Bug: 179237551
Test: make SettingsRoboTests
Change-Id: If6e82210d831123cb1169d53a18d24cb2c576b10
2021-04-09 11:24:51 +08:00
ykhung
318cc18f25 Add getBatteryHistory method to query data from SettingsIntelligence
Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Idd640f8f8b07311fafc76f7b61c96c453ae7b604
2021-04-09 01:31:32 +00:00
Fan Zhang
6bdc95e4f8 Merge "Update emergency gesture settings string" into sc-dev am: b6e8a1ca22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14128298

Change-Id: I8bc0eca5658892a6294581c60e9abaa412778d19
2021-04-09 00:37:21 +00:00
Fan Zhang
b6e8a1ca22 Merge "Update emergency gesture settings string" into sc-dev 2021-04-08 23:42:34 +00:00
lesl
80af71b92c wifi settings: Fix incorrect maximum compativibility toggle behavior
Correct behavior:

maximize_compatibility (enabled) 2.4 GHz Single AP
maximize_compatibility (disabled) 5 GHz Preferred Single AP

Bug: 184802466
Bug: 184802508
Test: Manual Test to check toggle behavior
Test: RunSettingsRoboTests
Test: atest -c WifiTetherMaximizeCompatibilityPreferenceControllerTest
Change-Id: I0e97455ea9cf62294b50514ce912ef66d274db8d
2021-04-09 07:29:59 +08:00
TreeHugger Robot
711151f854 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fa3ac98d3b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14122895

Change-Id: Idce5415999d033e0c5405045661ec27324ffb530
2021-04-08 22:11:01 +00:00
TreeHugger Robot
fa3ac98d3b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-08 21:33:55 +00:00
Fan Zhang
2627771575 Update emergency gesture settings string
Bug: 171584515
Test: manual
Change-Id: I4df78f2f88676a16b8e8664301b631586ca6c74c
2021-04-08 19:49:02 +00:00
TreeHugger Robot
402d4d506e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 5fdac28f82 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14122893

Change-Id: I6c28b69d7080ecb164dfb751b8d195e3733ff126
2021-04-08 19:20:34 +00:00
TreeHugger Robot
5fdac28f82 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-08 18:51:37 +00:00
Yu-Han Yang
a13c0f5d7a Add icons to Manage location services and App location permissions
- Also updates footer strings

Bug: 180533061
Test: on device
Change-Id: Id75d74ebe72e92f314fbb116beaacb301f86b34a
2021-04-08 09:47:26 -07:00
Bill Yi
8648b96614 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia8ed93a713ff8a0029d710bfd3851c38a789d67b
2021-04-08 13:31:53 +00:00
Bill Yi
e69a08ffe7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4f9492c1f18fb47712268b07137b028ed82b2ae5
2021-04-08 12:31:36 +00:00
Oli Lan
8702a98341 Merge "Use DeviceConfig property for default value of clipboard access notification setting." into sc-dev am: b914ec91f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13877345

Change-Id: Icc51f04b6034b90ed23209bc1f588f5cb26089f8
2021-04-08 12:05:57 +00:00
Oli Lan
b914ec91f1 Merge "Use DeviceConfig property for default value of clipboard access notification setting." into sc-dev 2021-04-08 11:31:12 +00:00
Wesley Wang
015633fe5e Merge "Update battery states text to support battery feature(1/2)" into sc-dev am: 1e3a18a355
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111141

Change-Id: I992d7ce17d9a5741683dc24c84a78d7a4893d63f
2021-04-08 11:17:20 +00:00
TreeHugger Robot
f2a4dde889 Merge "Update the strings for Media Management Apps" into sc-dev am: 4346f40f2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060704

Change-Id: I20f2d9d505aa0032b01629ecebbc440bfdb14a56
2021-04-08 11:16:58 +00:00
Wesley Wang
1e3a18a355 Merge "Update battery states text to support battery feature(1/2)" into sc-dev 2021-04-08 11:15:05 +00:00
TreeHugger Robot
4346f40f2d Merge "Update the strings for Media Management Apps" into sc-dev 2021-04-08 10:41:15 +00:00
TreeHugger Robot
1de8fa7b91 Merge "Add icon to "Open [safety app] button" into sc-dev am: 9bf1412af7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108402

Change-Id: I660eac4b2ee2bf49ad52a3369d8c0fcbe81a74ce
2021-04-08 09:27:00 +00:00
Jeremy Goldman
bcf8103e7b Merge "Update string associated with Connected, Always On or Insecure VPNs" into sc-dev am: ea42dd3c49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111133

Change-Id: I1a9cb1d358aad35fa8a2fdb037f487bf814b39d8
2021-04-08 09:26:55 +00:00
TreeHugger Robot
9bf1412af7 Merge "Add icon to "Open [safety app] button" into sc-dev 2021-04-08 08:53:45 +00:00
Jeremy Goldman
ea42dd3c49 Merge "Update string associated with Connected, Always On or Insecure VPNs" into sc-dev 2021-04-08 08:50:53 +00:00
Jason Chiu
c4cead363c Guard against NullPointerException when getActivity in PanelFragment
Fixes: 169729372
Test: build
Change-Id: I2f5bbb38015b71ecf82bc8ed7ab8e5815a2bd2f9
2021-04-08 16:39:27 +08:00
Wesley.CW Wang
ebb4e8ca59 Update battery states text am: 11d74e7231
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14098542

Change-Id: I6d124d7444b21cc8b6f2054a9128f04962351f4c
2021-04-08 08:02:00 +00:00
Wesley.CW Wang
d324393fac Update battery states text to support battery feature(1/2)
- Update progress bar bottom text when receiving battery feature callback

Bug: 183689347
Bug: 177407113
Test: make SettingsRoboTests
Change-Id: Ic8b24cbb149f7e470d28327a9a1dd84bbd5673f7
2021-04-08 06:39:22 +00:00
Wesley.CW Wang
11d74e7231 Update battery states text
- Update progress bar bottom text when battery states changed(charging,
 discharging, power saver and low battery)

Bug: 183689347
Bug: 177407113
Test: make SettingsRoboTests
Change-Id: I0397eb1dea7fcb14357750f84d1d5b1a7dc7d19a
2021-04-08 05:10:34 +00:00
Arc Wang
f35b5e5270 Merge "Pop up soft keyboard when rename dialog shows" into sc-dev am: 1f7c6f03b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111143

Change-Id: I45ea50c65c01dcdf3896a449439546ec75f8a820
2021-04-08 02:37:59 +00:00
Arc Wang
3c03a6f088 Merge "Sets Storage Settings progress bar unselectable" into sc-dev am: 5e23987a28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111142

Change-Id: I469e4f159a721b86674224ffcab153339c8aabff
2021-04-08 02:37:35 +00:00
Arc Wang
1f7c6f03b9 Merge "Pop up soft keyboard when rename dialog shows" into sc-dev 2021-04-08 02:09:08 +00:00
Arc Wang
5e23987a28 Merge "Sets Storage Settings progress bar unselectable" into sc-dev 2021-04-08 02:08:45 +00:00