Ajay Nadathur
aec29ee4be
Merge "Update strings for skip fingerprint setup" into oc-mr1-dev
...
am: 719d80e6e0
2017-08-11 17:21:24 +00:00
Ajay Nadathur
719d80e6e0
Merge "Update strings for skip fingerprint setup" into oc-mr1-dev
2017-08-11 17:12:26 +00:00
Kevin Chyn
e54e3de80c
Merge "Clean up AssistGesturePreferenceController" into oc-mr1-dev
...
am: 14450c5669
2017-08-11 03:06:19 +00:00
TreeHugger Robot
14450c5669
Merge "Clean up AssistGesturePreferenceController" into oc-mr1-dev
2017-08-11 03:01:33 +00:00
Kevin Chyn
bd947c7ba9
Clean up AssistGesturePreferenceController
...
The preference controller shouldn't be shared between the
"Assist Gesture" parent setting, and the child setting within
Fixes: 64318213
Test: manual test of settings && make -j RunSettingsRoboTests
Change-Id: I2d2437e2036881a08977924dc1386aa1fab67070
2017-08-11 00:58:09 +00:00
Ajay Nadathur
58c2da2d9e
Update strings for skip fingerprint setup
...
bug: 64092225
Test: Manually tested and verified updated strings used
Change-Id: I813f72abb8cb9fd2ba9ec952c0926ecd2f670ed0
2017-08-11 00:42:30 +00:00
Doris Ling
549ff2cddc
Initialize the volume seekbar preference max and progress. am: cbc231c545
...
am: cd4dc413f4
2017-08-10 22:36:27 +00:00
Doris Ling
f92ca61cca
Initialize the volume seekbar preference max and progress. am: cbc231c545
...
am: f9ff9b9f5c
2017-08-10 22:35:40 +00:00
Doris Ling
cd4dc413f4
Initialize the volume seekbar preference max and progress.
...
am: cbc231c545
2017-08-10 22:29:23 +00:00
Doris Ling
f9ff9b9f5c
Initialize the volume seekbar preference max and progress.
...
am: cbc231c545
2017-08-10 22:28:20 +00:00
Doris Ling
cbc231c545
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
(cherry picked from commit b7490bea28
2017-08-10 20:22:34 +00:00
Antony Sargent
c7e3832e80
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev am: 49cd8f2327
...
am: 8cd8519eab
2017-08-10 07:29:33 +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
Android Build Merger (Role)
fda92d3491
Merge "Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am: 9476e824be am: 835152f391" into oc-mr1-dev-plus-aosp
2017-08-10 06:18:20 +00:00
Jayachandran Chinnakkannu
eddeef3b0e
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am: 9476e824be
...
am: 7398553a81
2017-08-10 06:14:27 +00:00
Jayachandran Chinnakkannu
1ba9dc3303
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am: 9476e824be
...
am: 835152f391
2017-08-10 06:13:36 +00:00
Jayachandran Chinnakkannu
7398553a81
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
...
am: 9476e824be
2017-08-10 06:04:37 +00:00
Jayachandran Chinnakkannu
835152f391
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
...
am: 9476e824be
2017-08-10 06:04:30 +00:00
Jayachandran Chinnakkannu
9476e824be
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
2017-08-10 06:00: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
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
3503851ee1
Merge "Initialize the volume seekbar preference max and progress." into oc-mr1-dev
...
am: db56114b34
2017-08-10 01:53:50 +00: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
Justin Klaassen
26b413d7a4
DO NOT MERGE - Ask device owner for master clear in demo mode am: a22c8345fa
...
am: 0a982f39c2
2017-08-10 00:51:33 +00:00
Fan Zhang
1e61f91d7b
Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev
...
am: 0dc85bcc1e
2017-08-10 00:44:59 +00:00
TreeHugger Robot
0dc85bcc1e
Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev
2017-08-10 00:38:43 +00:00
Justin Klaassen
a2075d2eb4
DO NOT MERGE - Ask device owner for master clear in demo mode am: a22c8345fa -s ours
...
am: be3c8bf442
2017-08-10 00:37:58 +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
Justin Klaassen
be3c8bf442
DO NOT MERGE - Ask device owner for master clear in demo mode
...
am: a22c8345fa
2017-08-10 00:36:20 +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
qqzhou
23a16c2ae4
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am: 2c2b6b48de
...
am: 13d1167e44
2017-08-10 00:09:08 +00:00
Daniel Nishi
2151d69764
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am: 97e0e42959
...
am: b2da45dd09
2017-08-10 00:08:13 +00:00
Matthew Fritze
005748ba21
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev am: 3161375f78
...
am: 8efbe4e120
2017-08-10 00:06:54 +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
The Android Open Source Project
df5bd79a29
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: dd6d975214 -s ours
...
am: 5d13310d94
2017-08-10 00:06:08 +00:00
Daniel Nishi
a17d748f9b
Merge "Expose the notification-swipe controls." into oc-dr1-dev am: c075f8943e
...
am: 5f3f655ad2
2017-08-10 00:05:18 +00:00
Ruchi Kandoi
71a351af08
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am: 9eff3f90d8
...
am: 3b012860db
2017-08-10 00:04:52 +00:00
Salvador Martinez
5cefe64942
Merge "Update availability for mobile network" into oc-dr1-dev am: 4bcc3eb193
...
am: 3781030b94
2017-08-10 00:02:05 +00:00
Jayachandran C
4b2f10ed3c
Do not translate "Wi-Fi calling" for VF DE
...
Test: Validated it by mimicking using T-Mobile SIM
Bug: 64139042
Change-Id: Iad3a6b9b7a47af140b14adebae55babfe31a4c26
2017-08-09 16:52:42 -07: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
319c45ad51
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am: 97e0e42959 -s ours
...
am: 14be0e4124
2017-08-09 22:54:24 +00:00
Matthew Fritze
580810a738
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev am: 3161375f78 -s ours
...
am: 730bad152c
2017-08-09 22:52:43 +00:00
The Android Open Source Project
71460b0859
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: dd6d975214 -s ours
...
am: aeee659147
2017-08-09 22:52:06 +00:00
