Bill Yi
2b027338e3
Revert "Import translations. DO NOT MERGE"
...
This reverts commit 5530c73afa
2017-08-14 13:38:36 +00:00
Bill Yi
5530c73afa
Import translations. DO NOT MERGE
...
Change-Id: Iac929c86327445553e3c6e60aa22270bd2c43e5d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-12 08:36:20 -07:00
Kevin Chyn
e3ca685321
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev am: 2e7b65f74a
...
am: 5e8f4b6320
2017-08-11 17:49:58 +00:00
Kevin Chyn
5e8f4b6320
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
...
am: 2e7b65f74a
2017-08-11 17:34:35 +00:00
TreeHugger Robot
2e7b65f74a
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
2017-08-11 17:26:08 +00:00
Ajay Nadathur
2c2d41f8e9
Merge "Update strings for skip fingerprint setup" into oc-mr1-dev am: 719d80e6e0
...
am: aec29ee4be
2017-08-11 17:25:31 +00:00
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
Tony Mantler
db02207999
Merge "Don't lose dialogs during configuration change"
2017-08-11 16:28:43 +00:00
Kevin Chyn
a7144ae5b2
Merge "Clean up AssistGesturePreferenceController" into oc-mr1-dev am: 14450c5669
...
am: e54e3de80c
2017-08-11 03:11:27 +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
TreeHugger Robot
65e557754e
Merge "onConnectedChanged should not update access points"
2017-08-10 23:35:07 +00:00
Doris Ling
bd88f97591
Initialize the volume seekbar preference max and progress. am: cbc231c545 am: cd4dc413f4
...
am: 549ff2cddc
2017-08-10 22:42:42 +00:00
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
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
Tony Mantler
ff2f8c61ba
Don't lose dialogs during configuration change
...
Bug: 62442606
Test: Rotate device when a dialog is showing
Change-Id: I616d6030e2c43937e4b59dd7f6d78dd7124228dc
2017-08-10 14:21:04 -07: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
