Commit Graph

39517 Commits

Author SHA1 Message Date
Kevin Chyn
5e8f4b6320 Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
am: 2e7b65f74a

Change-Id: I20ab95a2a6b677ac04cd46dbf89775f1cd8f071c
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
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
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
Doris Ling
549ff2cddc Initialize the volume seekbar preference max and progress. am: cbc231c545
am: cd4dc413f4

Change-Id: I5408c62bbf0c1a7669388e4fffd76b317bbf8e15
2017-08-10 22:36:27 +00:00
Doris Ling
f92ca61cca Initialize the volume seekbar preference max and progress. am: cbc231c545
am: f9ff9b9f5c

Change-Id: Idf70f2a7a277924a6486ae7b976d57abd1789051
2017-08-10 22:35:40 +00:00
Doris Ling
cd4dc413f4 Initialize the volume seekbar preference max and progress.
am: cbc231c545

Change-Id: Ifd70d6362064f640dfd899d4437d582d853ed7a7
2017-08-10 22:29:23 +00:00
Doris Ling
f9ff9b9f5c Initialize the volume seekbar preference max and progress.
am: cbc231c545

Change-Id: Ibfe977a33e25f5cd7188062595f2c8aa990ee8f3
2017-08-10 22:28:20 +00: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
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

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

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
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

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

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

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

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

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
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
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
Justin Klaassen
26b413d7a4 DO NOT MERGE - Ask device owner for master clear in demo mode am: a22c8345fa
am: 0a982f39c2

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

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

Change-Id: I3514945d92ca8036a5e890317ff9343eb7784b0d
2017-08-10 00:37:58 +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
Justin Klaassen
be3c8bf442 DO NOT MERGE - Ask device owner for master clear in demo mode
am: a22c8345fa  -s ours

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

Change-Id: Idf0f52476201a55c6d3a8051158e0ea3a7f555b0
2017-08-10 00:23:52 +00:00
qqzhou
23a16c2ae4 Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am: 2c2b6b48de
am: 13d1167e44

Change-Id: I960589b0eb1fff23b1254f462ce52d1b2e433b23
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  -s ours

Change-Id: Ic8d931d7ca59e69d168b0ca787dfbf8643899eea
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  -s ours

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

Change-Id: Ib0f0e1d0ec3bbcf2223e5609bc6218f0c360a5cb
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  -s ours

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

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

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

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