Rajeev Kumar
815558188f
Merge "Undo making Image icon's visibility to GONE in Action Not Allowed Dialog for a financed device" into sc-dev
2021-03-16 16:50:02 +00:00
Weng Su
a15019ce88
[Provider Model] Update airplane mode icon
...
- Screenshot:
https://screenshot.googleplex.com/ULE5bL6sxXKzdN6
Bug: 182438540
Test: manual test
Change-Id: I2ef2cfa40d6fbc6bc164d57ca981bc216dacede4
2021-03-16 22:57:41 +08:00
Bonian Chen
d42d9a41f6
Merge "[Settings] Code refactor - remove unused import lines" am: d248042a02 am: c27980c1a9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639941
Change-Id: I8efdc871c29a6c56aacf7a1b553a20c9cafc765d
2021-03-16 14:45:42 +00:00
Tsung-Mao Fang
b713bf7638
Revert "Add javadoc about lifecycles for xml defined Controllers." am: 23562377b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13885648
Change-Id: I58fc191944f694b7a283c738b3535691abf56bb4
2021-03-16 14:09:48 +00:00
Tsung-Mao Fang
28eb1f4f0e
Revert "Use androidx LifecycleObserver for wiring up controller ..." am: da9d5a1f92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13885647
Change-Id: I85561a372f6f2a0e06c853fed2c90b990b657a1c
2021-03-16 14:09:47 +00:00
Bonian Chen
c27980c1a9
Merge "[Settings] Code refactor - remove unused import lines" am: d248042a02
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639941
Change-Id: I365757ae7bb17cabb39e377eb23aaf4ac97013b9
2021-03-16 14:09:39 +00:00
Weng Su
68b0057f66
Smart Router settings UI changes
...
- Remove "AP band" preference
- Add "Maximize Compatibility" switch preference
- Use bridged mode API for new devices (after P21)
- Screenshot:
https://screenshot.googleplex.com/84X9Av8gVj3idjB
Bug: 168052744
Test: manual test
atest WifiTetherMaximizeCompatibilityPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest
Change-Id: Ib74156c0fa6eccdd13239854047b1fb4e49a293c
2021-03-16 21:50:55 +08:00
Bonian Chen
d248042a02
Merge "[Settings] Code refactor - remove unused import lines"
2021-03-16 13:47:28 +00:00
Tsung-Mao Fang
23562377b0
Revert "Add javadoc about lifecycles for xml defined Controllers."
...
Revert submission 13804074-controller-lifecycle
Reason for revert: ag/182373167, see a crash related to this new cl.
Reverted Changes:
I39ac69f24:Use androidx LifecycleObserver for wiring up contr...
I086620e31:Add javadoc about lifecycles for xml defined Contr...
Change-Id: I6b539199de52432bb367303f5f78363886a05512
2021-03-16 10:34:46 +00:00
Bonian Chen
203f0fe89d
[Settings] Code refactor - remove unused import lines
...
Remove some unused import lines within source code based on
https://source.android.com/setup/contribute/code-style
Bug: 182867979
Test: build pass
Change-Id: I76dbcfa9e5b435b2838401dfee15b12f472d07d0
2021-03-16 10:24:24 +00:00
Tsung-Mao Fang
da9d5a1f92
Revert "Use androidx LifecycleObserver for wiring up controller ..."
...
Revert submission 13804074-controller-lifecycle
Reason for revert: ag/182373167, see a crash related to this new cl.
Reverted Changes:
I39ac69f24:Use androidx LifecycleObserver for wiring up contr...
I086620e31:Add javadoc about lifecycles for xml defined Contr...
Fix: 182373167
Change-Id: I7e6d2e9e6fd363a3afdd3dbab24e7c3b36e9ed29
2021-03-16 10:21:23 +00:00
lucaslin
8ffc3908ff
Change the parameter type from ContentResolver to Context
...
Context is more useful than ContentResolver, it can provide more
information if we want to change the behavior in the future.
Bug: 172183305
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=PrivateDnsModeDialogPreferenceTest
Change-Id: I6c06460b67f81112db311f0739457d5f1e2e4554
2021-03-16 17:41:37 +08:00
lucaslin
11e738c3a0
Change the parameter type from ContentResolver to Context
...
Context is more useful than ContentResolver, it can provide more
information if we want to change the behavior in the future.
Bug: 172183305
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=PrivateDnsModeDialogPreferenceTest
Change-Id: I6c06460b67f81112db311f0739457d5f1e2e4554
Merged-In: I6c06460b67f81112db311f0739457d5f1e2e4554
2021-03-16 09:36:12 +00:00
Lucas Lin
e30a49423b
Merge "Use getPrivateDnsMode() to get the value of private DNS" am: 159f261889 am: 73c971a5af
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620600
Change-Id: I6ae6e3f272c275ee3590328aa6039e2b995859c4
2021-03-16 08:46:30 +00:00
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
060e2dd561
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: I9d0d85603568f705a75efd4e83cd9656c08f8975
2021-03-16 06:27:37 +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
0b3976fe58
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: I2dd38a3349d3be76a6a97bdffc7327286cbef30f
2021-03-16 03:29:44 +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
81222e46ac
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: I0e7d276a73faad5c0f7a54f73cf548ed8bee2ccd
2021-03-16 00:17:43 +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
1b4acebcda
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: I759c59385dfea795a1b6d87a537a0ad757742ba5
2021-03-15 17:06:52 +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
75bb203a40
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: Ia51cebbef2cc97bbe3c9c3bfeb8deca358a61c1c
2021-03-15 13:48:11 +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
c06350ff6a
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: I4741f4ef8409d55d7af0343724a3c9901819228c
2021-03-15 13:29:03 +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
d8dee32e02
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: I6a9c95987b00ab90984677cbef59cdb8ed36a7c9
2021-03-15 12:11:57 +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
0e7694902d
[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: I89a692d6086c2964367b58c28e71976235dcd436
2021-03-15 07:44:15 +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
353b8aa73d
[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: I4fcf12294ff4658119a3019b609af949d4141bd3
2021-03-15 07:23:57 +00:00
Bill Yi
3d9d22259b
[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: Ieb374a3422604e2646fae73613ee4b8f3e8ef56e
2021-03-15 07:23:52 +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
TreeHugger Robot
e8536198fb
[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: Ia13b965a7a5fe85177b17c4a2dab33bdb89e33d9
2021-03-15 07:03:30 +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