Commit Graph

80621 Commits

Author SHA1 Message Date
Alex Johnston
6469518bf3 Cred mng app settings - close onRemove
Remove credential management app and close
settings screen when remove button is selected

Manual testing steps:
* Set app as creg mng app
* Remove cred mng app via Settings
* Verify screen is closed on remove

Bug: 177909523
Test: manual testing
Change-Id: Ie38a5340a4985fb4997f353556f49e9589e8da5f
2021-03-15 10:11:39 +00:00
Chiachang Wang
d709b55250 Merge "Replace the hidden getActiveLinkProperties usage" 2021-03-15 09:42:16 +00:00
George Chang
4d396f9580 Update subtext for require unlock for NFC
update nfc_secure_toggle_summary

Bug: 182384599
Test: check subtext
Change-Id: I06f11587f14d262727fcc293a73df4504f68c4f0
2021-03-15 17:33:21 +08:00
Chiachang Wang
fd1fa9c0a8 Replace the hidden getActiveLinkProperties usage
It's a refactor work to remove the hidden connectivity method
usages outside the incoming connectivity module.

CM#getActiveLinkProperties is hidden and no longer supported
outside the module. Caller should replace it with
CM#getLinkProperties(Network), so replace the usage as it is.

Bug: 172183305
Test: m
Change-Id: I20bcc9da97113da352e43a87d029596c9729cad8
2021-03-15 09:07:48 +00:00
Bill Yi
fe40f5c7d9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f062373bd -s ours am: 62fd4e850b -s ours am: 4cd2f79deb -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9c6cb49496d5f975ad2db7d7e45b7e7369d01d1
2021-03-15 07:40:34 +00:00
Bill Yi
4cd2f79deb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f062373bd -s ours am: 62fd4e850b -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I359662a106e00919d242612601d0fa19055c679a
2021-03-15 07:27:42 +00:00
TreeHugger Robot
3482ce65d2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 3bb6f3afa1 -s ours am: 1e90c63385 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9479f08b1b6fa038a31b73367dd4249448a4310
2021-03-15 07:23:40 +00:00
Bill Yi
e6eb753eca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c4a622b49 -s ours am: 1b13a3fc1a -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I79e3b6f2a6a8dfdd8546d54872487b2791cb0f83
2021-03-15 07:23:02 +00:00
TreeHugger Robot
1e90c63385 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 3bb6f3afa1 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad518d1e586e592527375f4a7ed7797515a8d7be
2021-03-15 07:07:16 +00:00
Bill Yi
1b13a3fc1a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c4a622b49 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I82d562515bf9c26ecb4ebca5759acb2b7a05688d
2021-03-15 07:06:56 +00:00
Bill Yi
62fd4e850b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f062373bd -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4f9a496b81acc2f2f31dab8546d6f2add2db1f75
2021-03-15 07:02:44 +00:00
TreeHugger Robot
cf05544a9d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d5ab407fce -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie698d453d400a2c28d7b1d3ca99e14e8bab59ab5
2021-03-15 07:00:22 +00:00
TreeHugger Robot
e8c6929fb6 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-03-15 06:58:36 +00:00
Betty Chang
ebea5200cb Add OWNER to network/datausage/wifi path
Change-Id: I30ca24ea0823378d18b39a2eae937378662f6c14
2021-03-15 06:39:14 +00:00
TreeHugger Robot
ee26b511ad Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-03-15 06:37:39 +00:00
TreeHugger Robot
3bb6f3afa1 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-03-15 06:35:45 +00:00
TreeHugger Robot
d5ab407fce Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-15 06:26:57 +00:00
tim peng
4c73082f9d Merge "Show advanced Bluetooth information in device detail page" into sc-dev am: 28d9db3c86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835806

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib01fa53298e2d44d08c3336a2c08d41a5caaee59
2021-03-15 05:50:55 +00:00
tim peng
28d9db3c86 Merge "Show advanced Bluetooth information in device detail page" into sc-dev 2021-03-15 05:26:45 +00:00
Jeremy Goldman
18b91319bd Merge changes I94a881df,I59fd7765
* changes:
  VpnPreferenceControllerTest converted to JUnit
  Warning / Info icon added for the VPN Preference
2021-03-15 04:44:40 +00:00
Jeremy Goldman
3922249709 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
2021-03-15 12:05:32 +08:00
Jeremy Goldman
7361f8557c VpnPreferenceControllerTest converted to JUnit
global settings string set to guarantee pre-test environment.
PreferenceManager and PreferenceScreen instantiated instead of mocks,
and mock preference inserted with getKey function overridden.

Bug: 176821216
Test: atest -c VpnPreferenceControllerTest
Change-Id: I94a881df13d1b35126de10f561d657136e4fed7f
2021-03-15 03:36:37 +00:00
Stanley Wang
b8ee1d15e2 Merge "Remove the non-translatable tags from MainSwitch titles." into sc-dev am: 9138b055d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849829

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If892607b6518347272d90dae404556a010ccfbc2
2021-03-15 03:26:12 +00:00
Jeremy Goldman
22b94fb3fd Add goldmanj to the Settings' vpn2 directory Owners file
Change-Id: I91f560230a5dde1014a18c3d3bd03d1ed6f91dd6
2021-03-15 03:20:32 +00:00
Jeremy Goldman
a7774a10e0 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
2021-03-15 11:06:15 +08:00
Stanley Wang
9138b055d2 Merge "Remove the non-translatable tags from MainSwitch titles." into sc-dev 2021-03-15 02:53:56 +00:00
Jason Hsu
f3c5400b19 Merge "Update the vector drawable for accessibility button preview preference" 2021-03-15 02:41:09 +00:00
jasonwshsu
96121b3f0d Update the vector drawable for accessibility button preview preference
Bug: 173940869
Test: manual test
Change-Id: Id24d1550e7c640a7fdbd752e3571296a7e6567d6
2021-03-15 02:39:46 +00:00
jasonwshsu
1a0e2b1be5 Remove the accessibility gesture tutorial dialog in system navigation
Accessibility gesture is replaced by the accessibility floating menu, remove the accessibility gesture tutorial dialog when choosing to use gesture navigation mode.

Bug: 173990914
Test: manual test
Change-Id: Iae5297747594fcc73fc9bc14537c8fdecb86b660
2021-03-15 02:39:37 +00:00
jasonwshsu
5fe2cdcf87 Update the dialog content for accessibility floating menu
Accessibility gesture is replaced by accessibility floating menu, related content in edit shortcut dialog and tutorial dialog are updated in this changelist.

Bug: 173990914
Test: manual test
Change-Id: Ie529fa8a1f8ee87ca1ec5611b35675cdfd762165
2021-03-15 02:39:27 +00:00
Tim Peng
90df1c9de1 Show advanced Bluetooth information in device detail page
-Apply new metadata on aosp/1596412

Bug: 182338346
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsHeaderControllerTest
make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedBluetoothDetailsHeaderControllerTest

Change-Id: Ic48ed9213111d0c6ec19b317d4c22e1400261706
2021-03-15 10:16:14 +08:00
TreeHugger Robot
8131f65703 Merge "Fix bluetooth settings will broadcast to anywhere when some cases" into sc-dev am: 70e508edd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13839798

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ca17ace2411223eea45fdb9cfca32fa0853d262
2021-03-15 02:01:59 +00:00
TreeHugger Robot
70e508edd4 Merge "Fix bluetooth settings will broadcast to anywhere when some cases" into sc-dev 2021-03-15 01:53:00 +00:00
Lucas Lin
d6e943144c Merge "Use getPrivateDnsMode() to get the value of private DNS" into sc-dev am: be164d0a55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13779500

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I515048404c3aa0ac616f1ad7f12581bf9a5a8537
2021-03-15 01:42:05 +00:00
Lucas Lin
be164d0a55 Merge "Use getPrivateDnsMode() to get the value of private DNS" into sc-dev 2021-03-15 01:00:25 +00:00
Bill Yi
464f6aa64c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic6dd705e34982d51bdd2648bc4f20646d7bd6aba
2021-03-14 22:14:01 +00:00
Bill Yi
de49feae60 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9888959e19cac6bc5c12e7ca04396cf3e074f591
2021-03-14 21:42:50 +00:00
Bill Yi
c9130edef7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie6541f8fa7e50b91c10d2e171e696a690f7c8c00
2021-03-14 20:40:56 +00:00
Bill Yi
5f062373bd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9c6912b3ddd71aeecf639f628f15d04723ffea1d
2021-03-14 19:39:14 +00:00
Bill Yi
0c4a622b49 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iccfaa49e229aeb8c5365144394c6fd2635ee2a91
2021-03-14 18:08:33 +00:00
Bill Yi
97e669d333 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iba69fb0c0a9d7edb15865e4444f8d558465ce2f4
2021-03-14 17:36:32 +00:00
Minche Li
869f92c092 Merge "Updates magnification settings string" into sc-dev am: 29ff0e0552
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815931

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4039523da9619ddc9e5efc763c296643496d6583
2021-03-14 02:32:58 +00:00
Minche Li
29ff0e0552 Merge "Updates magnification settings string" into sc-dev 2021-03-14 02:02:20 +00:00
Dmitri Plotnikov
656c67c01d Encapsulate BatterySipper and BatteryConsumer in BatteryEntry
Bug: 173745486
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryEntryTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.AdvancedPowerUsageDetailTest

Change-Id: I67ab825c25b85012b5713736db62e0beb4d98a16
2021-03-13 12:51:47 -08:00
Yanting Yang
7880411a96 Merge "Fix NPE for ConfigureNotificationSettings" into sc-dev am: d604ca93dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849827

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d82fe3b483f581f3786e3b6fb17cae83581ec35
2021-03-13 17:07:24 +00:00
TreeHugger Robot
0f3f0c33d8 Merge "Fix the issue of the repo upload hooking checker" into sc-dev am: f575da48e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849842

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia272c7d7dd79e2381b04c1433d16e65696464276
2021-03-13 17:07:17 +00:00
Yanting Yang
d604ca93dc Merge "Fix NPE for ConfigureNotificationSettings" into sc-dev 2021-03-13 16:56:29 +00:00
TreeHugger Robot
f575da48e5 Merge "Fix the issue of the repo upload hooking checker" into sc-dev 2021-03-13 16:40:53 +00:00
TreeHugger Robot
ef44fde1fd Merge "Move WiFi/Bluetooth scanning toggles to new pages" into sc-dev am: 041966442f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13812148

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c5c8efc52b855a9f92d010a244786c4f72b7787
2021-03-13 03:42:45 +00:00
TreeHugger Robot
041966442f Merge "Move WiFi/Bluetooth scanning toggles to new pages" into sc-dev 2021-03-13 02:35:13 +00:00