Commit Graph

80613 Commits

Author SHA1 Message Date
Janis Danisevskis
a308ea1915 Merge "Keystore 2.0: Remove references to Keystore 1.0" am: 7aa99fe966 am: c90b511239
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624590

Change-Id: I590f53d3a4c1b6ad9c4bdb27f04103ccfba7e7af
2021-03-23 04:09:47 +00:00
Weng Su
5b6f1a0910 Merge "[Provider Model] Bring back the "turn on Wi-Fi automatically" option" into sc-dev am: b30db25d8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13946493

Change-Id: Iddec8c1786121282291314217ceaa2a43e07dc32
2021-03-23 03:53:12 +00:00
Weng Su
c05d21e2fa Merge "[Provider Model] Update Internet preference summary" into sc-dev am: 5ac8414834
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13946630

Change-Id: I7c9f89b4c4c9b074b4a7941b6bb4bdde0a51cc6d
2021-03-23 03:51:43 +00:00
Janis Danisevskis
c90b511239 Merge "Keystore 2.0: Remove references to Keystore 1.0" am: 7aa99fe966
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624590

Change-Id: I75e8e09c230cfb805ab3b2d6699aca2cd2514eac
2021-03-23 03:51:26 +00:00
Weng Su
22339eb505 [Provider Model] Remove unused strings.
Bug: 183459230
Test: build passed
Change-Id: I4ca000659172e568245c7a431f571be3d83e50e0
2021-03-23 11:40:36 +08:00
Weng Su
b30db25d8c Merge "[Provider Model] Bring back the "turn on Wi-Fi automatically" option" into sc-dev 2021-03-23 03:24:18 +00:00
Weng Su
5ac8414834 Merge "[Provider Model] Update Internet preference summary" into sc-dev 2021-03-23 03:21:08 +00:00
Janis Danisevskis
7aa99fe966 Merge "Keystore 2.0: Remove references to Keystore 1.0" 2021-03-23 03:14:28 +00:00
Bill Lin
d254c017ab Merge "2/ Set Swipe bottom for notification OFF by default" into sc-dev am: 9f046e55b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13856783

Change-Id: I7323e8bf232f3304c00749f47ac9b455644bc0c6
2021-03-23 01:51:49 +00:00
Bill Lin
9f046e55b6 Merge "2/ Set Swipe bottom for notification OFF by default" into sc-dev 2021-03-23 01:22:38 +00:00
Dmitri Plotnikov
3b5c5f0d7c Change getStatsStartRealtime to getStatsStartTimestamp
Bug: 183434301
Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests
Change-Id: Ic86a04a91d910c863706a0f799c757dcd7c5262d
2021-03-22 15:51:21 -07:00
Bill Yi
927aaac8f6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1948338eeed22ea232872da2e8ecfc80c86fd5a2
2021-03-22 21:34:18 +00:00
Bill Yi
01da19f6a4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icad99664d1ec79ef02031537bb9a1ca851641757
2021-03-22 21:04:30 +00:00
Peter Kalauskas
f86a127e30 Merge "Introduce guest user metrics" into sc-dev am: 01f77d8e00
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13935767

Change-Id: I24f8f53534dcb54a69c87d2fe795e669e9256d2f
2021-03-22 20:54:07 +00:00
Janis Danisevskis
75a91836e7 Keystore 2.0: Remove references to Keystore 1.0
Test: N/A
Bug: 171305684
Change-Id: I8b50c024e919d5b98348b792e0769c510ff1a33d
2021-03-22 13:35:53 -07:00
Peter Kalauskas
01f77d8e00 Merge "Introduce guest user metrics" into sc-dev 2021-03-22 20:17:20 +00:00
Bill Yi
a1d35aad4e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I77c6e5117bcfaeac74a85a013190873900e7501d
2021-03-22 20:08:20 +00:00
Bill Yi
5dc25d8afa Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I69f56fb22074981f0776f0f8b76e98ea83a14d3f
2021-03-22 19:38:12 +00:00
SongFerng Wang
8722e00b4a Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am: 5292baf810 am: d1278a3d3d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645427

Change-Id: I2618da0e75674e7c3c878f5aee50278ac0c0e76a
2021-03-22 19:34:15 +00:00
SongFerng Wang
d1278a3d3d Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am: 5292baf810
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645427

Change-Id: I9acfb31454bc8d63480adc64311717c07715d6f0
2021-03-22 19:22:27 +00:00
Sally Yuen
1199304fde Merge "Reduce RBC test flakiness" into sc-dev am: 1908c5357c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13919447

Change-Id: I9e160c50ba586bfb4ae468c81cdecd89a95a49aa
2021-03-22 19:20:55 +00:00
SongFerng Wang
5292baf810 Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" 2021-03-22 19:06:48 +00:00
Bonian Chen
0880675414 [Settings] Fix divide by zero in data usage UI
Data usage UI got divide by zero exception when zero data usage.

Bug: 182822862
Test: local
Change-Id: Ibe57034e7d441e94c0529cb76f1a16665aaacff6
2021-03-22 17:10:00 +00:00
Sally Yuen
1908c5357c Merge "Reduce RBC test flakiness" into sc-dev 2021-03-22 16:27:49 +00:00
Weng Su
bec3144c11 [Provider Model] Bring back the "turn on Wi-Fi automatically" option
- Screenshot:
  https://screenshot.googleplex.com/92uXX6KQCqWxvub

Bug: 182620666
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiWakeupPreferenceControllerTest

Change-Id: Ic0ce47a6d9a374fce9752d67a9c2d083486b9083
2021-03-22 22:28:55 +08:00
SongFerng Wang
4c8c8011ad [automerger skipped] Merge "Change the behavior of notifyAllowedNetworkTypesChanged." am: 3ac3cce15b am: b3f2e9090a am: 34c8d35cd3 -s ours am: 2160d5fc4c -s ours
am skip reason: skip tag Change-Id Ic94816415920bf25896ef2b198e228f369039c94 with SHA-1 4ccbe5d785 is already in history

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

Change-Id: Ib430158f3cac38c2a922eccece14b567a35eee29
2021-03-22 14:12:13 +00:00
Weng Su
784eb94a14 [Provider Model] Update Internet preference summary
- Show "Networks available" summary instead of "Not connected" when no
network connected

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

Bug: 182244261
Test: manual test
atest -c InternetPreferenceControllerTest

Change-Id: If32f656d7d89a8b19c4da4876ccc0d1cf92262a0
2021-03-22 22:01:55 +08:00
Bonian Chen
1f5c043b0c Merge "[Settings] Rollback design for getSystemService(String)" am: 7a8463dbf8 am: de520dd11a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1648047

Change-Id: I88dff2ed3675305469015351c54272ea6a0d1854
2021-03-22 13:01:19 +00:00
Bonian Chen
de520dd11a Merge "[Settings] Rollback design for getSystemService(String)" am: 7a8463dbf8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1648047

Change-Id: Ib628d337f511f67b88f34f6ef426d21a6176d817
2021-03-22 12:40:43 +00:00
SongFerng Wang
2160d5fc4c [automerger skipped] Merge "Change the behavior of notifyAllowedNetworkTypesChanged." am: 3ac3cce15b am: b3f2e9090a am: 34c8d35cd3 -s ours
am skip reason: skip tag Change-Id Ic94816415920bf25896ef2b198e228f369039c94 with SHA-1 4ccbe5d785 is already in history

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

Change-Id: I7cd5fd91bf1fe1d784df2d2082274adb32b5e754
2021-03-22 12:29:12 +00:00
Bonian Chen
7a8463dbf8 Merge "[Settings] Rollback design for getSystemService(String)" 2021-03-22 11:57:51 +00:00
Arc Wang
9ab633a115 Merge "Only show storage category stats preferences for private volumes" into sc-dev am: e98a5a9932
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13922070

Change-Id: Id4fc14c0178e6293e0b9464eb05292e32b2540a6
2021-03-22 11:42:15 +00:00
Arc Wang
e98a5a9932 Merge "Only show storage category stats preferences for private volumes" into sc-dev 2021-03-22 11:06:47 +00:00
Alex Johnston
ce854a3f00 Merge "Allow enabled IMEs to be disabled in Settings" into sc-dev am: caf50d1203
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13676765

Change-Id: I80cb8cc14083da4efb17fa0b6c2f6ede29321dc2
2021-03-22 09:55:21 +00:00
Bonian Chen
0fd51cc9ea [Settings] Rollback design for getSystemService(String)
Some of the design are intented for getSystemService(String).
Rollback those items.

Bug: 179640862
Test: local
Change-Id: I581070afb380a86c6352322f927c269b4527aee9
2021-03-22 09:44:22 +00:00
Bonian Chen
f9f2fe3f84 Merge "[Settings] Convert to getSystemService(Class<T>)" am: 13fb77c652 am: 70f887af52
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645152

Change-Id: I89fa2de521bb07911f0c7ee0122ba3b2cb062fab
2021-03-22 09:36:16 +00:00
Bonian Chen
8cd695efea Merge "[Settings] Support getSystemService(Class<T>)" am: 513da92357 am: 5734490d23
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639943

Change-Id: I2630ee28b766890d36bbc4c360eeb19d07ef73d7
2021-03-22 09:36:14 +00:00
Alex Johnston
caf50d1203 Merge "Allow enabled IMEs to be disabled in Settings" into sc-dev 2021-03-22 09:26:27 +00:00
Bonian Chen
70f887af52 Merge "[Settings] Convert to getSystemService(Class<T>)" am: 13fb77c652
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645152

Change-Id: I3c76b1bf371a7bd8ecaea8b8c23a4a908e8b2c06
2021-03-22 08:56:33 +00:00
Bonian Chen
5734490d23 Merge "[Settings] Support getSystemService(Class<T>)" am: 513da92357
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639943

Change-Id: Id7a6f8c0c21d2bf5112a91554f608974586588c1
2021-03-22 08:56:21 +00:00
Arc Wang
40396d532f Only show storage category stats preferences for private volumes
Hide it because there is no framework API to get storage
category stats of public volumes.

Bug: 174964885
Test: manual
      Observe storage settings UI of a USB flash drive.
Change-Id: I7272cd18c186793f86548a87b5cb88bb957ff8d5
2021-03-22 16:28:59 +08:00
Bonian Chen
13fb77c652 Merge "[Settings] Convert to getSystemService(Class<T>)" 2021-03-22 08:18:59 +00:00
Bonian Chen
513da92357 Merge "[Settings] Support getSystemService(Class<T>)" 2021-03-22 08:18:59 +00:00
SongFerng Wang
b5ae2b77e0 Merge "Provider model CarrierItem's subtitle show no connection" into sc-dev am: 826a146c20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13922069

Change-Id: I4ec2add867289736d1dd8b6dc2147bb26ff24a9b
2021-03-22 08:15:21 +00:00
SongFerng Wang
826a146c20 Merge "Provider model CarrierItem's subtitle show no connection" into sc-dev 2021-03-22 07:45:20 +00:00
SongFerngWang
e88740eae2 KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray
Bug: 179814490
Test: build pass
Change-Id: I9d2abe1abe3082267ed64b71602d8ada21c95c6c
Merged-In: I9d2abe1abe3082267ed64b71602d8ada21c95c6c
2021-03-22 07:17:22 +00:00
SongFerngWang
fb2a1d9db9 Provider model CarrierItem's subtitle show no connection
CarrierItem's subtitle show no connection when Wi-Fi
off + no service

Bug: 182433548
Test: atest ProviderModelSliceTest
atest ProviderModelSliceHelperTest
atest NetworkProviderWorkerTest
atest InternetConnectivityPanelTest
make RunSettingsRoboTests -j

Change-Id: I04778cf2b184c0a75dc6999ffde011a9ad5e0690
2021-03-22 14:21:55 +08:00
Bonian Chen
db6c47756d [Settings] Convert to getSystemService(Class<T>)
Change to getSystemService(Class<T>) to align the capability with framework
part.

Bug: 179640862
Test: local
Change-Id: I1b4812044fc4876bec6645570049a60f9470dbbd
2021-03-22 06:20:19 +00:00
Tiffany Nguyen
acb4af4636 Add new battery settings feature provider. am: 34fb874647
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13915239

Change-Id: Idd684834fc96f0793097d771973c5cc7f62b2ccc
2021-03-22 05:46:15 +00:00
Tiffany Nguyen
34fb874647 Add new battery settings feature provider.
Test: No-op class
Bug: 181827863

Change-Id: Iafd4c6128ba63d3c794c076edaaa7638e3de3a42
2021-03-22 05:22:38 +00:00