Commit Graph

36422 Commits

Author SHA1 Message Date
Abel Tesfaye
9435e52d3f Merge "Add warning message when camera privacy lock is enabled for screen attention settings" into sc-dev am: 473fffa318
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13989325

Change-Id: I534663b249ccb4cda1b32918b1c68feb275458d3
2021-04-09 17:10:41 +00:00
Sally Yuen
5da6456c18 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: Ib8e66116813f18fa3d38b5ba973399089e20dbd8
2021-04-09 17:08:38 +00:00
Abel Tesfaye
473fffa318 Merge "Add warning message when camera privacy lock is enabled for screen attention settings" into sc-dev 2021-04-09 16:31:36 +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
a80a234f4f 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: Id0902a7dd72a3c3a9f3b8932459ee9f22cfd46e3
2021-04-09 15:19:09 +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
90b565dd22 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: I5698f80013db895172cef98cef8550f2875e4951
2021-04-09 14:56:35 +00:00
Jason Chiu
fecc24cc53 Merge "Guard against NullPointerException when getActivity in PanelFragment" into sc-dev 2021-04-09 14:25:31 +00: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
52a0f72c87 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: Icc86474ce123f8ae8d128d8dbfda23d896d071d1
2021-04-09 10:57:11 +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
fecca0ec3f 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: I7b4da94c19efcf4b5af8a838adbb05865dc330e1
2021-04-09 05:12:34 +00:00
TreeHugger Robot
839077f5e1 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: I427fcf75c1a0d820e5f6a59871338a2d5f418ed0
2021-04-09 05:12:23 +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
ykhung
057307c89c 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: I1327aa3f0b10a066b59d8cf08dd5febb16d10e85
2021-04-09 03:42:58 +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
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
Abel Tesfaye
5d6438391f Add warning message when camera privacy lock is enabled for screen attention settings
Test: locally with flame, make RunSettingsRoboTests -j$(nproc)
ROBOTEST_FILTER=AdaptiveSleepCameraStatePreferenceControllerTest,
AdaptiveSleepPreferenceControllerTest

Bug: 177462182
Change-Id: I9880d6b82e9a5040534aceda4ff15275e0bcf72a
2021-04-08 19:40:58 +00:00
Oli Lan
ee93f873a6 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: I077bf3de71784fa79672a77dd90d492de6263038
2021-04-08 12:05:18 +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
ff847ec1c3 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: I3d57d2ce88ae0c64955a091920863236979c706c
2021-04-08 11:17:13 +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
33ce9d8604 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: I4256aa5f2c1cb8b00f115e01340edf006b03fa9f
2021-04-08 09:21:41 +00:00
Jeremy Goldman
eddd6625fb 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: I5ec16447d130bdd7a5d19db6152831b7b36f1834
2021-04-08 09:21:28 +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
6148438546 Update battery states text am: 11d74e7231
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14098542

Change-Id: I74a61775c7e6e364d294922fed90e3a45e20d0d9
2021-04-08 08:01:02 +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
f1dbe7a242 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: I56bd581e207a610362c629ddb02c7b066731da92
2021-04-08 02:39:18 +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
Jeremy Goldman
df35cfe54d Merge "Subscription name has whitespace trimmed to determine uniqueness" into sc-dev am: b71cb56c05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111129

Change-Id: I89f611f2da0c633b61e0321ce34445f6c933443a
2021-04-08 01:56:07 +00:00
Jeremy Goldman
b71cb56c05 Merge "Subscription name has whitespace trimmed to determine uniqueness" into sc-dev 2021-04-08 01:16:14 +00:00
Fan Zhang
eee07aacb9 Add icon to "Open [safety app] button
https://screenshot.googleplex.com/AjFhMECtQ4E9QAa.png

Bug: 184261824
Test: manual
Change-Id: I2b9b74077aec29dee3a34105584c5364fa663a84
2021-04-07 20:29:23 +00:00
TreeHugger Robot
ffca3330d5 Merge "Mark non actionable preferences as non-selectable" into sc-dev am: ec7c17c3cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14114141

Change-Id: I3f06b714d95a6a68ef6e34d9458a93e0df069360
2021-04-07 20:08:59 +00:00
Almaz Mingaleev
abb4a1c9d9 Merge "Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils." am: e3d4e39144 am: 90d5572fa5 am: f3a44236e3 am: 18c9ff9bd2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1658001

Change-Id: I398cff2fe75d33c8699b84817b2999c7d6c6b18b
2021-04-07 20:08:27 +00:00
TreeHugger Robot
ec7c17c3cd Merge "Mark non actionable preferences as non-selectable" into sc-dev 2021-04-07 19:55:34 +00:00
sallyyuen
ee9cb2d147 Get Extra Dim availability through ColorDisplayManager
Test: atest ReduceBrightColorsIntensityPreferenceControllerTest
Bug: 170970675
Change-Id: Ibccca13d6491e8861263887e33021dd467fc227f
2021-04-07 12:30:11 -07:00
Almaz Mingaleev
18c9ff9bd2 Merge "Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils." am: e3d4e39144 am: 90d5572fa5 am: f3a44236e3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1658001

Change-Id: I3f3ce9f7dc0528e492473dcf1f8344f0518119e1
2021-04-07 19:28:22 +00:00
Bonian Chen
625a8d53e1 Merge "[Settings] More log to help analysis" into sc-dev am: 44a45f0c49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103370

Change-Id: I18a8db8adbd5d8618fd79178509a57b0670481f8
2021-04-07 19:06:56 +00:00
YUKAI HUNG
e005379e2c Merge "Remove options menu from BatteryUsage to align material next" into sc-dev am: 8477cf1892
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14112967

Change-Id: I9f957ce3c0e957b8c3ff9a53024910266f25ae62
2021-04-07 19:06:19 +00:00
Abel Tesfaye
14c5ba8648 Merge "Add warning message when camera privacy lock is enabled for smart auto rotate settings fragment" into sc-dev am: 28ad67dac2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13857227

Change-Id: I077e308dd13308a6767c8b16e9b22a0e0906ebfd
2021-04-07 19:03:58 +00:00
Almaz Mingaleev
f3a44236e3 Merge "Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils." am: e3d4e39144 am: 90d5572fa5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1658001

Change-Id: I75ef99ef2f008e98c12642c442e94f7daf860f69
2021-04-07 19:03:43 +00:00
Julia Reynolds
14cdcfdee9 Mark non actionable preferences as non-selectable
Test: navigate the conversations page with switch access enabled
Fixes: 178765656
Change-Id: If5d5dd301e2d95b4aa7512f58a6e1adf01f3dbf0
2021-04-07 14:35:39 -04:00
Bonian Chen
44a45f0c49 Merge "[Settings] More log to help analysis" into sc-dev 2021-04-07 18:11:32 +00:00
YUKAI HUNG
8477cf1892 Merge "Remove options menu from BatteryUsage to align material next" into sc-dev 2021-04-07 17:17:04 +00:00
Abel Tesfaye
28ad67dac2 Merge "Add warning message when camera privacy lock is enabled for smart auto rotate settings fragment" into sc-dev 2021-04-07 17:13:44 +00:00