Chalard Jean
a035ca8748
Merge "Use the SSID of the network in the no internet dialog" into pi-dev am: 031bee8e6e
...
am: dc20c794b8
Change-Id: I1727deb8f6298709f5629b734acf6b7a1f174bc2
2018-04-16 19:57:20 -07:00
Pengquan Meng
dd06c985c3
Merge "Fixed ApnEditor crash issue" into pi-dev am: c670be956c
...
am: 755426d7d8
Change-Id: I575e6775a47a2cd8b8bff3e2ab55309744a72e0a
2018-04-16 19:43:38 -07:00
Chalard Jean
dc20c794b8
Merge "Use the SSID of the network in the no internet dialog" into pi-dev
...
am: 031bee8e6e
Change-Id: I1b437e107541f9789eb9e27461f8bb8a6874e997
2018-04-16 19:18:00 -07:00
Lei Yu
d0a1e0af1d
Merge "Hide suggestion if app already been restricted" into pi-dev am: 1d5d289d08
...
am: 3f3c3c1c70
Change-Id: Ibc8a5d5ee7e52ffdeb364061afcf3af6e0b2366a
2018-04-16 19:01:41 -07:00
Chalard Jean
031bee8e6e
Merge "Use the SSID of the network in the no internet dialog" into pi-dev
2018-04-17 02:01:02 +00:00
Fan Zhang
da52162eba
Merge "Fix an RTL issue in Network dashboard's summary text." into pi-dev am: d743f20618
...
am: fc47444c61
Change-Id: I0de8b7e6780768fe32fe5fe0eb3ae42c2f78f8d4
2018-04-16 18:47:22 -07:00
Pengquan Meng
755426d7d8
Merge "Fixed ApnEditor crash issue" into pi-dev
...
am: c670be956c
Change-Id: Id2fc2f2b535e9d992bc45a1a1206c6f0dddf29c8
2018-04-16 18:42:58 -07:00
Pengquan Meng
c670be956c
Merge "Fixed ApnEditor crash issue" into pi-dev
2018-04-17 01:26:54 +00:00
Lei Yu
3f3c3c1c70
Merge "Hide suggestion if app already been restricted" into pi-dev
...
am: 1d5d289d08
Change-Id: I15337dd8b0ed36134cdd05d9a09877412444a8e5
2018-04-16 18:14:50 -07:00
Fan Zhang
fc47444c61
Merge "Fix an RTL issue in Network dashboard's summary text." into pi-dev
...
am: d743f20618
Change-Id: I36c91343b50926c844c6939fece383228470a7a7
2018-04-16 17:47:09 -07:00
TreeHugger Robot
1d5d289d08
Merge "Hide suggestion if app already been restricted" into pi-dev
2018-04-17 00:30:08 +00:00
TreeHugger Robot
d743f20618
Merge "Fix an RTL issue in Network dashboard's summary text." into pi-dev
2018-04-16 23:40:09 +00:00
TreeHugger Robot
cbcbb74a5d
Merge "Migrate ManagedProfileSettings to DashboardFragment"
2018-04-16 22:56:55 +00:00
Bill Yi
082622b3d4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: f99a4a3e06
-s ours
...
am: 71674cb7d2
-s ours
Change-Id: I3e1ec307ea4d5d87209b0093f0d4e84e47f9eb44
2018-04-16 15:28:09 -07:00
Bill Yi
71674cb7d2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: f99a4a3e06
-s ours
Change-Id: Iea1d0a1bc534e1a50349782ab856013176a7ca66
2018-04-16 15:14:49 -07:00
Fan Zhang
ae131c4786
Fix an RTL issue in Network dashboard's summary text.
...
Bidi wrap the word "Wi-Fi" so it's RTL'd correctly in all languages
Change-Id: Ia228b8f182ba6c7b5db5c310ecb54b25937e6ab7
Fixes: 78120642
Test: visual
2018-04-16 14:59:22 -07:00
TreeHugger Robot
f99a4a3e06
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-04-16 21:56:56 +00:00
Lei Yu
9e6d649b3a
Hide suggestion if app already been restricted
...
Change-Id: I89904575be0236a22e4ca403bedc6adfc6cc5708
Fixes: 78014551
Test: RunSettingsRoboTests
2018-04-16 13:31:59 -07:00
Bill Yi
69e8ab6612
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If256f5f7a79cc21e1251bd26b3b0c934d5cda71b
2018-04-16 13:18:24 -07:00
Caxton Chan
67ee923708
Merge "Add audio switch UI in sound settings" into pi-dev am: 03b8aa3a3c
...
am: 160c30151f
Change-Id: I23b4cc7431a38fc3314547393d190d3020d6f75f
2018-04-16 12:50:38 -07:00
Caxton Chan
160c30151f
Merge "Add audio switch UI in sound settings" into pi-dev
...
am: 03b8aa3a3c
Change-Id: I4c89750d66e4e3021e1a1a378ab4dfd16e40f883
2018-04-16 12:35:36 -07:00
jason_chiu
c69102d24e
Migrate ManagedProfileSettings to DashboardFragment
...
- Move preference related logic to Controllers.
- Add some test cases for controllers.
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accounts
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
atest SettingsGatewayTest UniquePreferenceTest
Change-Id: If4fcd7bf572672c886d5c91b2d15013817d1aa67
2018-04-16 12:35:01 -07:00
Caxton Chan
03b8aa3a3c
Merge "Add audio switch UI in sound settings" into pi-dev
2018-04-16 19:24:31 +00:00
TreeHugger Robot
0d59a62bfb
Merge "Remove the dependency on InputMethodSettings"
2018-04-16 19:19:48 +00:00
hughchen
5620d28f3f
Merge "Implement audio switch UI" into pi-dev am: 5a2f73151e
...
am: 608d436da0
Change-Id: Iea47d84345cfd10388a4c2ad34d5cedcfe7eaeb6
2018-04-16 12:12:21 -07:00
hughchen
608d436da0
Merge "Implement audio switch UI" into pi-dev
...
am: 5a2f73151e
Change-Id: Ib20749758c6dd8a8db24e3d4dba29232bac46793
2018-04-16 11:56:28 -07:00
TreeHugger Robot
5a2f73151e
Merge "Implement audio switch UI" into pi-dev
2018-04-16 18:34:37 +00:00
Lei Yu
9a44eb6be7
Merge "Remove battery usage preference in app info page" into pi-dev am: ea7dd68480
...
am: e5b270a4dd
Change-Id: I394652b3b170625fc51f54d675c9a07d951a72a3
2018-04-16 10:59:36 -07:00
Lei Yu
e5b270a4dd
Merge "Remove battery usage preference in app info page" into pi-dev
...
am: ea7dd68480
Change-Id: I91f76bbedf9ef04a8a57fd1d68c747a0beb41148
2018-04-16 10:39:48 -07:00
TreeHugger Robot
ea7dd68480
Merge "Remove battery usage preference in app info page" into pi-dev
2018-04-16 17:14:49 +00:00
Isha Bobra
ea72074ed7
Merge "Show only 1 entry for hearing aid devices without killing the activity." into pi-dev am: d87acaf3cf
...
am: 595cda2d14
Change-Id: I49973a65a31f5f79722c4e4841f2dcda34128edb
2018-04-16 10:03:34 -07:00
Isha Bobra
595cda2d14
Merge "Show only 1 entry for hearing aid devices without killing the activity." into pi-dev
...
am: d87acaf3cf
Change-Id: Id0d3f2912feff75a572c57230715ffeed0a68d80
2018-04-16 09:56:17 -07:00
Isha Bobra
d87acaf3cf
Merge "Show only 1 entry for hearing aid devices without killing the activity." into pi-dev
2018-04-16 16:42:33 +00:00
Chalard Jean
d391f46076
Use the SSID of the network in the no internet dialog
...
Bug: 77865258
Test: manual & roboelectric
Change-Id: I72f1f74bf004f30a2c38b4c3af977ff09360d1e8
2018-04-16 13:09:03 +09:00
ryanywlin
63bdfa8998
Add audio switch UI in sound settings
...
- Build two controller to control list preferences.
- MediaOutputPreferenceController which allows switching
the media output between current device and connected
BT device supporting A2DP. It also controls disabling
media output switching during a call or cast mode.
- HandsFreeProfilePreferenceController which allows
switching between HFP-connected BT devices while in
on-call state.
- Add test cases for controllers.
Bug: 74130772
Test: make RunSettingsRoboTests ROBOTEST_FILTER="MediaOutputPreferenceControllerTest" -j56
Test: make RunSettingsRoboTests ROBOTEST_FILTER="HandsFreeProfileOutputPreferenceControllerTest" -j56
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j56
Change-Id: I37f5418442ce77e72cdff07f071ea519ab1047f3
2018-04-16 11:52:44 +08:00
hughchen
bd3e5de207
Implement audio switch UI
...
* Implement available media devices group
* Add AvailableMediaDeviceGroupController to realize UI, the user can see the all device that can be activated in this group.
* ConnectedDeviceGroupController change to show the device that cannot be activated but is connected.
* Refactoring the below class, implement the controller in connected_devices.xml.
ConnectedDeviceGroupController.java
SavedDeviceGroupController.java
ConnectedDeviceDashboardFragment.java
connected_devices.xml
* Add AvailableMediaBluetoothDeviceUpdaterTest to verify the add/remove preference behavior when connectedStateChanged or profileAudioStateChanged
* Add test that used to verify device is connected or not in BluetoothDeviceUpdaterTest.
* Add test that used to verify the add/remove preference behavior when connectedStateChanged or profileAudioStateChanged in ConnectedBluetoothDeviceUpdaterTest.
* Add AvailableMediaDeviceGroupControllerTest to verify bluetooth feature is supported or not and test register callback.
* Add test that used to verify bluetooth feature is supported or not and test register callback in ConnectedDeviceGroupControllerTest.
* Add test that used to verify bluetooth feature is supported or not and test register callback in SavedDeviceGroupControllerTest
Bug: 74134939
Test: make -j40 RunSettingsRoboTests
Change-Id: I54d03c2ddadc6a4be7519dd74cdbcb5055d44083
2018-04-15 04:22:25 +00:00
HJ ChangLiao
a8000ddd9b
Merge "Register ConnectDeviceFrag with new key" into pi-dev am: 28041fb8cd
...
am: 5c79fbd97c
Change-Id: I950ccf423738ba6fce2d9a526d505384b04c50e7
2018-04-14 21:11:37 -07:00
HJ ChangLiao
5c79fbd97c
Merge "Register ConnectDeviceFrag with new key" into pi-dev
...
am: 28041fb8cd
Change-Id: I6b1a56f48d474b8d5dc2417ce9154408bb10d328
2018-04-14 20:56:01 -07:00
Bill Yi
edbcd64294
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 9470271d85
-s ours
...
am: cbb9ab8ad3
-s ours
Change-Id: I41fb8019799db51d33c1aca7267f719801550647
2018-04-14 20:53:37 -07:00
Jeff Sharkey
25fe7a27b5
Merge "Storage wizard string changes per UX request." into pi-dev am: 290edd0b73
...
am: 1e916920c5
Change-Id: Ie66f1e4d6daa98640e7e56efb7862be0d1c18914
2018-04-14 20:41:12 -07:00
Bill Yi
cbb9ab8ad3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 9470271d85
-s ours
Change-Id: I810c2412aae8c3b92a5c66d4de3494efa22a447c
2018-04-14 20:35:44 -07:00
Jeff Sharkey
1e916920c5
Merge "Storage wizard string changes per UX request." into pi-dev
...
am: 290edd0b73
Change-Id: Icfb93cba765d380ceb9e3c3bb855f5e4af8dc0b4
2018-04-14 20:28:09 -07:00
Maurice Lam
3ddbaf439a
Merge "Update fingerprint illustration" into pi-dev am: 20bb2edda7
...
am: 13c77a93a9
Change-Id: I62e2e925beb940cb6d37b0d94eda3c6bbca2bede
2018-04-14 20:16:09 -07:00
Andrew Sapperstein
142d367a4c
Merge "Use the correct text for DND onboarding." into pi-dev am: 15234d7eb4
...
am: 3b6cbb2f4c
Change-Id: Ia7f900929a6d36457581ae3fae7601eff9adaad7
2018-04-14 20:10:27 -07:00
Maurice Lam
13c77a93a9
Merge "Update fingerprint illustration" into pi-dev
...
am: 20bb2edda7
Change-Id: Ibd7a1835f7dd0de4ea6c6d0569b80eb8b6470155
2018-04-14 19:55:53 -07:00
Andrew Sapperstein
3b6cbb2f4c
Merge "Use the correct text for DND onboarding." into pi-dev
...
am: 15234d7eb4
Change-Id: Ib47f7f86998e4e070b7d4dc4abf6be563f2d6867
2018-04-14 19:50:31 -07:00
Salvador Martinez
052baf58a0
Merge "Fix mistake in onActivityResult for ConfigureWifiSettings" into pi-dev am: 1678488736
...
am: 230d6420b9
Change-Id: I5a05e1bf619b4999d3f329dcc6ce267dba95e598
2018-04-14 19:28:54 -07:00
Salvador Martinez
230d6420b9
Merge "Fix mistake in onActivityResult for ConfigureWifiSettings" into pi-dev
...
am: 1678488736
Change-Id: I0ea6f839eb33ba147ebae657999164b872d57fb6
2018-04-14 19:02:25 -07:00
Salvador Martinez
3cdd5eedcc
[automerger skipped] Merge "Update bluetooth preference to take user to new screen" into pi-dev am: ce53cbeef7
...
am: fbc5abb8e1
-s ours
Change-Id: Ia4d639f332780d767e17edc512b57027421ea275
2018-04-14 18:20:29 -07:00
Lifu Tang
9609edb8f9
Merge "Add a wrapper Activity to launch scanning settings" into pi-dev am: 6229c0f4eb
...
am: 531defb0b3
Change-Id: I2fe689240c8fc6bb4b24fc3428e0311d47dc1ad8
2018-04-14 18:19:52 -07:00