SongFerngWang
766f78e8ed
Use SubscriptionManager.getResourcesForSubId to get Resources
...
To support multi-SIM card case. The code uses the
SubscriptionManager.getResourcesForSubId to get Resources.
Bug: 171843666
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest
Change-Id: Ib31e23b81bdbd3b5336b45fc73994f40d021718b
Merged-In: Ib31e23b81bdbd3b5336b45fc73994f40d021718b
2021-03-04 09:41:31 +00:00
Yi Jiang
bc6ec17120
Adds 'more details' hyper link.
...
Adds a 'more details' hyper link in the footer when options are disabled
by admin.
Test: make ROBOTEST_FILTER=ScreenTimeoutSettingsTest RunSettingsRoboTests
Bug: 180314728
Change-Id: I880ccd73f4b2ef0b695619ef42ec87559dc2b65b
2021-03-04 01:19:50 -08:00
Stanley Wang
b69896ae60
Fix that when scrolling to the top on Wi-Fi page, the "Turn off SIM"
...
notification will pop up.
The root cause of the problem is that the switch preference and
switch bar status are not sync when using setCheckedInternal API.
Fix: 179498532
Test: Run robotest and see the ui
Change-Id: Ib51dc2ef27ce49b9c8ba69eb32757bf6b9945baf
2021-03-04 15:50:47 +08:00
Hugh Chen
50fc7d15ef
Fix "USB tethering" doesn't work after reconnecting USB
...
Before this CL, if users selects usb tethering option and
reconnects usb it would not start entitlement check.
Because we only start entitlement checks when users select it.
This CL will start entitlement checks when usb tethering option
is selected and reconnects usb.
Bug: 176037347
Test: make -j42 RunSettingsRoboTests
Change-Id: I3a2ad392a1cae9cf97355ef3cd4fb8c23de18673
2021-03-04 15:31:11 +08:00
Stanley Wang
3b70c6c41a
Fix the overlap issue of MainSwitch and list view.
...
This issue happen on Developer and Wi-Fi pages, so the problem
should be solved on SettingsActivity.
Fix: 181341927
Test: Run robotest and see the ui
Change-Id: I57722cfcbeb6390c88101d808429346045e57c92
2021-03-04 15:08:18 +08:00
Janis Danisevskis
146a0dab01
Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0
...
Keystore 2.0 no longer stores vpn profiles. It still offers a
Legacy VPN profile store, to access existing profiles.
Test: N/A
Bug: 171305607
Bug: 171305388
Merged-In: I40dea0b9c3824b56814ae4c2fb6c7663c7d97af5
Change-Id: I40dea0b9c3824b56814ae4c2fb6c7663c7d97af5
2021-03-03 22:30:48 -08:00
Janis Danisevskis
e92bcb3287
Keystore 2.0: Update Wifi settings to use mostly public keystore API.
...
Test: N/A
Bug: 171305607
Bug: 171305388
Merged-In: Ib794c5f2d904c2b187d7d5fd00b81afc852d0052
Change-Id: Ib794c5f2d904c2b187d7d5fd00b81afc852d0052
2021-03-03 22:30:35 -08:00
Janis Danisevskis
f33b7dd3cc
Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." into rvc-qpr-dev-plus-aosp
2021-03-04 05:33:21 +00:00
Janis Danisevskis
e4ffcd1567
Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" into sc-dev am: 1a10ffe990
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13715126
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I50331c3dd7b63b2cc259173e912da22dc50663b5
2021-03-03 23:30:17 +00:00
Janis Danisevskis
1a10ffe990
Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" into sc-dev
2021-03-03 22:28:41 +00:00
Yu-Han Yang
ec189cc0da
Merge "Add showSystem to RecentLocationAccess (Settings)" into sc-dev am: d0267d5f8d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13732560
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia69d0da674cd6e5ba2331cf6a593366747e5d4e4
2021-03-03 21:41:50 +00:00
Xin Li
6b94f5ac81
Merge "Merge RQ2A.210305.007"
2021-03-03 21:41:36 +00:00
Yu-Han Yang
d0267d5f8d
Merge "Add showSystem to RecentLocationAccess (Settings)" into sc-dev
2021-03-03 20:45:29 +00:00
Trevor David Black
d0d796c90b
Add Extra App Info into Settings App UI.
...
Bug: b/174956516
Test: Settings -> Apps -> APP -> Extra App Info
Change-Id: Id978fb3569579f54b8399156d52c2ddeceb9bb91
2021-03-03 19:52:15 +00:00
jasonwshsu
c497c7aabe
Add the preference controller to control accessibility button opacity preference
...
Bug: 173940869
Test: atest FloatingMenuOpacityPreferenceControllerTest
Change-Id: I1fbe3157c93fef4611c3b9b13569c9b339e2898a
2021-03-04 01:19:30 +08:00
jasonwshsu
04955b96ae
Add the preference controller to control accessibility button size preference
...
Bug: 173940869
Test: atest FloatingMenuSizePreferenceControllerTest
Change-Id: Ic206a940abde90641442df37a634c8cb3a345597
2021-03-04 01:19:30 +08:00
jasonwshsu
123464429d
Add the preference controller to control accessibility button location preference
...
Bug: 173940869
Test: atest AccessibilityButtonLocationPreferenceControllerTest
Change-Id: I49a23b2eb4e07e79afcefc5a148c23b06396ec1c
2021-03-04 01:19:19 +08:00
Xin Li
2aa4fea82d
Merge RQ2A.210305.007
...
Bug: 180401296
Merged-In: I12e20519ac29f802f9983dcf27f313388b33829c
Change-Id: I8ca0bb7173f6abe08596422b281f6913b66ab9b7
2021-03-03 09:12:21 -08:00
Adrian Roos
f11a6ddaf2
Revert "Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f
am: ddf3efb070
am: 8c38e9543e" am: d99faa25c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13754174
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaae85597ea364bab628f8fce9230d7887c4f6466
2021-03-03 15:39:29 +00:00
Adrian Roos
d99faa25c0
Revert "Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f
am: ddf3efb070
am: 8c38e9543e"
...
This reverts commit 0df55e1eb4
.
Reason for revert: Other CLs in topic were skipped, but this one wasn't, which broke sc-dev.
Change-Id: Icf61dae071416381ea11cbe74cd92ae934c3047e
2021-03-03 14:51:42 +00:00
Paul Hu
d41839e69e
Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f
am: ddf3efb070
am: 8c38e9543e
am: 0df55e1eb4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I49005966712f2d6aee155375546ae5554aa6bce1
2021-03-03 13:38:25 +00:00
Paul Hu
0df55e1eb4
Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f
am: ddf3efb070
am: 8c38e9543e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4332292590088a0453cd7cfa2dc66f775e2d79dd
2021-03-03 13:27:16 +00:00
TreeHugger Robot
551319a151
Merge "Return RESULT_OK RequestManageCredentials" into sc-dev am: 42ac293a53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13754167
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibe97019bc21e9c44a97b57d61da05091d4de790d
2021-03-03 13:03:35 +00:00
TreeHugger Robot
10c997f5bb
Merge "Refactor Usb settings" into sc-dev am: decaeda453
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13736527
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibb5da138a1dbdd6fde3daf48c2a4de0988505297
2021-03-03 13:03:27 +00:00
TreeHugger Robot
42ac293a53
Merge "Return RESULT_OK RequestManageCredentials" into sc-dev
2021-03-03 12:43:13 +00:00
TreeHugger Robot
decaeda453
Merge "Refactor Usb settings" into sc-dev
2021-03-03 12:12:24 +00:00
Alex Johnston
c82767f627
Return RESULT_OK RequestManageCredentials
...
Bug: 177979648
Test: Manual testing
Change-Id: I3b4968131f8c7b811752704808d0ef4df617a658
2021-03-03 11:30:46 +00:00
Hugh Chen
0091ae6142
Refactor Usb settings
...
1. Rename ShouldIgnoreClickEvent() to isClickEventIgnored().
2. Use TetheringManager instead of ConnectivityManager.
Bug: 175651578
Test: make -j42 RunSettingsRoboTests
Change-Id: I37c49694257b7575550b5a905e293b5d056ba1bf
2021-03-03 18:13:17 +08:00
Zoey Chen
ea29704e40
[Telephony] Use TelephonyCallback instead of PhoneStateListener part5
...
Since the redesign of PhoneStateListener, use TelephonyCallback to get the callback of EVENT_*
Bug: 167684594
Test: make and atest NetworkProviderWorkerTest
Change-Id: I52af54045872bbf13e64d5d94c8b027ec702abb9
2021-03-03 16:23:52 +08:00
Paul Hu
8c38e9543e
Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f
am: ddf3efb070
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iccd3b694b9e9f4ac1658093923c923a98d83ccfb
2021-03-03 08:07:19 +00:00
Sally Yuen
bd7a6cc05e
Merge "[Reduce Bright Colors] Add labels to intensity slider" into sc-dev am: aaff760df0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13501303
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I081571447b34652fffc03f5eba756c6d88db2a8f
2021-03-03 03:23:10 +00:00
Sally Yuen
aaff760df0
Merge "[Reduce Bright Colors] Add labels to intensity slider" into sc-dev
2021-03-03 03:03:35 +00:00
Minche Li
d8b3c23f77
Merge "Hides the settings entry in Magnification Settings if device is not supported" into sc-dev am: ecf1c07e63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13732407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8f08f51b0ff9df1ef9a1b4c609155fdd102cef80
2021-03-03 03:00:54 +00:00
Paul Hu
ddf3efb070
Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I51b526d575a540cfb7ab6cef8be5d096f3660728
2021-03-03 02:59:37 +00:00
Minche Li
ecf1c07e63
Merge "Hides the settings entry in Magnification Settings if device is not supported" into sc-dev
2021-03-03 02:24:09 +00:00
Paul Hu
2b1e3a971f
Merge "Update Utils#getTetheringLabel usage on Settings"
2021-03-03 02:15:22 +00:00
Sudheer Shanka
303438ea68
Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." am: 90f59be59a
am: bf29c73cb7
am: 1e04fd7a05
am: 521bf40280
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1612821
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I644594be3f6bb7d402ba6ba60b549624a1457110
2021-03-03 01:15:46 +00:00
Sudheer Shanka
521bf40280
Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." am: 90f59be59a
am: bf29c73cb7
am: 1e04fd7a05
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1612821
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2aac37f3686f6d46e3cace0dcbd0c4a4886e1cfb
2021-03-03 00:36:23 +00:00
Bonian Chen
d929097128
Merge "[Settings] Only display backup calling when more than 1 SIM" into sc-dev am: 3f211d4c64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13715532
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idbaa1dae43d694a447761f46d3f48dd255e1b50d
2021-03-03 00:18:58 +00:00
Sudheer Shanka
1e04fd7a05
Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." am: 90f59be59a
am: bf29c73cb7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1612821
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1959ff61fdc91f0006d9eda91ccde6917025e07c
2021-03-02 23:54:36 +00:00
Bonian Chen
3f211d4c64
Merge "[Settings] Only display backup calling when more than 1 SIM" into sc-dev
2021-03-02 23:19:24 +00:00
Sudheer Shanka
bf29c73cb7
Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." am: 90f59be59a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1612821
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iac6d23d86624419bc716c70a4150090e907928b7
2021-03-02 23:01:32 +00:00
Yu-Han Yang
f7513d9821
Add showSystem to RecentLocationAccess (Settings)
...
Bug: 180533061
Test: on device
Change-Id: Ie232bc84d7875897316e978ed3deac9656ebec5f
2021-03-02 14:05:35 -08:00
Janis Danisevskis
b5caf84154
Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0
...
Keystore 2.0 no longer stores vpn profiles. It still offers a
Legacy VPN profile store, to access existing profiles.
Test: N/A
Bug: 171305607
Bug: 171305388
Change-Id: I40dea0b9c3824b56814ae4c2fb6c7663c7d97af5
2021-03-02 13:52:46 -08:00
Treehugger Robot
e696e52fd3
Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50
am: 9059706e7b
am: bfa57a33ee
am: 2a6d2e4a2d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I011ebcf279e1efb16399efe6222a63e8f80c7571
2021-03-02 21:05:12 +00:00
Treehugger Robot
2a6d2e4a2d
Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50
am: 9059706e7b
am: bfa57a33ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibe6db36fc0039d10f352756b2c8d398a225c6a55
2021-03-02 20:38:41 +00:00
Treehugger Robot
bfa57a33ee
Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50
am: 9059706e7b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibd1aa5ea04aa3ff22ece59fe04bc69c7e15385bd
2021-03-02 19:47:20 +00:00
Treehugger Robot
9059706e7b
Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I12e20519ac29f802f9983dcf27f313388b33829c
2021-03-02 19:05:16 +00:00
Sally Yuen
b3d9280c3f
Merge "Call into ColorDisplayManager for RBC slider range" into sc-dev am: 4d5a03da7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13688354
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8322e261f22e96fd9e05700f6aff0d90a94628e3
2021-03-02 18:39:46 +00:00
Sally Yuen
d10678e2bf
Merge "[Reduce Bright Colors] reorder preferences" into sc-dev am: 18923596c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13501300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic68068d76c144c2a622b03aac056a90a42db0140
2021-03-02 18:38:50 +00:00