Commit Graph

994 Commits

Author SHA1 Message Date
TreeHugger Robot
7233b95761 Merge "Further refactoring on ActionDisabledByAdminDialog classes." into sc-dev am: 9e1e5ddb72 am: 1744af0d97 am: 282050ce95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14700128

Change-Id: Ic30fef16736f22437770a8365cf4d8c50ef39fdb
2021-06-01 21:06:04 +00:00
TreeHugger Robot
9e1e5ddb72 Merge "Further refactoring on ActionDisabledByAdminDialog classes." into sc-dev 2021-06-01 20:13:24 +00:00
Zoey Chen
511be24bbf Merge "[ProviderModel] Use category to separate physical SIM and e-SIM" into sc-dev am: c968a80ff6 am: 67551e8dd2 am: fe8f6a1c99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732243

Change-Id: If6761df2973935dde4080c29899314bdbccc92d6
2021-06-01 03:21:17 +00:00
Zoey Chen
c968a80ff6 Merge "[ProviderModel] Use category to separate physical SIM and e-SIM" into sc-dev 2021-06-01 02:16:08 +00:00
Zoey Chen
71fada3af8 [ProviderModel] Use category to separate physical SIM and e-SIM
Mock from UX: https://screenshot.googleplex.com/4kscwJvoQE7vwF3.png

Implementation UI: https://screenshot.googleplex.com/AEeVzLi364KiPGa.png

Bug: 187071119
Test: atest NetworkProviderSimListControllerTest
Test: atest NetworkProviderSimsCategoryControllerTest
Test: atest NetworkProviderDownloadedSimListControllerTest
Test: atest NetworkProviderDownloadedSimsCategoryControllerTest

Change-Id: Ia84bebe6ea431cdbae19f3e4b840f7cd56dc2d6f
2021-05-31 23:59:37 +08:00
Bonian Chen
ca83d9e631 Merge "[Settings] Code refactor - NetworkSelectSettingsTest" 2021-05-31 13:45:07 +00:00
Bonian Chen
e96b889d5b [Settings] Code refactor - NetworkSelectSettingsTest
Move NetworkSelectSettingsTest.java from robolectric into JUnit.

Bug: 189742455
Test: local, JUnit
Change-Id: I72066cc04ea6bdc8f7c68351e649926350fe41c9
2021-05-31 11:14:17 +00:00
Beth Thibodeau
910d1f7aa8 Merge "Add recommendation setting and remove app settings" into sc-dev am: 8e67634830 am: b7749fd405 am: baf515ee95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720441

Change-Id: I300769f058b71090dee2d9581dab72c1e1332031
2021-05-28 03:06:49 +00:00
Felipe Leme
e89c2fd4b8 Further refactoring on ActionDisabledByAdminDialog classes.
Bug: 184107103
Bug: 188836559

Test: m -j RunSettingsRoboTests ROBOTEST_FILTER=ActionDisabledByAdminDialogHelperTest
Test: atest ActionDisabledLearnMoreButtonLauncherImplTest
Test: adb shell am start -e android.app.extra.RESTRICTION no_install_unknown-sources -a android.settings.SHOW_ADMIN_SUPPORT_DETAILS
Test: manual verification with CtsVerifier

Change-Id: I3c4056d82834b5e2a4afbd958be7c9d0b9af543e
2021-05-27 11:27:33 -07:00
Beth Thibodeau
8e67634830 Merge "Add recommendation setting and remove app settings" into sc-dev 2021-05-27 16:19:17 +00:00
Rajeev Kumar
0afd586789 Merge "Ensure hibernation exemption toggle uses pre-S flag" into sc-dev am: 265dd55235 am: 4c18ba65c6 am: ad4390f270
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14725079

Change-Id: I3227b72270c88e88908c62b49710b09c5e4d7c1f
2021-05-26 17:42:32 +00:00
Rajeev Kumar
265dd55235 Merge "Ensure hibernation exemption toggle uses pre-S flag" into sc-dev 2021-05-26 16:46:58 +00:00
Beth Thibodeau
b7993699ba Add recommendation setting and remove app settings
- Add a new setting to control whether smartspace recommendations are
enabled
- Remove setting to block individual apps from resumption
- Update strings for existing resume setting

Bug: 187925818
Test: atest SettingsProviderTest
Test: atest MediaControlsRecommendationControllerTest
Test: atest MediaControlsPreferenceControllerTest
Change-Id: I4bd6a420e01e8c44f4db8be477557501648cc8d7
2021-05-26 11:00:25 -04:00
Weng Su
befa054914 Merge "[Provider model] Add "See all" text link to Internet Panel" into sc-dev am: 9512d53697 am: 3ada3bd0b4 am: 085975957f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716195

Change-Id: I8874a98ae63cb51b52b92e58a3bbfc36e34052d3
2021-05-26 12:37:10 +00:00
Weng Su
d03002319c Merge "[Provider model] Add "Turn off/on Wi-Fi" link to Internet Panel" into sc-dev am: 59f7b677fe am: d9a3515d36 am: e4b37f5333
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702752

Change-Id: Id72beec5954fb4cd875166b8969c6d7171255a48
2021-05-26 12:37:03 +00:00
Weng Su
9512d53697 Merge "[Provider model] Add "See all" text link to Internet Panel" into sc-dev 2021-05-26 11:45:00 +00:00
Weng Su
a2084a63c6 [Provider model] Add "See all" text link to Internet Panel
- Add "See all" text link at the bottom of the network providers list
  - Don't show "See all" text link if the Wi-Fi network is empty

Bug: 188710392
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: If99c1e6597b4d2ef6a916fbdab3df9cfad8b464e
2021-05-26 11:44:09 +00:00
Weng Su
59f7b677fe Merge "[Provider model] Add "Turn off/on Wi-Fi" link to Internet Panel" into sc-dev 2021-05-26 11:43:49 +00:00
Weng Su
7b8c367d4f [Provider model] Add "Turn off/on Wi-Fi" link to Internet Panel
- Replace the left menu button with "Turn off/on Wi-Fi"
  - Remove the TurnOnWifiSlice

- Show "Wi-Fi is off" sub-title when Wi-Fi is disabled
  - Remove the "Wi\u-Fi is turned on" sub-title when APM is on.

Bug: 188710392
Test: manual test
atest -c InternetConnectivityPanelTest
make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.panel

Change-Id: I53e200f6cadf8b712bf794bcbd5ff79f0f239cc0
2021-05-26 17:22:38 +08:00
Yanting Yang
742c627e98 Merge "Correct breadcrumbs of Wallpaper & style" into sc-dev am: 4fce42c454 am: 3765c438b9 am: 821ee0e420
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716095

Change-Id: I44f530dfea070a80a239c3d7e7c9e1a2b869fb6c
2021-05-26 07:01:43 +00:00
Yanting Yang
4fce42c454 Merge "Correct breadcrumbs of Wallpaper & style" into sc-dev 2021-05-26 06:20:38 +00:00
Kevin Han
4b34271f7d Ensure hibernation exemption toggle uses pre-S flag
For dogfood, we want hibernation to target apps that target pre-S. This
was done on the PermissionController side but the toggle in Settings
did not visually reflect this policy, confusing dogfood/teamfood
participants.

This updates the default toggle position to consider whether the pre-S
flag is on and then default to the "on" position for apps targeting
pre-S if the flag was on for the device.

Bug: 189260947
Test: atest HibernationSwitchPreferenceControllerTest
Test: manual
Change-Id: I9cd16e82e1eee4589cb17a356b6bf2e3297a8dd2
2021-05-25 18:52:19 -07:00
TreeHugger Robot
a84f439bea Merge "Query storage size instead of calculate size of installed APP" into sc-dev am: 0eaf329a43 am: ebf9d33fb9 am: caa0805121
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554355

Change-Id: I8387c7f9f18d3aaed0f745eee7616b533f5234b5
2021-05-26 00:59:25 +00:00
TreeHugger Robot
0eaf329a43 Merge "Query storage size instead of calculate size of installed APP" into sc-dev 2021-05-26 00:13:16 +00:00
Yanting Yang
6bf1c3675d Correct breadcrumbs of Wallpaper & style
Remove the sitemap connection between Display and Wallpaper & style,
since we already moved the Wallpaper & style to the homepage.

Bug: 182708819
Test: robotests & visual
Change-Id: Ia069be91177d8fef56248b5343c41a13ef8267a2
2021-05-26 05:43:53 +08:00
Arc Wang
044c91cc70 Query storage size instead of calculate size of installed APP
From android S, Storage Settings show files of images/videos/audios
category instead of installed APP of each category. So it's
necessary to change the way to calculate size information.

This change also
- StorageItemPreference shows changing storage size units instead
  of fixed GB. It helps UX for categories of only small size files.
- Query media provider for size of Documents and others.
- Query media provider for size of Trash.

Bug: 170918505
Bug: 177892478
Bug: 179871408
Bug: 184379946
Bug: 186077224
Bug: 187128447
Test: atest com.android.settings.deviceinfo
      atest com.android.settings.deviceinfo.storage
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo.storage
      manual visual
      Click each file category to count files size is the same as
      displayed in Storage Settings.
Change-Id: I37c7b3a4b5860323cb55581b23a90f583f4af216
2021-05-25 23:44:21 +08:00
Betty Chang
7b6ac5b5f9 Merge "Remove the Network rating provider item" into sc-dev am: 4246049c7c am: a76c6efc0e am: 82b402fb4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675092

Change-Id: Iccd1b99438004e133e83f78f216d37e67fba0396
2021-05-24 07:25:57 +00:00
Betty Chang
4246049c7c Merge "Remove the Network rating provider item" into sc-dev 2021-05-24 06:42:10 +00:00
changbetty
8267a2757f Remove the Network rating provider item
Bug: 187119482
Test: manual test
      make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiSettingsTest
Change-Id: Iff4a7663c0bca8f0553fcd16673a9aa766050ff4
2021-05-21 17:08:44 +08:00
Weng Su
1ad9482d73 Merge "[Provider model] Revise the Internet Panel title sub-text" into sc-dev am: 72dd0830e1 am: ab2394c773 am: 6598c5f26a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622867

Change-Id: Icf019ac0a23418f4225a62a3c1b3fe5933912a8c
2021-05-21 08:59:15 +00:00
Weng Su
72dd0830e1 Merge "[Provider model] Revise the Internet Panel title sub-text" into sc-dev 2021-05-21 08:14:07 +00:00
Arc Wang
c60e8c41a4 Merge "Shows "This device" for default internal storage" into sc-dev am: 8b5913ba18 am: e7e25f12f1 am: 766ddfce34
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609996

Change-Id: Ie925d28907b45da43cb43391ddd39c65ef342d00
2021-05-21 07:12:35 +00:00
Arc Wang
8b5913ba18 Merge "Shows "This device" for default internal storage" into sc-dev 2021-05-21 06:23:02 +00:00
Jack Yu
0ac4d497ff Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev am: 3616520985 am: a67151ad2f am: 2b2a1f8894
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554359

Change-Id: Ia8fd7d39bc1eca409b573055830e049f32bdd056
2021-05-20 04:45:48 +00:00
Antoan Angelov
d9365b8d65 Merge "Update ActionDisabledByAdminDialogHelper" into sc-dev am: eb45fd3f2a am: 8019ba0d5b am: 3bd2b1cae2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441130

Change-Id: I13048f5d63c1f58a66605aae4f1ef1a53f94ae0e
2021-05-20 02:04:33 +00:00
Peiyong Lin
7d73c61a16 Merge "Add Game settings support." into sc-dev am: d32d11248e am: 4e4a7f0dbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14553339

Change-Id: I9eb8f13aaf68f586ac1068af26459e9db08f1a65
2021-05-20 01:55:47 +00:00
Weng Su
7390717d9e Merge "Introduce new Disconnect functionality for Wifi networks in Internet Panel only" into sc-dev am: 3d904eba71 am: eccb787bbb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622856

Change-Id: I485d82ac7bfc9347def855207796f70b0ac0674b
2021-05-20 01:55:42 +00:00
Weng Su
c1382e3007 Merge "Improve discoverability of the intent & actions progress" into sc-dev am: ca5f4e4952 am: 46d3fc525e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622857

Change-Id: If6651e153ac623305f933bee6cb57a02b753d905
2021-05-20 01:55:37 +00:00
Arc Wang
f11ab2eed1 Storage Settings shift profile selection tab position am: c0b5ba5225 am: 44bc515588
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441414

Change-Id: I757e81ee5eff34596b850fe8d2d6a73168d823db
2021-05-20 01:50:03 +00:00
Jack Yu
3616520985 Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev 2021-05-19 16:26:18 +00:00
Antoan Angelov
eb45fd3f2a Merge "Update ActionDisabledByAdminDialogHelper" into sc-dev 2021-05-19 13:50:06 +00:00
Weng Su
99d8fcfae2 [Provider model] Revise the Internet Panel title sub-text
- Display "Tap a network to connect" on sub-title when Wi-Fi networks is
not empty

- Screenshot:
  https://screenshot.googleplex.com/5TzpJDLghpCQnDP

Bug: 188594439
Test: manual test
atest -c InternetConnectivityPanelTest

Change-Id: I0e3f0eb269fb4fe040a62be9ee84105879af82f7
2021-05-19 15:35:41 +08:00
Peiyong Lin
d32d11248e Merge "Add Game settings support." into sc-dev 2021-05-19 05:42:14 +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
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
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
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
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
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