Doris Ling
5eee89ea95
Initialize the volume seekbar preference max and progress. am: cbc231c545 am: f9ff9b9f5c
...
am: f92ca61cca
2017-08-10 22:42:06 +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
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
Joachim Sauer
8a739a4bd1
Merge "Implement auto 12/24h setting toggle."
2017-08-10 16:36:47 +00:00
Joachim Sauer
95beae0089
Implement auto 12/24h setting toggle.
...
This implements an explicit toggle to enable/disable automatic 12h/24h
time formatting detection based on the current locale.
Previously automatic detection was the norm on a freshly wiped device,
but could never be re-enabled once either 12h or 24h format was
configured.
Bug: 32761619
Test: m RunSettingsRoboTests
Change-Id: Idbbb8f79fccec95e33bf2f12767d5736e1118fa7
2017-08-10 13:32:17 +01:00
Antony Sargent
103da1ddd2
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev am: 49cd8f2327 am: 8cd8519eab
...
am: c7e3832e80
2017-08-10 07:32:48 +00:00
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
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
Jayachandran Chinnakkannu
480671d048
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
...
am: fda92d3491
2017-08-10 06:26:57 +00:00
Jayachandran Chinnakkannu
cd4614d488
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am: 9476e824be am: 7398553a81
...
am: eddeef3b0e
2017-08-10 06:22:10 +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
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
TreeHugger Robot
c4d8c456ed
Merge "Move tests from tests/app/ to tests/unit/"
2017-08-10 02:52:37 +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
Justin Klaassen
5fb1bf397e
DO NOT MERGE - Ask device owner for master clear in demo mode am: a22c8345fa am: 0a982f39c2
...
am: 26b413d7a4
2017-08-10 02:32:14 +00:00
Fan Zhang
17cfd9f500
Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev am: 0dc85bcc1e
...
am: 1e61f91d7b
2017-08-10 02:31:39 +00:00
Justin Klaassen
1e18e9c6c0
DO NOT MERGE - Ask device owner for master clear in demo mode am: a22c8345fa -s ours am: be3c8bf442
...
am: a2075d2eb4
2017-08-10 02:31:18 +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
qqzhou
366cf1ba78
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am: 2c2b6b48de am: 13d1167e44
...
am: 23a16c2ae4
2017-08-10 02:30:37 +00:00
Daniel Nishi
36b3c7ca68
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am: 97e0e42959 am: b2da45dd09 -s ours
...
am: 2151d69764
2017-08-10 02:29:46 +00:00
Matthew Fritze
775f46bbbb
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev am: 3161375f78 am: 8efbe4e120 -s ours
...
am: 005748ba21
2017-08-10 02:28:43 +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
The Android Open Source Project
f6d579674b
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: dd6d975214 -s ours am: 5d13310d94 -s ours
...
am: df5bd79a29
2017-08-10 02:27:57 +00:00
Daniel Nishi
03b045560d
Merge "Expose the notification-swipe controls." into oc-dr1-dev am: c075f8943e am: 5f3f655ad2
...
am: a17d748f9b
2017-08-10 02:27:12 +00:00
Ruchi Kandoi
7b5bc6b2b1
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am: 9eff3f90d8 am: 3b012860db
...
am: 71a351af08
2017-08-10 02:26:48 +00:00
Salvador Martinez
cb9614d18c
Merge "Update availability for mobile network" into oc-dr1-dev am: 4bcc3eb193 am: 3781030b94
...
am: 5cefe64942
2017-08-10 02:25:43 +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
11c93deda6
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am: 97e0e42959 -s ours am: 14be0e4124 -s ours
...
am: 319c45ad51
2017-08-10 02:24:19 +00:00
Matthew Fritze
6de9f65ced
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev am: 3161375f78 -s ours am: 730bad152c -s ours
...
am: 580810a738
2017-08-10 02:22:54 +00:00
The Android Open Source Project
1ad08db58c
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: dd6d975214 -s ours am: aeee659147 -s ours
...
am: 71460b0859
2017-08-10 02:22:31 +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
