Commit Graph

3153 Commits

Author SHA1 Message Date
Ajay Nadathur
aec29ee4be Merge "Update strings for skip fingerprint setup" into oc-mr1-dev
am: 719d80e6e0

Change-Id: I844147fa567fd168dbf14effb746d96aee12ad3a
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

Change-Id: Ifa1964b6d9d6b32e8b2fc440c40f2431ddcc7b43
2017-08-11 03:11:27 +00:00
Kevin Chyn
e54e3de80c Merge "Clean up AssistGesturePreferenceController" into oc-mr1-dev
am: 14450c5669

Change-Id: I511a265ff31d6ced75bc3915c97e09eb95cbbc51
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
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
jackqdyulei
28284a52e6 Stop display "Cell network" item for tablet
If device doesn't support MOBILE_DATA, then stop show
"Mobile network standby" in battery advanced page.

Bug: 63252393
Test: RunSettingsRoboTests
Change-Id: Icaf5c0c781c96fa1d4df999c6769c27a84c27446
2017-08-10 13:33:25 -07: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
caaccbc72c Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev am: 49cd8f2327 am: 0fe460a8e3
am: d9456d807b

Change-Id: I5bd24cc8cc532ffdcec05c51424140e8dcc764f8
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

Change-Id: I000eba2d8266b3d86f08c336f4ae3217ae48b8ac
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

Change-Id: I4b8989fd95405bfeb7ada518b0ce2f76dec5cdb3
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

Change-Id: I02c6056ab8efb238cb8ba97ea4d4ea6de247c13d
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

Change-Id: I8f321efc5f8df7c767f6d10e3fa944d65058aa96
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

Change-Id: I2e0994f910863ad892f6008f27cbcc59a6e3c1ef
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

Change-Id: I7587f70afd9b0ed0dc4f7351871b6095a3610c8f
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

Change-Id: Ifd5618ddad3fcc9a535fe719470e67946bcd9d2d
2017-08-10 02:30:57 +00:00
Daniel Nishi
591c654fb7 Merge "Expose the notification-swipe controls." into oc-dr1-dev am: c075f8943e am: 8bbc28a95b
am: 6df5c65f45

Change-Id: I4cc89e8bebedc294c6c30ca6456f86f48a9a46b4
2017-08-10 02:22:09 +00:00
Salvador Martinez
f3692132ca Merge "Update availability for mobile network" into oc-dr1-dev am: 4bcc3eb193 am: 7bc388d823
am: 35c0949b2e

Change-Id: I3f7f56e233c8fe4b06269ef031fdce43800cf782
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

Change-Id: Ie7d1d6bd37274ac70c87fc6b8dca5f3118a64a64
2017-08-10 02:20:25 +00:00
Justin Klaassen
27ef303dd1 Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev am: d59854de24
am: 6652cfcd7e

Change-Id: I25161af9d86997b2d0808590fc0a89f8a3b16d04
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

Change-Id: I696eb7a3267febf3ad8f21d7c5e9e7887bafb59e
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
Fan Zhang
a8f7f745e1 Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev
am: 5b820431d3

Change-Id: I269323c219ccd8e5d343b62bfbc6160959f5340f
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

Change-Id: Idf0f52476201a55c6d3a8051158e0ea3a7f555b0
2017-08-10 00:23:52 +00:00
Doris Ling
109bb5e59a Move tests from tests/app/ to tests/unit/
- first round: move tests that currently pass

Bug: 62103184
Test: make SettingsUnitTests
Change-Id: Ief3adf88e5090621e5ec3957a71d1b56b4be186a
2017-08-09 17:12:46 -07:00
Daniel Nishi
6df5c65f45 Merge "Expose the notification-swipe controls." into oc-dr1-dev am: c075f8943e
am: 8bbc28a95b

Change-Id: I2f52d59322a5b5f3960aa686adca06451ca87d13
2017-08-09 22:51:45 +00:00
Daniel Nishi
8bbc28a95b Merge "Expose the notification-swipe controls." into oc-dr1-dev
am: c075f8943e

Change-Id: I479a411c032df7426d89838a668f4303c4d67a54
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
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
Salvador Martinez
35c0949b2e Merge "Update availability for mobile network" into oc-dr1-dev am: 4bcc3eb193
am: 7bc388d823

Change-Id: I33cb44239c0725efd34611c06ed1734a6898d943
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

Change-Id: I37fdea03ab0193a6c42da584166c30ce6ee7b3c7
2017-08-09 20:27:45 +00:00
Salvador Martinez
7bc388d823 Merge "Update availability for mobile network" into oc-dr1-dev
am: 4bcc3eb193

Change-Id: I8dca27c407709961ed28c64b76304894d5456781
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
Justin Klaassen
6652cfcd7e Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev
am: d59854de24

Change-Id: I244bebfc463e3d045556a74a2de0cb9ef5f862af
2017-08-09 20:01:40 +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
Daniel Nishi
b2da45dd09 Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
am: 97e0e42959

Change-Id: I14f7ce1b372520d52f6e91e047aea15e764f18a3
2017-08-09 19:27:58 +00:00
Matthew Fritze
8efbe4e120 Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
am: 3161375f78

Change-Id: Iea4b58025fbc83557b4eb37940931eb0b831cc45
2017-08-09 19:26:10 +00:00
Daniel Nishi
97e0e42959 Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev 2017-08-09 19:25:35 +00:00