Commit Graph

38778 Commits

Author SHA1 Message Date
Maurice Lam
2bc609a1bd Add fingerprint illustration image
Test: Manual
Bug: 38210310
Change-Id: I95b4940792c172cf866f71c0fef9859e69d60074
2017-08-16 11:44:19 -07:00
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
fdbe5d9f82 Revert "Import translations. DO NOT MERGE"
am: d8d29f2964  -s ours

Change-Id: Ia169054dc581d5633ceed24edf4892a10ca601ad
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
8944eb96c8 Import translations. DO NOT MERGE
am: a2a4037f59  -s ours

Change-Id: I70d51d28867e44da0d95e14089584988ae3c98e9
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
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
TreeHugger Robot
2e7b65f74a Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev 2017-08-11 17:26:08 +00:00
Ajay Nadathur
719d80e6e0 Merge "Update strings for skip fingerprint setup" into oc-mr1-dev 2017-08-11 17:12:26 +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
f9ff9b9f5c Initialize the volume seekbar preference max and progress.
am: cbc231c545

Change-Id: Ibfe977a33e25f5cd7188062595f2c8aa990ee8f3
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
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
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
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
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
TreeHugger Robot
7074e25a0e Merge "Log preference change as Integer instead of Long." into oc-mr1-dev 2017-08-10 03:41:07 +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
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
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
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
qqzhou
467aad4219 Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
am: 2c2b6b48de

Change-Id: Id7c3417b82cd6f814f5ffbdd993a8c22be1c7a81
2017-08-09 22:41:12 +00:00
Daniel Nishi
14be0e4124 Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
am: 97e0e42959  -s ours

Change-Id: Id1083efaf83092cf8329fac64b933dfb9e652396
2017-08-09 22:39:55 +00:00
Matthew Fritze
730bad152c Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
am: 3161375f78  -s ours

Change-Id: I34e117b92e73a36f9c3c70f7c2e6b224ed308a0b
2017-08-09 22:38:28 +00:00
The Android Open Source Project
aeee659147 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: dd6d975214  -s ours

Change-Id: I2ae2cce68305a32c8f1272a46b3eb784e32b8b22
2017-08-09 22:37:57 +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
TreeHugger Robot
2c2b6b48de Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev 2017-08-09 20:57:50 +00:00
Fan Zhang
3fc194017d Update icon and string for new device intro suggestion
Change-Id: If1cca8e54e277d0ad58b76318df58842f2bec886
Fixes: 64342027
Test: visual
2017-08-09 13:57:37 -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
Ruchi Kandoi
bf81a17a31 Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev
am: 9eff3f90d8

Change-Id: I35b7606035a45c1705d0d8775b55c5d7ec9aa672
2017-08-09 20:22:10 +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
TreeHugger Robot
298d559c40 Merge "Close cursor after getting data from DB" into oc-mr1-dev 2017-08-09 19:58:36 +00:00
TreeHugger Robot
51bde3c8fe Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev 2017-08-09 19:49:41 +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
97e0e42959 Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev 2017-08-09 19:25:35 +00:00
TreeHugger Robot
3161375f78 Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev 2017-08-09 19:15:27 +00:00
TreeHugger Robot
e0c0616d6f Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev 2017-08-09 18:22:21 +00:00
TreeHugger Robot
293899d5ce Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev 2017-08-09 17:53:22 +00:00
TreeHugger Robot
54d816fd90 Merge "Misc fixes for settings" into oc-mr1-dev 2017-08-09 17:52:49 +00:00
Ajay Nadathur
bf3a135170 Show confirmation dialog when user tries to skip fingerprint
- After the user finished adding lock screen, if the user tries to skip
fingerprint setup, show a confirmation dialog

bug: 64092225
Test: Manually tested; robolectric tests also added
Change-Id: Iba5088a9db93153988942cf78f11077f427e50cb
2017-08-09 17:51:50 +00:00