PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,014 Commits 1 Branch 0 Tags
6b7ae6b75e5cd50f9798929780fb73b51fcee6c7
Commit Graph

81014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
94746cbba4 [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: If4c9841b749fc1e88a37930340ee8b186e72e05b
 2021-03-23 06:11:25 +00:00
Jeremy Goldman
8242542559 Merge "Update string for editing an insecure VPN." 2021-03-23 05:57:13 +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
dd300c2fae [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: I06cf5b1b90de87fd1fdef5cfb6854fc46abedc14
 2021-03-23 05:50:11 +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
99e59b750d 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: Ib6bbfac4ff4566538f6de2a99b9fe7e8beb74fd9
 2021-03-23 05:26:48 +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
927481b88f 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: I2dcd5b6ee3d05af196c1bd46ca00ce29e3e54d13
 2021-03-23 03:52:28 +00:00
Weng Su
7d014ffba6 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: I00bb8802a22b50833dd244a9517a01f7f659ab9a
 2021-03-23 03:51:51 +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
Jeremy Goldman
ec4b612932 Update string for editing an insecure VPN. 
The new string comes from the connectivity s strings document: https://screenshot.googleplex.com/9nQFc9PFwgCYCFV
Test: atest -c SettingsUnitTests
Bug: 176821216

Change-Id: I3392c24fd158199f26da2508f1bad1fbf858fe28

Change-Id: I76257a4a2c2b9d5a49248296676d98980be9d77c
 2021-03-23 10:48:39 +08:00
Jeremy Goldman
18acf73b5f Merge "Unit tests for the VpnInfoPreference." 2021-03-23 02:38:24 +00:00
Jeremy Goldman
af7371cdcb Merge "Legacy VPN Configuration Dialog includes error message if VPN is an insecure type." 2021-03-23 02:38:05 +00:00
Bill Lin
2bd88c6513 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: I48372fe8a551f218a6636e381b47c823dcb5b5ee
 2021-03-23 01:52:06 +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
44eb1ac369 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3c9dfb3e9de75b40f7b7ac1c662e0071fec807c7
 2021-03-22 22:30:12 +00: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
1f160cf666 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: Ic9949bb8a11addd5742b856c65ef883f65b71e55
 2021-03-22 20:54:11 +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
Sally Yuen
b35c405705 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: I6db7640c76e6a9f86674e685b229e9f926115b42
 2021-03-22 19:24:25 +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
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
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
SongFerng Wang
6274dd765b [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: I0bcc53c2eb2194521e64eff5148b1d2966424538
 2021-03-22 13:53:03 +00: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