Janis Danisevskis
48e5f318db
Merge "Keystore 2.0: Remove references to Keystore 1.0" am: 7aa99fe966
am: c90b511239
am: a308ea1915
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624590
Change-Id: I49cad17eab31b7531cb710915cbc57accd894598
2021-03-23 14:10:20 +00:00
SongFerng Wang
ce8ecb5ca9
[automerger skipped] Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am: 5292baf810
am: d1278a3d3d
am: 8722e00b4a
-s ours
...
am skip reason: skip tag Change-Id I9d2abe1abe3082267ed64b71602d8ada21c95c6c with SHA-1 1dcc788177
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645427
Change-Id: I9f1bf7edff62c29730ded4f6cd83626f53a4c873
2021-03-23 13:56:48 +00:00
Bonian Chen
49da45d973
Merge "[Settings] Rollback design for getSystemService(String)" am: 7a8463dbf8
am: de520dd11a
am: 1f5c043b0c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1648047
Change-Id: I39c189e576ac4fb42d722936f65ea03580793f6b
2021-03-23 13:55:43 +00:00
Bonian Chen
836b5bb4d1
[automerger skipped] Merge "[Settings] Convert to getSystemService(Class<T>)" am: 13fb77c652
am: 70f887af52
am: f9f2fe3f84
-s ours
...
am skip reason: skipped by user bonianchen
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645152
Change-Id: Ib85316b2193f4056f8818d98ae9899fd5c5c783a
2021-03-23 13:52:50 +00:00
Bonian Chen
6a4d7b65d0
Merge "[Settings] Support getSystemService(Class<T>)" am: 513da92357
am: 5734490d23
am: 8cd695efea
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639943
Change-Id: I905f9d1646a9d9ea70e42c4b5368ff983611bee3
2021-03-23 13:52:46 +00:00
Jeff Sharkey
89a1c7bfc0
Request new Bluetooth runtime permissions. am: 9e07eab08f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13956086
Change-Id: I8517c50feb1d53bc018d8b1a748c4c72469fb4b3
2021-03-23 13:10:31 +00:00
Arc Wang
711008eb2c
Add Strings for Storage Settings
...
Bug: 170918505
Test: build pass
Change-Id: If977e93087602946163726b47c737f2a36b0bb38
2021-03-23 20:57:31 +08:00
Jeff Sharkey
9e07eab08f
Request new Bluetooth runtime permissions.
...
An upcoming platform change is introducing a new "Nearby devices"
runtime permission which contains the new BLUETOOTH_CONNECT and
BLUETOOTH_SCAN permissions.
We have logic in place to use <split-permission> to translate the
older BLUETOOTH and BLUETOOTH_ADMIN permissions into these new
runtime permissions, but modern apps will need to pivot to
requesting them directly as part of targeting Android S.
This change requests both the old and new permissions to avoid
breakage while the new permission enforcement is being phased in.
Bug: 181813006
Test: atest CtsPermission2TestCases
Test: atest CtsPermission3TestCases
Test: atest CtsStatsdAtomHostTestCases
Change-Id: I0a6ff040520deaa7c7a6fecd83e8608a9bf28c4a
2021-03-23 12:35:36 +00:00
Alex Johnston
46c72f3cac
Settings: Disable USB preferences if USB signaling is off
...
* When developer options is turned
off and on again, 'Default USB
configuration' and 'Disable USB
audio routing' should not be enabled
if USB data signaling is disabled.
Manual testing:
* Disable USB data signaling
* Verify preferences are disabled
* Turn developer options off and on
* Verify preferences remain disabled
Bug: 180711035
Test: manual testing
make RunSettingsRoboTests -j ROBOTEST_FILTER=UsbAudioRoutingPreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=DefaultUsbConfigurationPreferenceControllerTest
Change-Id: Id08228da812b7534e2217b0c3f30a7ac989f7553
2021-03-23 11:43:28 +00:00
Wesley.CW Wang
201445f80a
Remove Battery Settings page default tips am: 3a52e335be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13922078
Change-Id: I78509dc0c432c3b0f122560aa1718feb89535d3b
2021-03-23 09:05:19 +00:00
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
3032c9409d
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: Id3021983d45bd79459b6e059101ba0478f88cd19
2021-03-23 08:40:06 +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
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