Commit Graph

81606 Commits

Author SHA1 Message Date
TreeHugger Robot
fb611d7e21 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550 -s ours am: c3edd0b379 -s ours am: 00e30fba67 -s ours am: be6b904ec5 -s ours am: 8ec57d3e30 -s ours am: 7ccc647d7b -s ours am: 8aa0b4a53c -s ours
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d is already in history

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

Change-Id: I7a010fd98f67badba82e2139c70a5f3bb6a20c3a
2021-04-09 20:46:44 +00:00
TreeHugger Robot
5921534d1e [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550 -s ours am: c3edd0b379 -s ours am: 00e30fba67 -s ours am: be6b904ec5 -s ours am: fa9fd4f924 -s ours am: a6c5c629c1 -s ours
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d is already in history

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

Change-Id: I449888f68a2df71eaec32b923ac76f990134f048
2021-04-09 20:46:29 +00:00
Peter Wang
f40897d27e Fix intent String for starting profile management page in Manifest
Bug: 170507492
Test: Local
Change-Id: I6c3f36f1dd99eb4b380dce7218f85757d350bc42
Merged-In: I6c3f36f1dd99eb4b380dce7218f85757d350bc42
2021-04-09 13:33:15 -07:00
Peter Wang
cd263f5535 Merge "Fix intent String for starting profile management page in Manifest" into sc-dev 2021-04-09 20:30:16 +00:00
TreeHugger Robot
8aa0b4a53c [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550 -s ours am: c3edd0b379 -s ours am: 00e30fba67 -s ours am: be6b904ec5 -s ours am: 8ec57d3e30 -s ours am: 7ccc647d7b -s ours
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d is already in history

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

Change-Id: Ibfb97d755fbe71a05787cb575600fc38b977f165
2021-04-09 20:29:46 +00:00
TreeHugger Robot
a6c5c629c1 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550 -s ours am: c3edd0b379 -s ours am: 00e30fba67 -s ours am: be6b904ec5 -s ours am: fa9fd4f924 -s ours
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d is already in history

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

Change-Id: I31ee438d2f7425ccd1aa1d87640aabb53336eee7
2021-04-09 20:03:49 +00:00
TreeHugger Robot
7ccc647d7b [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550 -s ours am: c3edd0b379 -s ours am: 00e30fba67 -s ours am: be6b904ec5 -s ours am: 8ec57d3e30 -s ours
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d is already in history

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

Change-Id: Id36ed926f501ab40049c3d76cef814958cf8dfa4
2021-04-09 19:34:39 +00:00
TreeHugger Robot
fa9fd4f924 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550 -s ours am: c3edd0b379 -s ours am: 00e30fba67 -s ours am: be6b904ec5 -s ours
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d is already in history

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

Change-Id: Ia88db4d0b98ebbcd5c1114cf21673bbbd73a217b
2021-04-09 18:57:07 +00:00
TreeHugger Robot
8ec57d3e30 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550 -s ours am: c3edd0b379 -s ours am: 00e30fba67 -s ours am: be6b904ec5 -s ours
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d is already in history

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

Change-Id: I92487706addaddda44613b00903c4dd5c862de3a
2021-04-09 18:52:26 +00:00
Peter Wang
93ce0688de Fix intent String for starting profile management page in Manifest
Bug: 170507492
Test: Local
Change-Id: I6c3f36f1dd99eb4b380dce7218f85757d350bc42
2021-04-09 11:49:34 -07:00
TreeHugger Robot
be6b904ec5 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550 -s ours am: c3edd0b379 -s ours am: 00e30fba67 -s ours
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d is already in history

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

Change-Id: I8dae5afba2b9b3ad00a1c7d8ec0d254abd706901
2021-04-09 18:10:21 +00:00
TreeHugger Robot
cdb1cdaef4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fe40f85cca -s ours am: 8974b83e8a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5e090e0bd4776644bc18492ed349df568a774061
2021-04-09 17:27:37 +00:00
TreeHugger Robot
00e30fba67 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550 -s ours am: c3edd0b379 -s ours
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d is already in history

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

Change-Id: I0f596d744078240f574e6f998cbb7dd9e8d09dfd
2021-04-09 17:27:01 +00:00
TreeHugger Robot
8974b83e8a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fe40f85cca -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib11f8983a69d3a8a731d829e8f6df6bacd71cf9a
2021-04-09 17:10:58 +00:00
Abel Tesfaye
3898988def 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: Ib11826a5270b887799fee54fe99dd45b4039ee66
2021-04-09 17:07:57 +00:00
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
TreeHugger Robot
c3edd0b379 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550 -s ours
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d is already in history

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

Change-Id: Ie4514dfe4f245139b9733d903f8f36ed29af998c
2021-04-09 16:50:18 +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
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
TreeHugger Robot
d2ee0db550 Merge "Hide non-system overlay window on ActivityPicker" into pi-dev 2021-04-09 15:58:30 +00:00
TreeHugger Robot
fe40f85cca Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-09 15:46:04 +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
Weng Su
688fa772b9 Modify Wi-Fi network details settings to restricted style
- Show restricted text in guest mode

- Screenshot:
  https://screenshot.googleplex.com/Q5tbzn67EJigpVJ

Bug: 177573895
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiNetworkDetailsFragment2Test

Change-Id: I64c8d82518d47c7f96802f505efa380c63b9e10c
2021-04-09 23:10:24 +08: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
Bill Yi
a626332f65 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I422132510dd25b392386f53bc9e1a77c5b483bf1
2021-04-09 06:11:06 -07:00
SongFerngWang
5c2b140483 The Network Select shows wrong operator name
It get the empty subscriptionInfoList from
 SubscriptionManager#getAccessibleSubscriptionInfoList, so the UI
 shows default subId's operator.
 Since this item appears, when sim is active, using
 getActiveSubscriptionInfoList is enough.

 - https://screenshot.googleplex.com/9aHtDVpnYQBsiQr

Bug: 182020952
Test: atest MobileNetworkUtilsTest
atest OpenNetworkSelectPagePreferenceControllerTest

Change-Id: I0d86ec41236a0d1be657ccd57fd0cf90f96b8b89
2021-04-09 12:07:00 +00: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
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