Commit Graph

82438 Commits

Author SHA1 Message Date
TreeHugger Robot
ba061c91ef 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: If9642ede2761b0aee37a7afff15317b861e84d90
2021-05-19 00:08:03 +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
0e30c2599f 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: I856d8740ee4c90343e7cd4da2e1349efca331d33
2021-05-18 18:20:17 +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
bf06c3c5f0 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: I56c5dbb6a03ea06afd292e56d84914ffa9b27150
2021-05-18 15:45:24 +00:00
TreeHugger Robot
3ea9148b47 [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: I9b9067a4878f6b3c48f16653562bd3e48039270b
2021-05-18 15:45:18 +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
e8d6f07126 [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: Ie1f2a8e5541098500f9acfb361427dfdef36dbad
2021-05-18 15:12:49 +00:00
TreeHugger Robot
f68e687f10 [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: If726240272002e2508990d412cf636686c72d9ed
2021-05-18 15:12:45 +00:00
Bill Yi
5bf187ec27 [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: I5c99a25495d69681b25ae52f1a3d48508bb3e636
2021-05-18 15:12:22 +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
6ab5e4327c Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-05-18 14:43:32 +00:00
TreeHugger Robot
f075886ddf [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: Icfcd049d3ada04dd6781814faa0c6eccd25f70f5
2021-05-18 14:41:26 +00:00
TreeHugger Robot
a82ce0e247 [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: I4cccf3b1c6212548bffbd6f6960292f4547db3fe
2021-05-18 14:41:10 +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
fe9d014c8c 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: I9363ee0318a2785498a04829822af9348bedb35b
2021-05-18 11:34:32 +00:00
TreeHugger Robot
db6c7211e4 Merge "Update style name" into sc-dev 2021-05-18 11:28:56 +00:00
Arc Wang
cf32a78aa9 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: I548dc62bd75fc1925f35d6463679d72956c8130a
2021-05-18 09:35:15 +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
Bill Yi
64b93de7fd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I68e6533cfd3227be4253cd2839924d5605277299
2021-05-18 07:59:02 +00:00
Bill Yi
e1ced04862 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib2fcc8cb7140ff10b4be202b67c7cac152791c5e
2021-05-18 07:50:11 +00:00
Bill Yi
863787066f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I709fca4e70ea54241c6bb553dbfa327a469021fe
2021-05-18 07:45:52 +00:00
Bill Yi
8cecd68c0c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib190cfbca4b19a2c8281647d630837128ba64c8a
2021-05-18 07:42:30 +00:00
Bill Yi
9afa4248cc Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iad8f93395efff8ba022148339bd3f5315c34cdfa
2021-05-18 07:39:35 +00:00
Bill Yi
f44fef2834 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8d2a14d7fe038edf738a1fec382328f8a8564f67
2021-05-18 07:36:05 +00:00
Betty Chang
597d2a157c Merge "[GAR] Change the text color for Private DNS Summary to follow the GAR" into sc-dev am: 78031d82b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609992

Change-Id: Ie0d73e83a46377277d8c1df1ad54c2506982da66
2021-05-18 06:57:53 +00:00
Betty Chang
0853f28f5a Merge "[GAR] Set selectable attribute to W+ network preference" into sc-dev am: 2d3487f704
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609990

Change-Id: I8fbb1163a44e3afe1d891f36855dd3f19acaab38
2021-05-18 06:57:45 +00:00
Betty Chang
78031d82b7 Merge "[GAR] Change the text color for Private DNS Summary to follow the GAR" into sc-dev 2021-05-18 06:47:00 +00:00
Betty Chang
2d3487f704 Merge "[GAR] Set selectable attribute to W+ network preference" into sc-dev 2021-05-18 06:41:03 +00:00
ykhung
7acf3fc852 Add metric for battery defender am: 6590b368f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554360

Change-Id: I95b8e2f1595f675c48b4f06d051b3360befc7a91
2021-05-18 05:35:59 +00:00
ykhung
6590b368f2 Add metric for battery defender
Bug: 188384887
Test: make SettingsRoboTests
Change-Id: Ida96deb6efe94a98cf6837b9f82758467a4d1300
2021-05-18 05:19:45 +00:00
Menghan Li
47dc191940 Merge "Fix flake issue on SettingsRoboTests" into sc-dev am: cadd868911
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609993

Change-Id: I8e781159356f15c907fd3565232bffab37a09ce9
2021-05-18 05:00:16 +00:00
Menghan Li
cadd868911 Merge "Fix flake issue on SettingsRoboTests" into sc-dev 2021-05-18 04:36:32 +00:00
TreeHugger Robot
66675b3e50 Merge "Fix search highlight issues" into sc-dev am: 03099c04bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519527

Change-Id: I1b2044b4911dbf2557a19759740ada19f84760a3
2021-05-18 03:53:42 +00:00