Lucas Lin
73c971a5af
Merge "Use getPrivateDnsMode() to get the value of private DNS" am: 159f261889
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620600
Change-Id: I2ce646a34a7fc521b42c221faadfe6779f1c5ca4
2021-03-16 08:06:34 +00:00
Lucas Lin
159f261889
Merge "Use getPrivateDnsMode() to get the value of private DNS"
2021-03-16 07:39:35 +00:00
TreeHugger Robot
00128511e0
Merge "Update settings for app hibernation" into sc-dev am: a922c902f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13762606
Change-Id: I70d1671e6934821af56b2564e943c5812979af1b
2021-03-16 06:27:50 +00:00
TreeHugger Robot
a922c902f6
Merge "Update settings for app hibernation" into sc-dev
2021-03-16 05:53:23 +00:00
Zhen Zhang
48bd52e091
Update settings for app hibernation
...
Created an preference in Apps & Notifcations page as the entry point for
apps that are hibernated. Also added a switch preference in AppInfo page
for users to exempt an app from hibernation.
Bug: 181172051
Test: HibernatedAppsPreferenceControllerTest;
HibernationSwitchPreferenceControllerTest;
AppInfoDashboardFragmentTest
Change-Id: I72a90ab391cd521150fc155a6d9c67c846b7360d
2021-03-15 21:34:46 -07:00
George Chang
e220ad779c
Merge "Update subtext for require unlock for NFC" into sc-dev am: 2d3fbae37a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13871570
Change-Id: If242016275a30a3cf598365cc9ea94ea2adec30e
2021-03-16 03:29:17 +00:00
George Chang
2d3fbae37a
Merge "Update subtext for require unlock for NFC" into sc-dev
2021-03-16 02:43:33 +00:00
Salud Lemus
0e0247e5e4
Undo making Image icon's visibility to GONE in Action Not Allowed Dialog for a financed device
...
Bug: 182839352
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=ActionDisabledByAdminDialogHelperTest
Change-Id: I42bb9ce9a624fa20cd755af2d323b4c4f94048f7
2021-03-16 01:42:07 +00:00
Abel Tesfaye
3f85039d97
Merge "Update auto-rotate UI to comply with guidelines" into sc-dev am: 833bf3eaf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13827308
Change-Id: Id8f1e7f47d808ebab7aea6c0b783cf17f582489c
2021-03-16 00:18:09 +00:00
Abel Tesfaye
833bf3eaf7
Merge "Update auto-rotate UI to comply with guidelines" into sc-dev
2021-03-15 23:52:26 +00:00
Salud Lemus
2ce6dc82b3
Update Device Admin Info Settings text for a financed device
...
Bug: 182804474
Test: Used a test device that is registered via ZT
Change-Id: Ia48e1767038f8dc3d8965ee30bc7aa9efaec59ef
2021-03-15 21:05:38 +00:00
Abel Tesfaye
ea7d718396
Merge "Fix auto-rotate summary not updating on devices without smart-auto-rotate" into sc-dev am: e12ad9777e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13842305
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I92f6be6e08d536316c124710cca445686deff007
2021-03-15 17:06:15 +00:00
Abel Tesfaye
e12ad9777e
Merge "Fix auto-rotate summary not updating on devices without smart-auto-rotate" into sc-dev
2021-03-15 16:27:16 +00:00
Alex Johnston
8ee5aacb52
Merge "Cred mng app settings - close onRemove" into sc-dev am: 74be0de267
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13872510
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id46a769de8ac464fdb78e84c15308ebacc1c0aa1
2021-03-15 13:47:49 +00:00
Alex Johnston
74be0de267
Merge "Cred mng app settings - close onRemove" into sc-dev
2021-03-15 13:33:47 +00:00
Treehugger Robot
e7f1f235c1
Merge "Add OWNER to network/datausage/wifi path" am: 56834d2ce3
am: c38b502c4a
am: f21b7ac120
am: e0c081b02e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635179
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I857f5e1fe7592c44222adc3b1b173d0779b163aa
2021-03-15 13:28:36 +00:00
Treehugger Robot
e0c081b02e
Merge "Add OWNER to network/datausage/wifi path" am: 56834d2ce3
am: c38b502c4a
am: f21b7ac120
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635179
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I422c40567fc90176cea5242494028d621c1656a5
2021-03-15 12:54:33 +00:00
Treehugger Robot
f21b7ac120
Merge "Add OWNER to network/datausage/wifi path" am: 56834d2ce3
am: c38b502c4a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635179
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If2ab0c8c81b6ba25a32bd41437c6a37cda9fc0e9
2021-03-15 12:12:13 +00:00
Chiachang Wang
c99a8f1b4b
Merge "Replace the hidden getActiveLinkProperties usage" am: d709b55250
am: 201429b683
am: 4589965ebd
am: 1516f4e8bb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635200
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I64cdf6696103d92b320926743afe42399d2e578d
2021-03-15 12:11:58 +00:00
Chiachang Wang
1516f4e8bb
Merge "Replace the hidden getActiveLinkProperties usage" am: d709b55250
am: 201429b683
am: 4589965ebd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635200
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I966ca888ce14550ac0b76bbcf59e4e50015d44c3
2021-03-15 11:33:25 +00:00
Treehugger Robot
c38b502c4a
Merge "Add OWNER to network/datausage/wifi path" am: 56834d2ce3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635179
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4d177c825df890a2d8947173e85ddd401e9f7361
2021-03-15 11:30:18 +00:00
Treehugger Robot
56834d2ce3
Merge "Add OWNER to network/datausage/wifi path"
2021-03-15 11:02:28 +00:00
Chiachang Wang
4589965ebd
Merge "Replace the hidden getActiveLinkProperties usage" am: d709b55250
am: 201429b683
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635200
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib0118ce1ed80dd4b672e98f8a7a905d42462f24f
2021-03-15 10:51:50 +00:00
Chiachang Wang
201429b683
Merge "Replace the hidden getActiveLinkProperties usage" am: d709b55250
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635200
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3d7e876c9fb8bf81a300b6b76154672e0d3b04c7
2021-03-15 10:14:46 +00:00
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
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