Lucas Lin
f2d2abaaff
[automerger skipped] Merge "Use getPrivateDnsMode() to get the value of private DNS" am: 159f261889 am: 73c971a5af am: e30a49423b -s ours am: 162d7df130 -s ours
...
am skip reason: skip tag Change-Id I024c3ddfb85f4c3d177e2e99294c998d81d4e08d with SHA-1 b07054ca9c is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620600
Change-Id: I40968dde0a36b2576a7dcd7f1f2b91e64677ce6b
2021-03-17 19:43:14 +00:00
Lucas Lin
162d7df130
[automerger skipped] Merge "Use getPrivateDnsMode() to get the value of private DNS" am: 159f261889 am: 73c971a5af am: e30a49423b -s ours
...
am skip reason: skip tag Change-Id I024c3ddfb85f4c3d177e2e99294c998d81d4e08d with SHA-1 b07054ca9c is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620600
Change-Id: I5bd375b31ad388ca507852d8be8e259693320655
2021-03-17 16:05:22 +00:00
Chiachang Wang
13d03f41b9
Merge "Replace hidden CM#isNetworkSupported() usage" into sc-dev am: 6f41bb5722
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13892870
Change-Id: Ia1cf2b31e8aba0ae944ceca2dad0ffd9fde7b9c0
2021-03-17 15:31:46 +00:00
Chiachang Wang
6f41bb5722
Merge "Replace hidden CM#isNetworkSupported() usage" into sc-dev
2021-03-17 15:21:17 +00:00
TreeHugger Robot
bebef20ae9
Merge "[Settings] Use TelephonyManasger.registerTelephonyCallback instead of TelephonyManager.listen" into sc-dev am: c7d3c5f1be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815935
Change-Id: I4cbafaba92c18f490c673a9d06750b7dfe586ea2
2021-03-17 10:50:37 +00:00
TreeHugger Robot
c7d3c5f1be
Merge "[Settings] Use TelephonyManasger.registerTelephonyCallback instead of TelephonyManager.listen" into sc-dev
2021-03-17 10:30:48 +00:00
Chiachang Wang
ffbe4e9b1e
Replace hidden CM#isNetworkSupported() usage
...
It's a refactor work for connectivity mainline module. The
hidden methods access is no longer allowed, so the usage for
isNetworkSupported() should be replaced. Settings use it to
check if device support telephony, wifi or ethernet service.
There are alternative methods to check if device supports such
features. Replace as it is.
Bug: 172183305
Test: m ; make RunSettingsRoboTests
Change-Id: I8f1d11558b1be575a0777ed195abe027e838cb74
2021-03-17 15:21:43 +08:00
TreeHugger Robot
76b437502b
Merge "Update string for Intent Picker" into sc-dev am: fdb6af2d20
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13892866
Change-Id: I8d8510291d42a9986fa8786666faea19de54ca6e
2021-03-17 06:41:50 +00:00
TreeHugger Robot
d522b2325c
Merge "[Provider Model] Update airplane mode icon" into sc-dev am: c35e0bfa58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13885664
Change-Id: I045fa25395643c654c17a5d6eab90cc05bfcaa87
2021-03-17 06:41:44 +00:00
TreeHugger Robot
fdb6af2d20
Merge "Update string for Intent Picker" into sc-dev
2021-03-17 06:35:14 +00:00
TreeHugger Robot
c35e0bfa58
Merge "[Provider Model] Update airplane mode icon" into sc-dev
2021-03-17 06:16:20 +00:00
Edgar Wang
caabd509fe
Merge "Change packagename of TwoTargetPreference" into sc-dev am: 0c914077aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13566505
Change-Id: Ic7249f7aa910eead9e0650f00700d13c38afc617
2021-03-17 05:20:15 +00:00
Edgar Wang
0c914077aa
Merge "Change packagename of TwoTargetPreference" into sc-dev
2021-03-17 05:08:21 +00:00
Lucas Lin
0ab1accbf1
Merge "Change the parameter type from ContentResolver to Context" into sc-dev am: 78a02d76c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13885645
Change-Id: I97f2cd3cbac8add7405204e4d16968ac4ba1c855
2021-03-17 03:46:20 +00:00
Lucas Lin
78a02d76c4
Merge "Change the parameter type from ContentResolver to Context" into sc-dev
2021-03-17 03:27:28 +00:00
Sunny Shao
5b541f082b
Update string for Intent Picker
...
- Replace the "Supported links open in this app" with the
"Allow web links to open in this app".
bug: 177923646
Test: compilation
Change-Id: I90c8a2f133bd35cf6e59ebe10dec40e06cb34cdf
2021-03-17 11:07:54 +08:00
TreeHugger Robot
1e037fd813
Merge "Allow SettingsMainSwitchBars to be disabled" into sc-dev am: 8105206432
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13887336
Change-Id: Ie291f5d6c84bd4227788407415185f7f751fb862
2021-03-17 02:25:47 +00:00
TreeHugger Robot
8105206432
Merge "Allow SettingsMainSwitchBars to be disabled" into sc-dev
2021-03-17 01:56:40 +00:00
Julia Reynolds
5166e3939d
Allow SettingsMainSwitchBars to be disabled
...
Test: manual, looking at notification settings
Fixes: 182859292
Change-Id: I06db2a0984b0dcbf71a69fc8f58e54b4670652a8
2021-03-16 14:55:18 -04:00
Rajeev Kumar
19eb802e10
Merge "Update Device Admin Info Settings text for a financed device" into sc-dev am: d2ca004392
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13879788
Change-Id: I033950c94e9f0e1e2e11c3b6e773c6aa2b2a23c9
2021-03-16 17:18:00 +00:00
Rajeev Kumar
738abeaa37
Merge "Undo making Image icon's visibility to GONE in Action Not Allowed Dialog for a financed device" into sc-dev am: 815558188f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13879789
Change-Id: I715824dd4ba3dd48fbb60f1b9100dac880aa7da5
2021-03-16 17:17:23 +00:00
Rajeev Kumar
d2ca004392
Merge "Update Device Admin Info Settings text for a financed device" into sc-dev
2021-03-16 16:50:35 +00:00
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
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
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
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
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