Commit Graph

37784 Commits

Author SHA1 Message Date
Stanley Wang
60cf6b0bb7 Merge "SettingsMainSwitchPreference should display the restricted icon if it is restricted." into sc-dev am: b4b35a8c38 am: 55ee50d381 am: 72983e34fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758319

Change-Id: Ie8fe5b6dc928537c1a28c3c65a0fbc7a830b590d
2021-06-02 08:46:03 +00:00
Stanley Wang
55ee50d381 Merge "SettingsMainSwitchPreference should display the restricted icon if it is restricted." into sc-dev am: b4b35a8c38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758319

Change-Id: I414fa4bc7c652afb52a1a351958497558b373107
2021-06-02 08:23:47 +00:00
Stanley Wang
b4b35a8c38 Merge "SettingsMainSwitchPreference should display the restricted icon if it is restricted." into sc-dev 2021-06-02 08:05:57 +00:00
TreeHugger Robot
978ce53b58 Merge "Apply sliding transition to trust agent." into sc-dev am: fffda8de08 am: 6907efdb72 am: eadbf50bc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786716

Change-Id: I4a7c4f244b82affe3281363ae7f230172a5c5334
2021-06-02 07:22:55 +00:00
Menghan Li
c2af625d7c Merge "Fix the link text "Learn more" in the accessibility pages with help links could not convey the link's purpose clearly" into sc-dev am: 58ed6a90fe am: 884fcfd72d am: c3e83e5106
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702759

Change-Id: I2b553dc0ce8a50c932442828258a65338b8d39c5
2021-06-02 07:22:28 +00:00
TreeHugger Robot
6907efdb72 Merge "Apply sliding transition to trust agent." into sc-dev am: fffda8de08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786716

Change-Id: I55955cecac9a24349642b66e6b3df22d4184ad8c
2021-06-02 06:46:50 +00:00
Menghan Li
884fcfd72d Merge "Fix the link text "Learn more" in the accessibility pages with help links could not convey the link's purpose clearly" into sc-dev am: 58ed6a90fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702759

Change-Id: I8bcf4f0e66af8513618609f83a9bcbb4761a1dde
2021-06-02 06:46:32 +00:00
TreeHugger Robot
fffda8de08 Merge "Apply sliding transition to trust agent." into sc-dev 2021-06-02 06:39:03 +00:00
Menghan Li
58ed6a90fe Merge "Fix the link text "Learn more" in the accessibility pages with help links could not convey the link's purpose clearly" into sc-dev 2021-06-02 06:26:00 +00:00
Bonian Chen
2519bec539 Merge "[Settings] Connected carrier should not be forbidden ones" 2021-06-02 05:12:40 +00:00
Les Lee
67fa425454 Merge "wifi: Use new API for data usage function" into sc-dev am: 5246f75bda am: 371ffdc357 am: e56e94b7a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786726

Change-Id: I14f79f84f729dd24e16d92a6fa16440080215f0e
2021-06-02 04:47:38 +00:00
Les Lee
371ffdc357 Merge "wifi: Use new API for data usage function" into sc-dev am: 5246f75bda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786726

Change-Id: If484e7e529af0041a49c4aa98f693d654669567c
2021-06-02 04:01:13 +00:00
Les Lee
5246f75bda Merge "wifi: Use new API for data usage function" into sc-dev 2021-06-02 03:37:54 +00:00
TreeHugger Robot
9b69294dd5 Merge "Fix biometric content overlap with top/bottom bars" into sc-dev am: 9a839db046 am: 46857865b4 am: baed387430
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14752842

Change-Id: I599c29389a9497c3dfd8c8f12e46e5b26e5dc9b5
2021-06-02 03:26:53 +00:00
TreeHugger Robot
46857865b4 Merge "Fix biometric content overlap with top/bottom bars" into sc-dev am: 9a839db046
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14752842

Change-Id: I1a69824d9b40d667f184d6583540d1fc455d16b3
2021-06-02 02:35:58 +00:00
Curtis Belmonte
af149b11fc Fix biometric content overlap with top/bottom bars
Sets a solid background for the status and footer bar shown on each of
the biometric enroll introduction screens, to prevent the content from
showing through.

Test: Manually tested face and fingerprint enrollment

Fixes: 189075189
Change-Id: I1a41dc911c5ac7ded94e33b25a9c0e990e93ba3f
2021-06-01 18:11:12 -07:00
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
1744af0d97 Merge "Further refactoring on ActionDisabledByAdminDialog classes." into sc-dev am: 9e1e5ddb72
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14700128

Change-Id: Id99262a605c0318b07a1844ed5e42ae02e1159f5
2021-06-01 20:24:48 +00:00
TreeHugger Robot
9e1e5ddb72 Merge "Further refactoring on ActionDisabledByAdminDialog classes." into sc-dev 2021-06-01 20:13:24 +00:00
Bonian Chen
696c9b7335 [Settings] Connected carrier should not be forbidden ones
Manual network selection UI tried to display connected carrier as
initial list prior to the initial response from network scan.
However, the detection of connected carrier could be incorrect.

Before having an architectural change for this part, adding a piece of
code to avoid from displaying carriers which should be avoided.

Bug: 165158590
Test: local
Change-Id: If9c0804c706dd77a1c690555b245425dfeaf1fa9
2021-06-01 22:48:17 +08:00
lesl
5012cef58f wifi: Use new API for data usage function
For mobile, a old API: buildTemplateMobileAll doesn't includes the
merged wifi network, call the new API: buildTemplateCarrierMetered
to replace the old one.

PS: Not only usage functionality but also apply to network policy
control since the default policy is changing to use
new API: buildTemplateCarrier now.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsDumpServiceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageLibTest
Test: Manual Test, modify the mobile usage warming and limit bytes and
      check the data via adb shell dumpsys netpolicy

Bug: 176396812
Merged-In: I6fbec14e7be4dc4b5c2fd3659a801521c81b233c
Change-Id: I6fbec14e7be4dc4b5c2fd3659a801521c81b233c
2021-06-01 10:34:10 +00:00
Yi-Ling Chuang
e7c769fe02 Apply sliding transition to trust agent.
- Also rename the extra of page transition.
- Remove useless code while starting activity from fragment.

Bug: 187542491
Test: robotest and manually went through trust agent flow.
Change-Id: I55419f23db7fa77281039e642bde5558c17dce0f
2021-06-01 16:39:13 +08:00
TreeHugger Robot
31b761bcb5 Merge "Fix truncated in USB preference" into sc-dev am: 11fa4d3275 am: 9ab0dd4937 am: 8e74766d56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733199

Change-Id: I492f59c071299531edf8eb6d9d8044e671e240c7
2021-06-01 06:53:25 +00:00
TreeHugger Robot
f788dfbd50 Merge "Fix flickering in USB page" into sc-dev am: f10ecb43d1 am: b76636a072 am: a889fb5938
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732236

Change-Id: Iffb24aa55fdcd5c7e2ae6586053b232172a2fd09
2021-06-01 06:52:58 +00:00
TreeHugger Robot
8e74766d56 Merge "Fix truncated in USB preference" into sc-dev am: 11fa4d3275 am: 9ab0dd4937
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733199

Change-Id: I9870347d0aae7f7e62e209ed594238878a4235d4
2021-06-01 06:30:02 +00:00
TreeHugger Robot
a889fb5938 Merge "Fix flickering in USB page" into sc-dev am: f10ecb43d1 am: b76636a072
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732236

Change-Id: I2baab0034cef0b9a101992f069b47f90563d3747
2021-06-01 06:29:41 +00:00
TreeHugger Robot
ca556200dd Merge "Fix truncated in USB preference" into sc-dev am: 11fa4d3275
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733199

Change-Id: I233c7b93226b74843701e00257f78bd506d2af1d
2021-06-01 06:05:56 +00:00
TreeHugger Robot
e0e7d99217 Merge "Fix flickering in USB page" into sc-dev am: f10ecb43d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732236

Change-Id: I7d38220054f0caf0ca4d0dc4c78a8d971d37fa44
2021-06-01 06:05:27 +00:00
TreeHugger Robot
11fa4d3275 Merge "Fix truncated in USB preference" into sc-dev 2021-06-01 05:44:48 +00:00
TreeHugger Robot
f10ecb43d1 Merge "Fix flickering in USB page" into sc-dev 2021-06-01 05:44:35 +00:00
Ryan Lin
3075efea8e Merge "Fix number localization in the strings.xml" into sc-dev am: 4abbe80385 am: 8a6272e933 am: 30f93b4e49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14673570

Change-Id: Ia3a554697cad200c0a1940345c6e59d05317737b
2021-06-01 04:10:38 +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
Ryan Lin
8a6272e933 Merge "Fix number localization in the strings.xml" into sc-dev am: 4abbe80385
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14673570

Change-Id: Ie71443e570322eda388a9903d059767c73ad59cb
2021-06-01 03:21:10 +00:00
Ryan Lin
4abbe80385 Merge "Fix number localization in the strings.xml" into sc-dev 2021-06-01 02:59:06 +00:00
Zoey Chen
fe8f6a1c99 Merge "[ProviderModel] Use category to separate physical SIM and e-SIM" into sc-dev am: c968a80ff6 am: 67551e8dd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732243

Change-Id: I3eb65cd4c03278f578d8582cf5cb7f31d83e2742
2021-06-01 02:58:59 +00:00
Zoey Chen
3e550d6aa4 Merge "[ProviderModel] Use category to separate physical SIM and e-SIM" into sc-dev am: c968a80ff6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732243

Change-Id: I2f58093c3eed72c5a7505b21107649e071b22e24
2021-06-01 02:34:02 +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
TreeHugger Robot
ed6c25eefe Merge "Reduce flickers when launching Storage Settings" into sc-dev am: 0462ffaffc am: c73a8cff20 am: 29671a86d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716098

Change-Id: Id4df6e798f2192d49e77aa80cffa9ccb51e74eb0
2021-05-31 15:09:49 +00:00
TreeHugger Robot
c73a8cff20 Merge "Reduce flickers when launching Storage Settings" into sc-dev am: 0462ffaffc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716098

Change-Id: Ica0382ee70461df52b380225ef1cae67a5b09684
2021-05-31 14:32:16 +00:00
TreeHugger Robot
0462ffaffc Merge "Reduce flickers when launching Storage Settings" into sc-dev 2021-05-31 14:16:05 +00:00
Bonian Chen
ca83d9e631 Merge "[Settings] Code refactor - NetworkSelectSettingsTest" 2021-05-31 13:45:07 +00:00
Arc Wang
96b6106f2f Reduce flickers when launching Storage Settings
This change remove unnecessary UI dpdate of
StorageItemPreferenceController.

- For StorageItemPreferenceController:
  Remove UI update at #displayPreference since onLoadFinished will update.
  Don't update order at #setVolume since onLoadFinished will update.

- StorageDashboardFragment & StorageCategoryFragment update
  StorageItemPreferenceController only when both StorageInfo
  and StorageResult are loaded.

Bug: 185547228
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.
      manual visual
Change-Id: Id449003827a3e340e7a90f706152100b5568f834
2021-05-31 12:48:02 +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
TreeHugger Robot
6295f2de09 Merge "Disable preference list animation for Internet Settings" into sc-dev am: 3117d90824 am: 22ccfbf871 am: 998e8d3b21
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14772150

Change-Id: I0e8f3c1b8c3f3eec9f87f448361e067d902e11c8
2021-05-31 09:24:28 +00:00
Galia Peycheva
dfa53ca32f Merge "Repurpose the blurs dev option for window blurs" into sc-dev am: 13caa482bb am: 9573d307b5 am: 8428945580
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14734469

Change-Id: Ia8cdcf7280413cfc8ad50316ae34ccae077d3245
2021-05-31 09:23:51 +00:00
TreeHugger Robot
44749172ab Merge "[Provider model] Update the Wi-Fi icons in the Settings" into sc-dev am: 567e29adf0 am: 1e0d173f8b am: bb2ec3777b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733191

Change-Id: Ie85a8214e58d584f3d3f4fb79b6ab6fd6e5adb64
2021-05-31 09:23:25 +00:00
TreeHugger Robot
22ccfbf871 Merge "Disable preference list animation for Internet Settings" into sc-dev am: 3117d90824
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14772150

Change-Id: I66c7d479141ec27fd0a5a146453b579f7c998a70
2021-05-31 09:08:19 +00:00
Galia Peycheva
891105fecd Merge "Repurpose the blurs dev option for window blurs" into sc-dev am: 13caa482bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14734469

Change-Id: I5280c940caf92d42c79da49b930ad2a45a503113
2021-05-31 09:08:13 +00:00
TreeHugger Robot
b41d62aa68 Merge "[Provider model] Update the Wi-Fi icons in the Settings" into sc-dev am: 567e29adf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733191

Change-Id: I9f558139273cec1919b58f69fc841b50644d25ee
2021-05-31 09:07:43 +00:00