Commit Graph

39481 Commits

Author SHA1 Message Date
TreeHugger Robot
858ea46a3a Merge "Change strings from Instant app account to setting" into oc-mr1-dev 2017-08-15 01:18:27 +00:00
Bill Yi
52744ebaf1 Revert "Import translations. DO NOT MERGE" am: d8d29f2964 -s ours
am: fdbe5d9f82  -s ours

Change-Id: I3ba9ad28e11f9ef58d78b255434c3a8173829984
2017-08-14 13:49:45 +00:00
Bill Yi
ffded27909 Revert "Import translations. DO NOT MERGE" am: d8d29f2964 -s ours
am: 6ece6e96fb  -s ours

Change-Id: I0b39167d3a80e650d55104a6f8b1d19a3c4a52f9
2017-08-14 13:39:44 +00:00
Bill Yi
fdbe5d9f82 Revert "Import translations. DO NOT MERGE"
am: d8d29f2964  -s ours

Change-Id: Ia169054dc581d5633ceed24edf4892a10ca601ad
2017-08-14 13:35:42 +00:00
Bill Yi
6ece6e96fb Revert "Import translations. DO NOT MERGE"
am: d8d29f2964  -s ours

Change-Id: I6f29a8cc9f7667aa5209638e3caf1441216ea319
2017-08-14 13:35:42 +00:00
Bill Yi
d8d29f2964 Revert "Import translations. DO NOT MERGE"
This reverts commit a2a4037f59.

Change-Id: I2145ac4c4f1092799bbc547ef9ea7d19c101cd95
Exempt-From-Owner-Approval: translation import
2017-08-14 13:32:35 +00:00
Bill Yi
6b925ea6c9 Import translations. DO NOT MERGE am: a2a4037f59 -s ours
am: 8944eb96c8  -s ours

Change-Id: If0e4af025f0831b132cab08155731d40ac150bdd
2017-08-12 18:43:37 +00:00
Bill Yi
65dd906932 Import translations. DO NOT MERGE am: a2a4037f59 -s ours
am: d3f28537a4  -s ours

Change-Id: Ib8f0bd25e6c6a1b803b225da833393507c56003a
2017-08-12 18:42:28 +00:00
Bill Yi
8944eb96c8 Import translations. DO NOT MERGE
am: a2a4037f59  -s ours

Change-Id: I70d51d28867e44da0d95e14089584988ae3c98e9
2017-08-12 18:39:26 +00:00
Bill Yi
d3f28537a4 Import translations. DO NOT MERGE
am: a2a4037f59  -s ours

Change-Id: I5702da8e0a51efa1ab4ad1e262e53f720a36b96a
2017-08-12 18:39:26 +00:00
Bill Yi
a2a4037f59 Import translations. DO NOT MERGE
Change-Id: I8f1c2c8a6591596db2098eac88bbb99660cfbefa
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-12 08:56:25 -07:00
Jesse Evans
804b0daf49 Change strings from Instant app account to setting
Test: existing tests
Bug: 63762769
Change-Id: I5499f76b9f8b5f513813c4ee09a4fb00c96c3fd4
2017-08-11 18:12:42 -07:00
Maurice Lam
a773403cd2 Update strings for screen lock setup
am: 3eb4c8333e

Change-Id: If48e98edbdc3eb7266ca951e23994942f31c2ef4
2017-08-12 00:22:14 +00:00
Maurice Lam
3eb4c8333e Update strings for screen lock setup
Test: Manual, existing tests pass
Bug: 64084524
Change-Id: Iff4b004aaf504ae3d574428e41bf91fd46a66f30
2017-08-11 13:12:20 -07:00
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