Antony Sargent
caaccbc72c
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev am: 49cd8f2327 am: 0fe460a8e3
...
am: d9456d807b
2017-08-10 07:32:23 +00:00
Antony Sargent
d9456d807b
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev am: 49cd8f2327
...
am: 0fe460a8e3
2017-08-10 07:28:51 +00:00
Antony Sargent
8cd8519eab
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
...
am: 49cd8f2327
2017-08-10 07:25:53 +00:00
Antony Sargent
0fe460a8e3
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
...
am: 49cd8f2327
2017-08-10 07:25:52 +00:00
TreeHugger Robot
49cd8f2327
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
2017-08-10 07:23:29 +00:00
Antony Sargent
c86440538f
Stay discoverable in Bluetooth settings and pairing pages
...
There are two problems with the Bluetooth settings and pairing pages
that are fixed by this CL:
(1) We advertise on the page that the local device is visible to other
devices, but that only lasts for the length of the default timeout (120
seconds) for the local adapter being in discoverable mode.
(2) Both the BluetoothSettings and BluetoothPairingDetail fragments
enter discoverable mode in their onStart handler and exit it in their
onStop handler. Unfortunately when doing a fragment navigation the
onStart and onStop events interleave in a non-intuitive manner. When you
go from BluetoothSettings to BluetoothPairingDetail, we see the onStop
event for BluetoothSettings *after* the onStart event for
BluetoothPairingDetail, and similarly when going back from
BluetoothSettings to BluetoothPairingDetail. What this means in practice
is that if you go to the BluetoothSettings page, the device will be
discoverable, but once you navigate to BluetoothPairingDetail or back
again you won't be discoverable again until you go somewhere else or end
the settings activity.
This CL adds a new object called AlwaysDiscoverable which can be used to
start and stop a mode of "always being discoverable". While started, it
will listen for changes to the discoverable state, and return to
discoverable mode. This fixes (1) by returning to discoverable mode
whenever the normal timeout expires, and (2) similary by returning to
discoverable mode when we accidentally exit it due to the onStop/onStart
mismatch.
A better fix for (2) would be to avoid the "glitch" of briefly exiting
discoverable mode only to re-enter it, but the implementation of that is
a little more complicated so that's being left as future work in order
to keep this CL as small as possible.
Bug: 64130265
Test: make RunSettingsRoboTests
Change-Id: I559dd8187263ea6a0008be1a8abdfffac97cb87a
2017-08-09 22:10:40 -07:00
Doris Ling
e1aa184bb6
Merge "Log preference change as Integer instead of Long." into oc-mr1-dev am: 7074e25a0e
...
am: cb5b48df7a
2017-08-10 04:02:08 +00:00
Doris Ling
cb5b48df7a
Merge "Log preference change as Integer instead of Long." into oc-mr1-dev
...
am: 7074e25a0e
2017-08-10 03:54:12 +00:00
TreeHugger Robot
7074e25a0e
Merge "Log preference change as Integer instead of Long." into oc-mr1-dev
2017-08-10 03:41:07 +00:00
Doris Ling
9906395fa3
Merge "Initialize the volume seekbar preference max and progress." into oc-mr1-dev am: db56114b34
...
am: 3503851ee1
2017-08-10 02:32:36 +00:00
Fan Zhang
3f6c90eb34
Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev am: 5b820431d3
...
am: a8f7f745e1
2017-08-10 02:30:57 +00:00
mingliang.x.lei
05d56ce9c8
Merge "Fix memory leak in Bluetooth settings" am: 5a652c0286 am: 8d3bb3e2ad am: c46b5e60b9 am: 8ba28798aa
...
am: cc6b8a868d
2017-08-10 02:28:19 +00:00
qqzhou
bef7e0de9d
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am: 2c2b6b48de am: 467aad4219
...
am: add20708ba
2017-08-10 02:25:22 +00:00
Daniel Nishi
591c654fb7
Merge "Expose the notification-swipe controls." into oc-dr1-dev am: c075f8943e am: 8bbc28a95b
...
am: 6df5c65f45
2017-08-10 02:22:09 +00:00
Ruchi Kandoi
01e0523441
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am: 9eff3f90d8 am: bf81a17a31
...
am: 706c6ba20e
2017-08-10 02:21:48 +00:00
Salvador Martinez
f3692132ca
Merge "Update availability for mobile network" into oc-dr1-dev am: 4bcc3eb193 am: 7bc388d823
...
am: 35c0949b2e
2017-08-10 02:20:50 +00:00
Ajay Nadathur
3253b7ee7c
Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev am: 0ed0319005
...
am: b9c3eb954a
2017-08-10 02:20:25 +00:00
Fan Zhang
2b050a3663
Merge "Close cursor after getting data from DB" into oc-mr1-dev am: 298d559c40
...
am: 876513ec38
2017-08-10 02:20:02 +00:00
Eric Schwarzenbach
c03105dfb3
Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev am: 51bde3c8fe
...
am: 33840ce005
2017-08-10 02:19:36 +00:00
Justin Klaassen
27ef303dd1
Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev am: d59854de24
...
am: 6652cfcd7e
2017-08-10 02:19:12 +00:00
Doris Ling
3503851ee1
Merge "Initialize the volume seekbar preference max and progress." into oc-mr1-dev
...
am: db56114b34
2017-08-10 01:53:50 +00:00
Kevin Chyn
8cf5bcdfa7
Reset fingerprint lockout upon successful unlock
...
FingerprintSettings should not start listening for fingerprints until
after Pin/Pattern/Pass is entered
Fixes: 63437524
Fixes: 63739006
Test: open FP settings, touch an invalid finger 5 times
close FP settings, re-enter FP settings, enter Pin/Pattern/Pass
touch FP with valid finger, should not be in lockout mode
Change-Id: Ia2e219824c33169a5610b36123c42aa3d6ff22c5
2017-08-09 18:49:17 -07:00
TreeHugger Robot
db56114b34
Merge "Initialize the volume seekbar preference max and progress." into oc-mr1-dev
2017-08-10 01:41:45 +00:00
Fan Zhang
a8f7f745e1
Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev
...
am: 5b820431d3
2017-08-10 00:37:34 +00:00
Doris Ling
9dbd807ea1
Log preference change as Integer instead of Long.
...
Change-Id: I3dc93a4b8a5aa7f03bef05d39bd4504ed205334f
Fix: 64485529
Test: make RunSettingsRoboTests
2017-08-09 17:36:02 -07:00
TreeHugger Robot
5b820431d3
Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev
2017-08-10 00:28:03 +00:00
Fan Zhang
e3535d9998
Delete DynamicindexableContentMonitor & all refs to it
...
Convert input device search into a search query loader
And remove old logic from DynamicIndexableContentMonitor
Change-Id: If652b1ea7c8add9185bbd025055e14925d3a8eec
Bug: 64310452
Bug: 63831980
Test: robotests
2017-08-09 17:27:02 -07:00
Justin Klaassen
0a982f39c2
DO NOT MERGE - Ask device owner for master clear in demo mode
...
am: a22c8345fa
2017-08-10 00:23:52 +00:00
TreeHugger Robot
d0b09f7868
Merge "Remove code for old wifi tether feature"
2017-08-10 00:08:03 +00:00
mingliang.x.lei
cc6b8a868d
Merge "Fix memory leak in Bluetooth settings" am: 5a652c0286 am: 8d3bb3e2ad am: c46b5e60b9
...
am: 8ba28798aa
2017-08-10 00:06:32 +00:00
qqzhou
add20708ba
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am: 2c2b6b48de
...
am: 467aad4219
2017-08-09 23:04:07 +00:00
Daniel Nishi
6df5c65f45
Merge "Expose the notification-swipe controls." into oc-dr1-dev am: c075f8943e
...
am: 8bbc28a95b
2017-08-09 22:51:45 +00:00
qqzhou
467aad4219
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
...
am: 2c2b6b48de
2017-08-09 22:41:12 +00:00
Daniel Nishi
8bbc28a95b
Merge "Expose the notification-swipe controls." into oc-dr1-dev
...
am: c075f8943e
2017-08-09 22:37:34 +00:00
Justin Klaassen
a22c8345fa
DO NOT MERGE - Ask device owner for master clear in demo mode
...
Bug: 62712426
Test: make RunSettingsRoboTests -j19
Change-Id: I29f92ff1062590f2c5eb7713e5969da7870fc582
2017-08-09 15:37:01 -07:00
qqzhou
13d1167e44
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
...
am: 2c2b6b48de
2017-08-09 21:07:36 +00:00
TreeHugger Robot
2c2b6b48de
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
2017-08-09 20:57:50 +00:00
Doris Ling
b7490bea28
Initialize the volume seekbar preference max and progress.
...
When the media stream is set, initialize the preference max and progress
with the streams current value. Otherwise, when we initialize the seekbar
volumizer, it will first set the seekbar max to 0 and progress to 0,
then update with the correct value, which will result in the jank that
is seen when the sound settings are displayed.
Change-Id: I515c97bbc6ec38bbe92755e3d7cb53bb13ac52d0
Fix: 34035654
Test: make RunSettingsRoboTests
2017-08-09 13:56:13 -07:00
Ruchi Kandoi
706c6ba20e
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am: 9eff3f90d8
...
am: bf81a17a31
2017-08-09 20:35:36 +00:00
Salvador Martinez
35c0949b2e
Merge "Update availability for mobile network" into oc-dr1-dev am: 4bcc3eb193
...
am: 7bc388d823
2017-08-09 20:28:30 +00:00
Ajay Nadathur
b9c3eb954a
Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev
...
am: 0ed0319005
2017-08-09 20:27:45 +00:00
Ruchi Kandoi
bf81a17a31
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev
...
am: 9eff3f90d8
2017-08-09 20:22:10 +00:00
Salvador Martinez
7bc388d823
Merge "Update availability for mobile network" into oc-dr1-dev
...
am: 4bcc3eb193
2017-08-09 20:21:32 +00:00
TreeHugger Robot
0ed0319005
Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev
2017-08-09 20:15:20 +00:00
Fan Zhang
876513ec38
Merge "Close cursor after getting data from DB" into oc-mr1-dev
...
am: 298d559c40
2017-08-09 20:05:14 +00:00
Eric Schwarzenbach
33840ce005
Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev
...
am: 51bde3c8fe
2017-08-09 20:02:03 +00:00
Justin Klaassen
6652cfcd7e
Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev
...
am: d59854de24
2017-08-09 20:01:40 +00:00
TreeHugger Robot
298d559c40
Merge "Close cursor after getting data from DB" into oc-mr1-dev
2017-08-09 19:58:36 +00:00
TreeHugger Robot
51bde3c8fe
Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev
2017-08-09 19:49:41 +00:00
TreeHugger Robot
d59854de24
Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev
2017-08-09 19:40:03 +00:00
