Commit Graph

15833 Commits

Author SHA1 Message Date
hughchen
ac23bb5d54 Remove the divider
* Remove the divider that below the "Previously connected devices"

Bug: 78153629
Test: Build
Change-Id: I298f3bf396c929f025978431577cba9d6aa5f678
2018-04-17 17:14:42 +08:00
TreeHugger Robot
cbcbb74a5d Merge "Migrate ManagedProfileSettings to DashboardFragment" 2018-04-16 22:56:55 +00:00
TreeHugger Robot
f99a4a3e06 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-16 21:56:56 +00: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
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
Beverly
fbe721b1b3 Get rid of charging sounds toggle
Users can no longer toggle on/off the charging sound.

Test: manual
Bug: 77912907
Change-Id: Ie050acab3972cb1fa6716c70afb6403db4d9c887
2018-04-16 12:35:59 -04: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
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
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
9df9101526 Merge "Add strings for AP band UI changes" into pi-dev am: 6baefa4b51
am: 0354854ab9

Change-Id: I5fe06ecc6c96d2cdff78fea1e93fe5dc28c3e587
2018-04-14 18:19:25 -07:00
Salvador Martinez
fbc5abb8e1 Merge "Update bluetooth preference to take user to new screen" into pi-dev
am: ce53cbeef7

Change-Id: Ic37c4b30a82cefb4f888d5c5183b6f6bae2b67d2
2018-04-14 17:36:20 -07:00
Salvador Martinez
0354854ab9 Merge "Add strings for AP band UI changes" into pi-dev
am: 6baefa4b51

Change-Id: I2fd9ae450a9cf1322338c080dedc40d7961f379d
2018-04-14 17:34:56 -07:00
TreeHugger Robot
28041fb8cd Merge "Register ConnectDeviceFrag with new key" into pi-dev 2018-04-14 23:12:48 +00:00
TreeHugger Robot
9470271d85 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-14 17:01:25 +00:00
Bill Yi
c5eadd8ad5 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I5292358d043bede11ff4791263b007d31b04d8b6
2018-04-13 20:57:48 -07:00
TreeHugger Robot
290edd0b73 Merge "Storage wizard string changes per UX request." into pi-dev 2018-04-14 03:08:23 +00:00
Bill Yi
581a0d54bd Import translations. DO NOT MERGE
Change-Id: I7cf53a9ffbc077211999a42f73bb41e5cbe78932
Auto-generated-cl: translation import
2018-04-13 19:53:43 -07:00
TreeHugger Robot
20bb2edda7 Merge "Update fingerprint illustration" into pi-dev 2018-04-14 01:36:27 +00:00
TreeHugger Robot
15234d7eb4 Merge "Use the correct text for DND onboarding." into pi-dev 2018-04-14 01:34:34 +00:00
Andrew Sapperstein
821217c713 Use the correct text for DND onboarding.
Update the screen on title to use the screen on
text instead of the screen off text.

Bug: 78019397
Test: visual inspection
Change-Id: Ie5c0b462b44ad735963c2800a59a20288b1cadf8
2018-04-13 17:24:33 -07:00
TreeHugger Robot
ce53cbeef7 Merge "Update bluetooth preference to take user to new screen" into pi-dev 2018-04-13 23:00:52 +00:00
Isha Bobra
35e217f91f Show only 1 entry for hearing aid devices without killing the activity.
This CL tries to detect Bluetooth hearing aid devices and tries to
combine the entry of the hearing aids with the same HiSyncIds and
show only 1 entry for each pair in the connected devices list.

This CL also shows 2 battery status in the device details page.

This change shows the combined entry after a user returns to the
settings activity after pressing the back button or somehow
without killing it. It also combines the entries just after pairing.

Test: RunSettingsRoboTests
Bug: 74204427

Change-Id: I47fb0bdd96b1cc972d88a4aef85d0113985d63bb
2018-04-13 22:51:58 +00:00
Salvador Martinez
9eac182805 Update bluetooth preference to take user to new screen
This CL removes the toggle from the bluetooth preference and instead
takes users to a new dedicated screen for toggling bluetooth status.
On this screen we show a different summary text depending on whether
bluetooth and bluetooth scanning are on/off. Also, we were able to
delegate most of the UI/bluetooth handling to already existing
classes.

Test: robotests
Bug: 77543471
Merged-In: I036a3992bbd78896da8364b55ecc51afc4464b6e
Change-Id: I036a3992bbd78896da8364b55ecc51afc4464b6e
2018-04-13 15:07:45 -07:00
Lei Yu
6e96055232 Remove battery usage preference in app info page
Bug: 78011526
Test: RunSettingsRoboTests
Change-Id: I2dfb989167fe27857590f416fbb16d401e53bc1d
2018-04-13 14:41:03 -07:00
Jeff Sharkey
a4c79279ef Storage wizard string changes per UX request.
Bug: 77207119
Test: atest com.android.settings.ui.StorageWizardTest
Change-Id: I93adf01442d006927c792db405d8cf73c963dd40
2018-04-13 15:20:32 -06:00
Salvador Martinez
6135564f91 Add strings for AP band UI changes
This CL just adds strings needed for another change. See change with
id = Ib2d4a2834c5cd11875515d308f7b20bfc8471959

Test: just adds string
Bug: 73102003
Change-Id: Ibd0ded108f49e481d2a858960b9add48a09cc497
2018-04-13 14:19:49 -07:00
TreeHugger Robot
b0339949a3 Merge "Update bluetooth preference to take user to new screen" 2018-04-13 20:56:18 +00:00
Doris Ling
728916e67c Merge "Hide Default apps and App permissions under Advanced." into pi-dev am: 36800c5115
am: 9095c97ee3

Change-Id: Id4ecbf4a24bb5f86f069d89103521043a7d0c09d
2018-04-13 13:26:16 -07:00
Doris Ling
9095c97ee3 Merge "Hide Default apps and App permissions under Advanced." into pi-dev
am: 36800c5115

Change-Id: I15bba4d3ae39d5aca176890624048bbe14a1c59f
2018-04-13 13:02:10 -07:00
TreeHugger Robot
d57d27acab Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-13 19:44:37 +00:00
Doris Ling
36800c5115 Merge "Hide Default apps and App permissions under Advanced." into pi-dev 2018-04-13 19:44:11 +00:00