Commit Graph

1115 Commits

Author SHA1 Message Date
Doris Ling
397a1b80ef Merge "Add logging to Bluetooth settings." 2017-03-13 17:24:14 +00:00
Marie Janssen
14ef1e4417 Bluetooth: leave screen off for permission request
Test: pair to a carkit, disable pbap, reconnect from carkit
Bug: 32555940
Change-Id: I06d6cc0873f9f991e68f1de9b629dbe3a7bb7701
2017-03-10 09:57:03 -08:00
Doris Ling
133b096288 Add logging to Bluetooth settings.
- Add logging when users selects the listed devices to connect or
disconnect, and when connection error is shown
- Update the event for the top level bluetooth master switch toggle to
have its own event.

Change-Id: I58f21256fdd07fad9d733ff987ff38df1148f4f8
Fix: 35065258
Test: make RunSettingsRoboTests
2017-03-09 18:14:30 -08:00
Fan Zhang
1f5fdab61e Misc fixes
- Remove tiny icon in bluetooth subheader
- Turn new search on

Fix: 35917435
Test: make RunSettingsRoboTests

Change-Id: I97a02319108a46a0c3df2295ddec49d47f13b597
2017-03-09 14:06:43 -08:00
Jaewoong Jung
015fe72cd3 Merge "Changes event handling phases for DeviceListPreferenceFragment."
am: 084c20409b

Change-Id: Ic0abdcd7a7de944b3348590cdfa922fcf1dcbed1
2017-03-07 02:27:15 +00:00
Jaewoong Jung
7ca9a39960 Changes event handling phases for DeviceListPreferenceFragment.
Bug: 31273140
Test: Manual inspection.

Change-Id: If4622b8d367813eb86a54a45f2e8fa4a55ca38b1
(cherry picked from commit e8d5c8fda1)
2017-03-06 13:02:35 -08:00
Matthew Fritze
b759516cbf Create whitelist for the most popular settings
As a temporary solution to getting the most popular
settings to be the top rank, we have created a white list.
If a prioritized setting shows up somewhere in the results
then it will be given an elevated rank to be at the top.

Bug: 35048659
Test: make RunSettingsRoboTests
Change-Id: I92b563a17b42d8f91d980dd1d8e5f8f29ca5aa9c
2017-03-06 12:31:41 -08:00
Marie Janssen
cd45633eb0 Merge "Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth" am: 17ad73ed9b am: 019c8f38fe
am: 14795a7855

Change-Id: If28610b01c89647b66f84561455e540c480d49fa
2017-02-25 13:51:01 +00:00
Marie Janssen
019c8f38fe Merge "Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth"
am: 17ad73ed9b

Change-Id: Ib26f0014a8ef37f0c1b0e738597690343c30e940
2017-02-25 13:44:29 +00:00
Marie Janssen
41cdfd8887 Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth
Bluetooth is the receiver for the OPEN_RECEIVED_FILES intent, so we
should aim the intent directly at them.

Test: go to BT settings and click "Open Received Files" in the context
Change-Id: I057215f1faf04c8c735a7e9340325716225ad22d
Fix: 35246073
2017-02-25 13:39:16 +00:00
Marie Janssen
37e7c0eb4c Merge "Bluetooth: service for pairing notification" am: 7dfc705ad9 am: 7b9f96983d
am: dd0c9e6265

Change-Id: Ifb9bc78d4e9569248c5ed97facad33b6aa1170c4
2017-02-23 22:01:15 +00:00
Marie Janssen
7b9f96983d Merge "Bluetooth: service for pairing notification"
am: 7dfc705ad9

Change-Id: Ib48d174e99ac1debd9cf578c222bdcfd5fc10ea1
2017-02-23 21:52:24 +00:00
Marie Janssen
d06d83c531 Bluetooth: service for pairing notification
Use a foreground service to show the notification, separating dialog
creation from the receiver.

Test: pair request from remote device while the screen is off
Bug: 35234069
Change-Id: Ia3be3e8efdacf465e095af5a498ef5eb0fca83cd
2017-02-21 14:43:40 -08:00
Fan Zhang
c6ca314c0b Log source with visibility change
- Add a method in VisibilityLoggerMixin to log visible event using
  LogMaker, which allows logging additional FIELD_CONTEXT field.
- In Utils.startFragment, add current page's metricsCategory as an extra
  to next page.
- In next page's onResume(), extract the previous page's metricsCategory
  and send it to VisibilityLoggerMixin.visible()
- Update all caller with additional paramters

Change-Id: I8e1f2597fa465b7d3aa16fa1d21c052a3219694a
Fix: 35359289
Test: RunSettingsRoboTests
2017-02-15 17:17:19 -08:00
Marie Janssen
9241c3ec3c Merge "Remove Bluetooth autoconnect on dock" am: b65c7fc810 am: e7d5b13f53 am: deb32c220b
am: 76405153d1

Change-Id: I5d4283ec0aa65b8faf6a97693dcdb40df353c48a
2017-02-10 18:23:00 +00:00
Marie Janssen
76405153d1 Merge "Remove Bluetooth autoconnect on dock" am: b65c7fc810 am: e7d5b13f53
am: deb32c220b

Change-Id: I9742b1388b6b8702df0459e77414e3eb273115a8
2017-02-10 18:20:28 +00:00
Marie Janssen
e7d5b13f53 Merge "Remove Bluetooth autoconnect on dock"
am: b65c7fc810

Change-Id: Id3cf62ca55ff39867041b495aa832e220fbf70ee
2017-02-10 18:15:28 +00:00
Marie Janssen
c2ab27e2f8 Remove Bluetooth autoconnect on dock
Test: compiles
Change-Id: I31305c70269c685893132f14975c32a051280afc
Fix: 35219649
2017-02-09 20:02:52 -08:00
Alexey Polyudov
f689441eed fix the build breakage caused by merge resolution
commit 5d409ace19 broke the build

Change-Id: I62f55d8c1d023190af5171864998a2a4b2090a37
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
(cherry picked from commit 8c041f7862)
2017-02-02 21:58:36 +00:00
Alexey Polyudov
8c041f7862 fix the build breakage cuased by merge resolution
commit 5d409ace19 broke the build

Change-Id: I62f55d8c1d023190af5171864998a2a4b2090a37
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
2017-02-02 12:59:50 -08:00
Alexey Polyudov
d872a51339 resolve merge conflicts of 81758edffa to nyc-mr2-dev-plus-aosp
am: 5d409ace19

Change-Id: I90f8afee357fa453e337b657976a1619383a58a5
2017-02-02 19:31:06 +00:00
Alexey Polyudov
5d409ace19 resolve merge conflicts of 81758edffa to nyc-mr2-dev-plus-aosp
Change-Id: Ie5f768b3986b1a2847503ed0871dc1dc79007d88
2017-02-02 11:11:29 -08:00
Philip P. Moltmann
81758edffa [DO NOT MERGE] Use new QueuedWork interface.
Test: Ran SharedPreferences CTS tests

Bug: 33385963
Bug: 30662828

Change-Id: I8025a087b43462324d0d45555094cbb54a671404
(cherry picked from commit 231c9fbfa6)
2017-01-31 02:51:04 +00:00
Marie Janssen
9787d19947 resolve merge conflicts of 1c98d85cf6 to master
Change-Id: Ie4401bf35d4a56865faa5476b86b2a384ad21231
2017-01-30 10:21:05 -08:00
Marie Janssen
1c98d85cf6 Merge "Bluetooth: remove BluetoothDiscoveryReceiver" am: 1ad23a71e4 am: 184506a710
am: 83fb10ae1e

Change-Id: Ib7a51c9cae91202087bfcc11e6eb18b219e84d36
2017-01-30 18:02:01 +00:00
Marie Janssen
184506a710 Merge "Bluetooth: remove BluetoothDiscoveryReceiver"
am: 1ad23a71e4

Change-Id: I045b82e81d1fdd3d8844efbd2c79d41fdd6d8aa6
2017-01-30 17:51:50 +00:00
Marie Janssen
683528db8b Bluetooth: remove BluetoothDiscoveryReceiver
Use new function getDiscoveryEndMillis() to replace use of shared preferences
and intents.

Test: scan recently, then connect from external BT device
Bug: 34395439
Change-Id: Ia498b3bb4868b656cbbb9fbdc607a49af948343b
2017-01-26 15:38:05 -08:00
Lenka Trochtova
a2070edbf2 RequestPermissionHelperActivity: policy transparency for BT disallowed
Don't try to enable Bluetooth if it was disallowed, show a policy
transparency dialog instead.

Test: manual with CtsVerifier

Bug: 32895313

Change-Id: I9dd535a959b65f172cf2dcdd5483773d4f67366c
2017-01-26 15:44:55 +01:00
Doris Ling
c4c9f4d50e Update Network & internet->Wi-Fi to use MasterSwitchPreference.
- Add a preference controller for Network & internet->Wi-Fi to control
  the preference toggling and summary update.
- Refactor WifiSettings and WifiEnabler to share code between the new
  wifi preference controller and the wifi setting.
- Refactor BluetoothSummaryHelper to have a common base class with the
  WifiSummaryHelper.
- Rename the summary helper to summary updater.

Bug: 34280769
Test: make RunSettingsRoboTests
Change-Id: I00ebfc161bcef89331bb41ba405ed8cb8232d248
2017-01-25 10:43:01 -08:00
Marie Janssen
42c61c10cc Merge "Make headset icons consistent before / after pairing" am: 690bdb22c9 am: a2e068a2b4 am: 60eb5503e8
am: a78e718b26

Change-Id: I20b0fe30ab6b882e4f517147e9ffabe786d73988
2017-01-25 16:16:12 +00:00
Marie Janssen
a78e718b26 Merge "Make headset icons consistent before / after pairing" am: 690bdb22c9 am: a2e068a2b4
am: 60eb5503e8

Change-Id: Ida107059b3a5ec815f198659ff8174c8ff375efe
2017-01-25 16:10:29 +00:00
Marie Janssen
a2e068a2b4 Merge "Make headset icons consistent before / after pairing"
am: 690bdb22c9

Change-Id: I64a9a3a7d8a2f110ee1809af33583f82fc4b4f57
2017-01-25 16:06:00 +00:00
Xiaodong Xu
262f7fba9a Make headset icons consistent before / after pairing
Previously A2DP would be shown before pairing with a HFP device.

bug: 30677445
Change-Id: I0e9ab17197e6ee099d890d5368def36a14ca8344
2017-01-23 17:25:27 +00:00
Doris Ling
1432cb8529 Add new preference class MasterSwitchPreference.
- Add a new preference type that has Title and optional summary on the
  left, and a toggle switch on the right. Clicking the left part of the
  preference will open a settings screen.
- Update Connected devices->Bluetooth to use this new preference.
- Refactor BluetoothSettings and BluetoothEnabler to share code between
  the new bluetooth preference controller and the bluetooth setting.

Bug: 34280769
Test: make RunSettingsRoboTests
Change-Id: I109ecdba640ecdd4748a6e5b2b4f4c47cbf653fd
2017-01-20 16:19:00 -08:00
Jack He
e51972868c Fix Bluetooth pairing dialogue crash
When pairing passkey is invalid, onCreate() should return early to
prevent any dialog from displaying, which will then call onDestroy()
to destroy the activity. However mReceiver should be registered before
onDestroy() is called as onDestroy() will call unregisterReceiver(mReceiver)
that will throw an IllegalArgumentException when mReceiver was not registered.

This fix adds a flag that tracks whether mReceiver has been registered.
In addition, this fix fails the passkey confirmation request upon invalid
passkey.

Bug: 32577328
Test: Test with PTS TC_SERVER_SA_BI_01_C
Change-Id: Ifc047bad6bd99abca04404af9cd54d2034cd35aa
(cherry picked from commit 6f8e9eda2d9ed830d47971d93327792906db2dc1)
2017-01-19 22:39:17 +00:00
Doris Ling
d3a32ed21b Check for text type before setting text span.
The text from the empty text view can be any CharSequence. Need to check
the actual type before trying to cast it to Spannable and setting the
text span.

Change-Id: Ib3ead0a0fe0b797e026c0c259591025fc9c94709
Fix: 34075068
Test: make RunSettingsRoboTests
2017-01-04 13:51:38 -08:00
Fan Zhang
00d617df0b Update bluetooth summary text when state changes.
- Refresh connected state before setting summary text.
- Detect inconsistent state (BT manager says connected but doesn't
  provide a connected device)

(This basically syncs implementation between settings and QS tile)

Change-Id: Id23138f8432b9aecd194f5016bf2576e33e8ca98
Fixes: 33341275
Test: RunSettingsRoboTests
2016-12-27 14:18:58 -08:00
Fan Zhang
ec407ff78c Left align preferences and graphs to leave space for icon.
Bug: 33559277
Test: Visual inspection
Change-Id: Iacf9556826174a03b1cbf8a6f179b63d8686c5f5
2016-12-19 13:41:37 -08:00
TreeHugger Robot
be611ab112 Merge "Build a new FooterPreference UI." 2016-12-15 17:56:28 +00:00
Fan Zhang
d5b48454a3 Build a new FooterPreference UI.
- Create a new layout for footer prefs.
- Create a new FooterPreference type to use the layout
- Create a Mixin to create and add the pref to screen
- Create a new lifecycle observer type to invoke mixin at right time
- Switch SettingsPreferenceFragment to use footer mixin.
- Switch FingerprintSettings to use the new footer pref.

Bug: 33579394
Test: RunSettingsRoboTests
Change-Id: I548ac39a0d120196a7ffed09b4f98bd9a80bae90
2016-12-14 16:41:49 -08:00
Philip P. Moltmann
231c9fbfa6 Use new QueuedWork interface.
Test: Ran SharedPreferences CTS tests
Bug: 33385963
Change-Id: I8025a087b43462324d0d45555094cbb54a671404
2016-12-14 15:02:03 -08:00
Svetoslav Ganov
c6a074c80d DO NOT MERGE Add Bluetooth toggle prompts - settings
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749
Change-Id: I0b9065446f9d0cfb819065eaf2dc160eb1c1f7ec
2016-12-12 09:44:39 -08:00
Sudheer Shanka
acb1a61f3f Update usage of ActivityManagerNative.
Bug: 30977067
Test: N/A
Change-Id: I46e37a09cff059d2784a819bc2651d6973fbd268
2016-11-14 12:59:11 -08:00
Tamas Berghammer
265d3c2a0c Update package names to work with the proto3 compiler
Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
2016-11-08 14:06:17 +00:00
TreeHugger Robot
45a072ecac Merge "Robotests for BluetoothPairingDialog" 2016-10-26 01:33:28 +00:00
Jaewoong Jung
d0255d7673 Merge "Changes event handling phases for DeviceListPreferenceFragment." 2016-10-26 00:39:18 +00:00
Salvador Martinez
f492c28cc1 Robotests for BluetoothPairingDialog
Created some tests to protect some basic bluetooth
pairing dialogs features from regressing. Most of the
tests in this CL ensure that the view is properly
created and that it is properly updating the
associated controller when a relevant action occurs.

Test: make RunSettingsRoboTests
Bug: 32180625
Change-Id: I2f4103a39ffced52353712f952e8ff3d26590169
2016-10-25 17:18:53 -07:00
Salvador Martinez
d98d0837d8 Refactoring for bluetooth dialogs
Dialogs displayed when attempting to connect
to a bluetooth device have been refactored so
that they use a proper dialog fragment. Hardware
dependencies have also been refactored into a
controller class to make it possible to test
these dialogs as well as the controller
independently of one another.

Test: RoboTests
Bug: 32180625
Change-Id: I5447f8299bc13e139052635fc63546cbfc997f33
2016-10-18 11:13:44 -07:00
Jaewoong Jung
e8d5c8fda1 Changes event handling phases for DeviceListPreferenceFragment.
Bug: 31273140
Test: Manual inspection.

Change-Id: If4622b8d367813eb86a54a45f2e8fa4a55ca38b1
2016-10-13 11:22:54 -07:00
Fan Zhang
71ab9605a3 Use a Digit TtsSpan for pairing pins for talkback.
Fixes: 31539689
Test: manually enabled talkback and focused on bt pairing pin. Verified
read-out is digits instead of a big number.

Change-Id: I71c53094762a71459e70485470684c515053b600
2016-10-06 13:17:06 -07:00