Commit Graph

83197 Commits

Author SHA1 Message Date
Suprabh Shukla
63fd87a13a Setting result earlier than onPause
Setting the result in onPause is too late for delivering it to the
requesting activity. Changing to setting the result any time the
uncommitted state is written. The state will still be committed in
onPause only.

Test: Manually with a test app using startActivityForResult.

Bug: 188477366
Change-Id: I676c99e7d2a64b644cef60ecd14728d4d49180c3
2021-05-18 22:13:47 -07:00
Weng Su
3d20a85471 Merge "Introduce new Disconnect functionality for Wifi networks in Internet Panel only" into sc-dev am: 3d904eba71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622856

Change-Id: I76b55df59d7d17bd82712cbdb0a8543bfe660ed4
2021-05-19 04:35:57 +00:00
Weng Su
ac085583cb Merge "Improve discoverability of the intent & actions progress" into sc-dev am: ca5f4e4952
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622857

Change-Id: I2287ba5b7f4170165d260f1f67fefd9294d23f35
2021-05-19 04:34:44 +00:00
Weng Su
3d904eba71 Merge "Introduce new Disconnect functionality for Wifi networks in Internet Panel only" into sc-dev 2021-05-19 03:48:24 +00:00
Weng Su
ca5f4e4952 Merge "Improve discoverability of the intent & actions progress" into sc-dev 2021-05-19 03:48:16 +00:00
TreeHugger Robot
2452c3b10c Merge "Apply color extraction for Fingerprint enrollment" into sc-dev am: bac284a622
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622855

Change-Id: I4a32e8e7b51390e49f9a555f3a491cfaa0bf1d8c
2021-05-19 03:41:56 +00:00
TreeHugger Robot
0acd15d2ed Merge "Visual update for FaceSettings" into sc-dev am: 2a7e608ef2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14551407

Change-Id: I6fa3ff8f19d09f30273b7b466800c51565d206f6
2021-05-19 03:41:48 +00:00
TreeHugger Robot
4f94e0cd85 Merge "Fix the text contrast for biometric header" into sc-dev am: a07eb69948
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14605930

Change-Id: I38a98314ba25f7dc1290896266526279f2e1eb24
2021-05-19 03:41:38 +00:00
TreeHugger Robot
a8ae7dbbac Merge "Update the layout of Pattern/PIN/Password confirmation" into sc-dev am: 6d550713dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554361

Change-Id: Ia226efbfe9dcddb8b9f42dda6e21d18d46440707
2021-05-19 03:41:33 +00:00
TreeHugger Robot
2a5eb6154f Merge "Tweak the layout for Pattern/PIN/Password enrollment" into sc-dev am: 4a67b1c099
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554357

Change-Id: I8abf6face0d5d5e007143fd7e3e7313b0f1448dd
2021-05-19 03:41:14 +00:00
TreeHugger Robot
bac284a622 Merge "Apply color extraction for Fingerprint enrollment" into sc-dev 2021-05-19 03:19:56 +00:00
TreeHugger Robot
2a7e608ef2 Merge "Visual update for FaceSettings" into sc-dev 2021-05-19 03:19:07 +00:00
TreeHugger Robot
a07eb69948 Merge "Fix the text contrast for biometric header" into sc-dev 2021-05-19 03:17:48 +00:00
TreeHugger Robot
6d550713dd Merge "Update the layout of Pattern/PIN/Password confirmation" into sc-dev 2021-05-19 03:16:47 +00:00
TreeHugger Robot
4a67b1c099 Merge "Tweak the layout for Pattern/PIN/Password enrollment" into sc-dev 2021-05-19 03:15:28 +00:00
TreeHugger Robot
b37d6f941a Merge "Controls/Pay - Use new privacy setting" into sc-dev am: 4335268c81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14551073

Change-Id: I70e8b37e9112d7e6dec18c6b0f9629127a79a994
2021-05-19 00:08:16 +00:00
TreeHugger Robot
4335268c81 Merge "Controls/Pay - Use new privacy setting" into sc-dev 2021-05-18 23:55:18 +00:00
Yi Jiang
816b1f6edc Fixes ScreenTimeoutSettingsTest
The recently added Battery Saver Preference need to be initialized in
order to avoid NPE in testing.

Bug: 188499083
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.display

Change-Id: Ib6553bcf9ed86eb46c2e0950064e34439664a1ee
2021-05-18 15:54:21 -07:00
Chloris Kuo
9b0638513a Merge "Fix NAS dialog string" into sc-dev am: 074eee332a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14607898

Change-Id: I05224114e103c2ac166a41bc4a353a214328908d
2021-05-18 18:21:21 +00:00
Weng Su
4bf9551c30 Improve discoverability of the intent & actions progress
- Display "Select the network you want to use for data" on sub-title
when Wi-Fi networks is not empty

- Screenshot:
  https://screenshot.googleplex.com/6nuwYoSh7UjF93Q

Bug: 186432232
Test: manual test
atest -c InternetConnectivityPanelTest

Change-Id: I9ab0ce0ca052b3444e50a914b59f38e4e7778ddf
2021-05-19 02:17:33 +08:00
Chloris Kuo
074eee332a Merge "Fix NAS dialog string" into sc-dev 2021-05-18 17:54:50 +00:00
Weng Su
3d2950c8af Introduce new Disconnect functionality for Wifi networks in Internet
Panel only

- Display the close icon on the Wi-Fi network connected to the Internet,
and performs the same action as tapping on the carrier network when
tapped it.

- Display the cog icon on the Wi-Fi network if it has no the Internet
access.

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

Bug: 187995278
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: Id54a94c1fdfc37aff5cc37d6fb9f5478c0dccb00
2021-05-19 01:52:05 +08:00
Mill Chen
a96dad0a09 Apply color extraction for Fingerprint enrollment
Bug: 183710937
Test: visual verified
1) Navigate to Settings > Security > Fingerprint unlock
2) Follow the flow to register a fingerprint
3) See and check if the icon is applied to the new color

Change-Id: Ia1119c9fb245e0e1ed8257416d2942368a45e9e1
2021-05-19 01:46:20 +08:00
Peiyong Lin
83a71ca8fd Add Game settings support.
Add Game settings page under Apps so that users can access game related
features and toggle settings.

Bug: b/185822999
Test: make ROBOTEST_FILTER=GameSettingsPreferenceControllerTest RunSettingsRoboTests
Change-Id: I923ba70536b7f68b5330a508b8dabf27e33f4c55
2021-05-18 17:24:51 +00:00
YUKAI HUNG
f388489071 Merge "Align system time 12-24 hour format in the time slot information" into sc-dev am: 80f2f43d59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609994

Change-Id: I4e449dcc6ad8a909cdd285ee134b6a6935fa3bb6
2021-05-18 15:49:02 +00:00
TreeHugger Robot
e64a9d0a52 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7659a826c3 -s ours am: 1aed128b64 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib61d61cf6dfa6a01ec6d873dd8c14dc19c21a035
2021-05-18 15:48:41 +00:00
YUKAI HUNG
80f2f43d59 Merge "Align system time 12-24 hour format in the time slot information" into sc-dev 2021-05-18 15:41:16 +00:00
TreeHugger Robot
1aed128b64 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7659a826c3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I693505d6b5e10e7b061d42073280dec33dafbdea
2021-05-18 15:29:22 +00:00
Bill Yi
68bfc095b8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9afa4248cc -s ours am: 0ee82f4c33 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic90a99505a7e0c4f8ef8ff98fa14c8616c0569f3
2021-05-18 15:17:39 +00:00
TreeHugger Robot
7aae50fb8b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6ab5e4327c -s ours am: 6ac3c7186a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5088b47de63341279eaaff150b23d17f8d1b9187
2021-05-18 15:17:36 +00:00
Bill Yi
47de4b553e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8cecd68c0c -s ours am: 712b1d5b4a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icccc7a683a1c7b379580fa499e0cdca1c4e8047b
2021-05-18 15:17:21 +00:00
TreeHugger Robot
7659a826c3 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-05-18 15:09:42 +00:00
Bill Yi
0ee82f4c33 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9afa4248cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id52006206bc4bb7c559e8f32217d6e37fe29c657
2021-05-18 14:57:02 +00:00
TreeHugger Robot
6ac3c7186a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6ab5e4327c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I02beb2105366dc036644655914ca838efd839172
2021-05-18 14:56:28 +00:00
Bill Yi
712b1d5b4a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8cecd68c0c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iab9767edf8ee20f7b69ad87e786d04177895c7e4
2021-05-18 14:56:20 +00:00
TreeHugger Robot
47a01b4622 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0af7445e78 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3968539b2c0e5dc0fdafdf11e7b6d8973b9bb096
2021-05-18 14:46:47 +00:00
TreeHugger Robot
278c488896 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 583c25da1f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c218e663320c46eb180b6c797260e957183c890
2021-05-18 14:46:32 +00:00
TreeHugger Robot
6ab5e4327c Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-05-18 14:43:32 +00:00
arangelov
d79ab00524 Update ActionDisabledByAdminDialogHelper
- For managed devices, "Learn more" takes the user to a support
page
- Put back the "If you have questions, contact your IT admin"
dialog content text
- Update header to 'Blocked by your IT admin' for managed devices

Fixes: 184107103
Test: manual
Test: atest ActionDisabledByAdminDialogHelperTest
Test: atest ActionDisabledLearnMoreButtonLauncherImplTest
Change-Id: Ie5b8a21b9ba295435d5709f9b0374035141d319a
2021-05-18 15:40:46 +01:00
TreeHugger Robot
0af7445e78 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-18 14:36:27 +00:00
TreeHugger Robot
583c25da1f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-18 14:32:55 +00:00
ykhung
1ea5208fa8 Align system time 12-24 hour format in the time slot information
align the time format configuration in the Settings -> System ->
Date/Time to show 12- or 24- hour format in the usage time slot

screenshot: https://screenshot.googleplex.com/3w2SFvBLpC5oHBs
screenshot: https://screenshot.googleplex.com/86uCq6R4PKEg9RD
screenshot: https://screenshot.googleplex.com/3easrEFMQdZEjGP
screenshot: https://screenshot.googleplex.com/7dPWVJNTbSShFPa

Bug: 187783891
Test: make SettingsRoboTests
Change-Id: I9af0a69bd7c67562526bd5ee74a657635068ef44
2021-05-18 13:46:43 +00:00
Matt Pietal
edd1918866 Controls/Pay - Use new privacy setting
Refer to the now centralized Secure setting, instead of local strings

Bug: 188175341
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I5fff84347c369ae94d6c8359cc49dcbcf9b6ee72
2021-05-18 07:55:21 -04:00
TreeHugger Robot
70c0d7c002 Merge "Update style name" into sc-dev am: db6c7211e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14547063

Change-Id: Ibe462c631de99c5adc8b1aa50d4c7665bf79caf5
2021-05-18 11:37:48 +00:00
TreeHugger Robot
db6c7211e4 Merge "Update style name" into sc-dev 2021-05-18 11:28:56 +00:00
Arc Wang
512c5ada1c Merge "Add "This device" string for default internal storage" into sc-dev am: 7c3adee295
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609995

Change-Id: Icb0c4480b0b5a6bd35857d1693ab4ace007f0986
2021-05-18 09:36:25 +00:00
Mill Chen
4e168dd691 Visual update for FaceSettings
This includes the following changes:
- Remove the face animation from FaceSettings page
- Correct the color filling of collapsing toolbar
- Make the button align with other settings
- Remove the seperator

Fix: 186804060
Fix: 187882118
Test: visual verified
Change-Id: I4b7679ced0c420b4d23a3c326ac2a93734c0b8bb
2021-05-18 17:29:56 +08:00
Arc Wang
7c3adee295 Merge "Add "This device" string for default internal storage" into sc-dev 2021-05-18 09:18:54 +00:00
Arc Wang
07dc4fe79a Shows "This device" for default internal storage
Bug: 188492974
Test: atest StorageEntryTest
Change-Id: I7278ff604f22acafd47cef2f5d613a2bf9f0e371
2021-05-18 16:23:25 +08:00
Arc Wang
1aac3eb017 Add "This device" string for default internal storage
Bug: 188492974
Test: build pass
Change-Id: I075441f1211b10eeb69f5a85818261d6083a5453
2021-05-18 16:09:43 +08:00