Commit Graph

798 Commits

Author SHA1 Message Date
Ryan Lin
dbbbb81943 Merge "Add callback onProfileAudioStateChanged()" into pi-dev am: 388907d136
am: a56e1283f3

Change-Id: I314fb7c7b701d28ee8d30fe1d7b35b61eeddc6ad
2018-03-31 10:36:06 +00:00
Ryan Lin
388907d136 Merge "Add callback onProfileAudioStateChanged()" into pi-dev 2018-03-31 06:23:26 +00:00
Lei Yu
4e5ec9a9c1 Merge "Remove the obsolete bluetooth code" into pi-dev am: fa150fca3c
am: a5a338dff6

Change-Id: Icbc382b54b4bfe329aa8f2045433885997badf05
2018-03-31 03:35:30 +00:00
Lei Yu
dec7a719d1 Remove the obsolete bluetooth code
Also update the shortcut:
1. Change the name to "Devices"
2. Change it point to "Connected device" page

Bug: 74806595
Fixes: 69926683
Test: robo test still pass

Change-Id: Ic57756fc955dc622cc22d0be64f02b5ae07a2915
2018-03-30 11:24:26 -07:00
ryanywlin
bca6f79026 Add callback onProfileAudioStateChanged()
Bug: 74134939
Test: Build
Change-Id: I2a7e837703b66e1798679c65afab7dc6572c295e
2018-03-30 06:23:28 +00:00
Matthew Fritze
3f0122fa05 Merge "Add keywords for search terms" into pi-dev am: dd0e23b987
am: 49a3169cb4

Change-Id: I16065c59992f75fc9e45be4bd4b313a0691b13be
2018-03-23 21:55:14 +00:00
TreeHugger Robot
dd0e23b987 Merge "Add keywords for search terms" into pi-dev 2018-03-23 18:35:23 +00:00
TreeHugger Robot
bf73ece580 Merge "Enable R8 for settings" 2018-03-23 18:09:44 +00:00
Matthew Fritze
5c5a921efb Add keywords for search terms
A large update for search keywords collected from logging
and individual feedback.

At the moment, we don't have a great way to test that a keyword
matches to a search result. It's a bit akin to testing that the
wifi title is Wifi.

Fixes: 36983488
Fixes: 36622889
Fixes: 76115241
Test: Manual audit of keywords surfacing the proper results.
Change-Id: Ia1031b7f6ec1edfcc28c07e6b55049b8dac7c685
2018-03-23 09:41:47 -07:00
Antoan Angelov
84a4dd0bde Merge "Show policy transparency popup dialog for Bluetooth in Settings." into pi-dev 2018-03-23 14:10:29 +00:00
Søren Gjesse
d9ce79763a Enable R8 for settings
Keep constructor which is only used directly from test.

Update Proguard configuration to include information on checked
exceptions for Mockity to mock thorwn exception.

Bug: 74756073
Test: atest
com.android.settings.deviceinfo.storage.StorageAsyncLoaderTest#testRemovedPackageDoesNotCrash
Utf8ByteLengthFilterTest
Change-Id: Iae87e6647b28ee69d38bd8891df46239779c459c
2018-03-22 21:05:11 +01:00
Lei Yu
0861b33763 Merge "Add search index provider for bt page" into pi-dev am: 9492aa546d
am: bfc77e7106

Change-Id: Ia173dfe64eda2148e5d8d17f8708ab788b2c68e0
2018-03-21 23:33:39 +00:00
Antony Sargent
483b1f98bf Fix renaming for Bluetooth devices when rotating to landscape
The bug here is that when renaming a Bluetooth device (either the local
adapter or a paired device), if you click on the text edit field of the
alert dialog and then rotate the screen, the text shown in the soft
input will disappear. Also it's a usability problem that you even needed
to click in the first place. This CL fixes both problems - now the soft
input will be shown immediately when the dialog comes up, and the
content doesn't disappear on rotation.

Change-Id: Id29d11c834bf98c01b5c1208159537a8fd36a64f
Fixes: 72551780
Test: make -j RunSettingsRoboTests
(cherry picked from commit 5a1587526b)
2018-03-21 22:52:46 +00:00
TreeHugger Robot
9492aa546d Merge "Add search index provider for bt page" into pi-dev 2018-03-21 20:48:41 +00:00
Jyun LuoLai
6ae743f957 Merge "Modify connectivty related strings" into pi-dev am: 346a36cd2e
am: 73af1f3fb7

Change-Id: Ib8da644dc0c84ddb2d0133643de6325c0fbdc2c2
2018-03-21 19:20:10 +00:00
Lei Yu
687964cf28 Add search index provider for bt page
1. Implement the search index provider for
ConnectedDeviceDashboardFragment.
2. Since in SEARCH_INDEX_DATA_PROVIDER fragment is null,
so we need to pass in context to all components
instead of getting it from fragment.
3. Update test for it as well as creating new shadow.

Change-Id: If0aa67d5b6ca207c6b728c8355581bf414577091
Fixes: 69333961
Test: RunSettingsRoboTests
2018-03-21 10:46:02 -07:00
TreeHugger Robot
10bf42df11 Merge "Fix renaming for Bluetooth devices when rotating to landscape" 2018-03-21 17:30:23 +00:00
TreeHugger Robot
346a36cd2e Merge "Modify connectivty related strings" into pi-dev 2018-03-21 17:14:20 +00:00
arangelov
75c603cedb Show policy transparency popup dialog for Bluetooth in Settings.
Bug: 70206452
Test: make ROBOTEST_FILTER=BluetoothEnablerTest -j40 RunSettingsRobotests
Test: make ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest -j40 RunSettingsRobotests
Change-Id: I543cf69b754c44b02c66e101698f10906a1b957f
2018-03-21 16:03:28 +00:00
Antony Sargent
5a1587526b Fix renaming for Bluetooth devices when rotating to landscape
The bug here is that when renaming a Bluetooth device (either the local
adapter or a paired device), if you click on the text edit field of the
alert dialog and then rotate the screen, the text shown in the soft
input will disappear. Also it's a usability problem that you even needed
to click in the first place. This CL fixes both problems - now the soft
input will be shown immediately when the dialog comes up, and the
content doesn't disappear on rotation.

Change-Id: Id29d11c834bf98c01b5c1208159537a8fd36a64f
Fixes: 72551780
Test: make -j RunSettingsRoboTests
2018-03-20 16:33:26 -07:00
Hansong Zhang
02acba607a Move the setActiveDevice logic from Settings to SettingsLib (2/2)
Currently the Settings app handles the logic of setting active device;
however, this should be handled by SettingsLib so the logic can be shared.

Bug: 75984255
Test: robolectric test

Change-Id: I5742de1463d156ff29708ea2aecfc3fd00795e9e
2018-03-20 10:43:15 -07:00
Jyun LuoLai
e05884564e Modify connectivty related strings
Change-Id: I971c5f68ff3d881ad0285f87ab868a204edc9b7f
Fixes: 73960246
Test: Manual test & make RunSettingsRoboTests
2018-03-20 09:45:09 +08:00
Weilun Du
d4e1b94b58 Disable bluetooth controller if unsupported
Only disable the controllers not the whole fragment because
user might need to have entry for other features.

Fixes: 73664409
Merged-In: I98ed248cf33d11715dd523e711cbc68ebf128ef8
Change-Id: I98ed248cf33d11715dd523e711cbc68ebf128ef8
Signed-off-by: Weilun Du <wdu@google.com>
(cherry picked from commit 68a195ae93)
2018-03-09 23:40:40 +00:00
Weilun Du
68a195ae93 Disable bluetooth controller if unsupported
Only disable the controllers not the whole fragment because
user might need to have entry for other features.

Fixes: 73664409

Change-Id: I98ed248cf33d11715dd523e711cbc68ebf128ef8
Signed-off-by: Weilun Du <wdu@google.com>
2018-03-06 12:05:32 -08:00
Mariano Giardina
b8709ca0e2 Revert "Disable bluetooth controller if unsupported"
This reverts commit 726f115660.

Reason for revert: broke git_master
https://android-build.googleplex.com/builds/submitted/4635329/sailfish-userdebug_fastbuild3_linux/latest/view/logs/build_error.log

Change-Id: Icefa78f0a79f7ff0af373f3f0cd35d200cd4fec8
2018-03-06 11:02:31 +00:00
Weilun Du
726f115660 Disable bluetooth controller if unsupported
Only disable the controllers not the whole fragment because
user might need to have entry for other features.

Change-Id: I9c44cca97189a2115785cf70aee8eb580ac56000
Fixes: 73664409
Signed-off-by: Weilun Du <wdu@google.com>
2018-03-03 14:42:16 -08:00
Fan Zhang
906572b127 Change PreferenceController#getSummary return type.
Return CharSequence instead of String.

All user visible string should be modeled as CharSequence.

Bug: 73950519
Test: robotest
Change-Id: I30befef0c33f94351d4a2774e283bd1ed804aa8b
2018-02-27 22:30:12 -08:00
TreeHugger Robot
572efd22dd Merge "More renaming in DashboardFragment" 2018-02-24 02:58:32 +00:00
TreeHugger Robot
a0de28d0de Merge "Update the Bluetooth Active Device state in the Device Manager" 2018-02-24 01:07:45 +00:00
Fan Zhang
f7843adabd More renaming in DashboardFragment
getPreferenceControllers() -> createPreferenceControllers() for the same
reason as in ag/3647936

Bug: 73668763
Test: robotests
Change-Id: I97670a91a2a38d1c844d1b9d37f4222c5e6f45a0
2018-02-23 16:56:30 -08:00
Fan Zhang
917f101899 Instantiate pref controllers from xml if it's defined.
- If a <preference> tag also defines a controller, we will try to
  instantiate it before displaying the UI. The same logic is shared by
  BaseSearchIndexProvider so it also drives search suppression.

- If user also defines a list of controllers programatically, the
  programatically created ones takes precedence.

Bug: 73668763
Test: WIP
Change-Id: I7aecec270bcd3af261e012ef1f6995d2a523cfa1
2018-02-23 14:08:51 -08:00
Pavlin Radoslavov
c7715a5519 Update the Bluetooth Active Device state in the Device Manager
The Bluetooth Active Device state should be updated for all
CachedBluetoothDevice entries.
This should be done inside CachedBluetoothDeviceManager in SettingsLib
instead of BluetoothDeviceUpdater in the Settings app.

Bug: 72316092
Test: Manual - two headsets and switching the active device
Change-Id: If379bb0853dcd78385430cf14192e9adfae4ecd0
2018-02-23 12:32:23 -08:00
Fan Zhang
be45f9c865 Migrate more settings to SubSettingsLauncher
Bug: 73250851
Test: robotests
Change-Id: I4100bef20e2ed477e4e31c9b7816f1b03f3f2809
2018-02-19 13:36:57 -08:00
Fan Zhang
7cf99f5f12 Migrate more settings to use SubSettingsLauncher
Bug: 73250851
Test: robotests
Change-Id: I08f6f380489646231d6d8ceb1488e2efb036bf69
2018-02-18 21:10:03 -08:00
Fan Zhang
615563db0c Migrate more subsetting launching to SubSettingLauncher
Bug: 73250851
Test: robotests
Change-Id: Ic0bf23f6ac6f717bdd3d477fdb84af68badae8e6
2018-02-15 15:39:56 -08:00
Pavlin Radoslavov
8124a32890 Merge "Updated the Bluetooth Settings owners list" am: 5a56c31913 am: b1230be1b8
am: ab399887b9

Change-Id: Ie5a17a94f9221097339eb37c327607a9417c8373
2018-01-27 00:16:29 +00:00
Treehugger Robot
5a56c31913 Merge "Updated the Bluetooth Settings owners list" 2018-01-26 23:01:43 +00:00
Pavlin Radoslavov
221ba22546 Updated the Bluetooth Settings owners list
Test: None
Change-Id: I94a11d51b6c7691f7e84e8afe71c7c8083255ef0
2018-01-26 13:28:29 -08:00
Pavlin Radoslavov
ddf48e3962 Add Settings support for Bluetooth Multi-A2DP and Multi-HFP
Test: Code compilation
Bug: 64767509

[NOTE: The cherry-pick removed changes to non-existent code and log
message description that doesn't apply here.]

Change-Id: Iee76286110ed87703d6a968f50273c22cd7c7086
Merged-In: Iee76286110ed87703d6a968f50273c22cd7c7086
(cherry picked from commit 4b796e5d2e)
2018-01-26 11:16:23 -08:00
Leif Wilden
90d1392e65 Merge "Migrate to use instrumentation classes from settingslib." 2018-01-25 00:35:26 +00:00
Leif Hendrik Wilden
28dee1f086 Migrate to use instrumentation classes from settingslib.
Test: Compiles. Manually tested.
Change-Id: I70a6e76cc8440547746ecc008c32bd06a7de8161
2018-01-24 12:30:39 -08:00
Daniel Nishi
a633b39cfa Add device name to About Phone page.
The device name is reflected in three places: A Settings.Global flag
which can be read by third party apps, the Bluetooth device name, and
the Wi-Fi tethering hotspot name.

The Bluetooth and Wi-Fi names can be changed independently of the device
name, but if the user sets the device name, they are all changed in
parallel.

Due to the naming restrictions of Bluetooth devices and SSIDs, the SSID
naming restrictions apply to the device name.

Bug: 63819909
Test: Robotest
Change-Id: I3a81535fc07d183557a6fa5d54baef3c7868499c
2018-01-24 11:35:30 -08:00
TreeHugger Robot
e3f187a4a9 Merge "Revert "Migrate to use instrumentation classes from settingslib."" 2018-01-23 01:58:18 +00:00
Pavlin Radoslavov
4b796e5d2e Add Settings support for Bluetooth Multi-A2DP and Multi-HFP
When there are multiple connected A2DP/HFP devices, if a connected
device's name is clicked on, that device will be chosen as
Active - i.e., it will be the device chosen for audio out / phone call.

Test: Manual: multiple connected A2DP devices, and selecting each as
      the Active Device.
Bug: 64767509

Change-Id: Iee76286110ed87703d6a968f50273c22cd7c7086
2018-01-22 13:10:50 -08:00
Leif Wilden
cab0ee611d Revert "Migrate to use instrumentation classes from settingslib."
This reverts commit 1546cca529.

Reason for revert: Broke fingerprint setup flow. b/72267201

Change-Id: I8321265ae64732c526325882ddea51080decddf5
2018-01-22 20:57:36 +00:00
Leif Hendrik Wilden
1546cca529 Migrate to use instrumentation classes from settingslib.
Test: Compiles. Manually tested.
Change-Id: Ie5515bb0fe3e621fc7723a9b04ba23e4bfa9c401
2018-01-18 11:13:24 -08:00
jackqdyulei
f2ef447e8e Tweak bluetooth text alignment
1. Remove the placeholder summary so it won't show blank summary
2. Update settings_entity_header to make text center_vertical,
so it could align with the icon.

Bug: 71742145
Test: Screenshot
Change-Id: I185114a4e0c8d996f218075a8633e802fabf3c66
2018-01-17 12:26:21 -08:00
TreeHugger Robot
b8b9b283fe Merge "Merge sub pages for lock/unlock into 1 xml." 2018-01-05 00:36:17 +00:00
Fan Zhang
928ddbe731 Merge sub pages for lock/unlock into 1 xml.
And create PreferenceControllers for each setting

The page is still pretty janky and controllers are invoked manually.
Next CL will clean these up.

Bug: 32953042
Test: TODO
Change-Id: I1d7478324f5de4fdb464d79f89086f7e79c0ee67
2018-01-04 15:02:36 -08:00
Matthew Fritze
c69f73f4d1 Support getDynamicSummary in BasePreferenceController
Adds dynamic summary getter in relevant BasePreferenceControllers.
Preferece controllers that don't have dynamic summaries or which
are not yet BasePreferenceControllers are not changed right now.

Change-Id: I435ccab7758d90515583fd8ca10a9b1ef0c858b9
Fixes: 71514936
Test: robotests
2018-01-04 13:58:01 -08:00