Wesley.CW Wang
3a52e335be
Remove Battery Settings page default tips
...
- Remove SummaryTips from default tips
- Clean up test file import
Screenshot: https://screenshot.googleplex.com/6rYrnMvoTbeCS7m.png
Bug: 183079415
Test: make RunSettingsRoboTests -j40
Change-Id: I1001d75235a6d8d5947b974939884103eb0834da
2021-03-23 08:44:42 +00:00
Weng Su
8d073e588e
Merge "[Provider Model] Remove unused strings." into sc-dev am: f732a95ffd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13960249
Change-Id: I6680990e0c8c049a02f13c2348089a35e7dca5f6
2021-03-23 08:42:04 +00:00
Jeremy Goldman
ab8eeca966
Gear Preference on VPN page includes subtitle if the vpn is an insecure
...
type
Test: atest SettingsUnitTests
Screenshot: https://screenshot.googleplex.com/BWfUf6hcHNnbLvH
Bug: 176821216
Change-Id: I2bee3ba100bfe636221264492a2ce98b6a664cd5
Merged-In: I2bee3ba100bfe636221264492a2ce98b6a664cd5
(cherry picked from commit 3922249709 )
2021-03-23 08:38:12 +00:00
Jeremy Goldman
8deea775df
Warning / Info icon added for the VPN Preference
...
Within the Provider Model, we would like to show a warning icon if the
user is detected to be using an insecure vpn type. This adds an icon for
that warning, and an imageview containing that layout to settings
Icon: https://screenshot.googleplex.com/644ZsGtVDp6hgZq
Bug: 176821216
Test: atest SettingsUnitTests
Change-Id: I59fd7765876fe58fe2c55929f711c04a45abbe09
Merged-In: I59fd7765876fe58fe2c55929f711c04a45abbe09
(cherry picked from commit a7774a10e0 )
2021-03-23 08:37:29 +00:00
Jeremy Goldman
222dd91102
Legacy VPN Configuration Dialog includes error message if VPN is an
...
insecure type.
Screenshot: https://screenshot.googleplex.com/53pAJuhTDLJW4Em
Bug: 176821216
Test: atest SettingsUnitTests
Change-Id: I528d46654a39df04b647d6d0137aaf80e7adb05c
Merged-In: I528d46654a39df04b647d6d0137aaf80e7adb05c
(cherry picked from commit 5d92ad5232 )
2021-03-23 08:37:11 +00:00
Weng Su
f732a95ffd
Merge "[Provider Model] Remove unused strings." into sc-dev
2021-03-23 07:47:22 +00:00
TreeHugger Robot
688ba7f845
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 2103dda97c -s ours am: 006b8db0b6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13954932
Change-Id: I1441e64e570b3096cf1cf971f0a424ba2dd7acf1
2021-03-23 06:11:45 +00:00
TreeHugger Robot
006b8db0b6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 2103dda97c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13954932
Change-Id: I519f38b3ea945dbc1cae1e5c03add21fcde2ac0d
2021-03-23 05:54:09 +00:00
Bill Yi
0b57a96e07
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1d35aad4e -s ours am: 2a7ebaab5f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13954933
Change-Id: Ib5fbf228851ad460e637f291fa7f2a63b67ddef9
2021-03-23 05:50:38 +00:00
Bill Yi
2a7ebaab5f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1d35aad4e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13954933
Change-Id: Ic5ed73173223c443a9fe48e3eeabc9ce60ea4724
2021-03-23 05:31:12 +00:00
Bonian Chen
115c422b8b
Merge "[Settings] Fix divide by zero in data usage UI" into sc-dev am: 238ad87750
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13946308
Change-Id: I5377a826b8332f90426b119f04908ea4e72cff10
2021-03-23 05:27:47 +00:00
TreeHugger Robot
5d8e7a260d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 21802a4598 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13955150
Change-Id: Ifc47e9e3a24a3bf4165bfa9e69b2bdd92e6ba6b9
2021-03-23 05:08:28 +00:00
Bill Yi
0369e03b49
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 01da19f6a4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13955147
Change-Id: I68e59e49c7642acd59eb289437174bd5bee606f3
2021-03-23 05:08:23 +00:00
TreeHugger Robot
2103dda97c
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-03-23 05:05:47 +00:00
Bonian Chen
238ad87750
Merge "[Settings] Fix divide by zero in data usage UI" into sc-dev
2021-03-23 04:50:54 +00:00
TreeHugger Robot
21802a4598
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-03-23 04:35:07 +00:00
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
Michael Wachenschwanz
b221381fa8
Add MobileRadio/Gnss MeasuredBatteryConsumpter methods to FakeUid
...
Bug: 174818228
Test: builds
Change-Id: I783adb7a6e9f8bc01d656113bb1d637eb18dae6f
2021-03-22 18:35:35 -07: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