Commit Graph

39002 Commits

Author SHA1 Message Date
Suprabh Shukla
78a9d598f1 Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7
am: 93a9e9f7f2  -s ours

Change-Id: If5bfd68d2a899813edb2ab550d8a2c0ed2db8d63
2017-08-16 19:38:35 +00:00
Suprabh Shukla
889036189b Disabling the activate button when paused am: de5df8b090 am: 779237e37f
am: 24547155ea  -s ours

Change-Id: Ic61623b7affc9599126b915d5a0e2a1471a58ea2
2017-08-16 19:37:01 +00:00
Suprabh Shukla
616c84ccb0 Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41
am: 1370eb3d52

Change-Id: Ifd670d7a6a673b49b2b0563b81a83fda20889126
2017-08-16 19:34:24 +00:00
Suprabh Shukla
ccad4a3621 Disabling the activate button when paused am: af5d8b9b03
am: 26f4aceece

Change-Id: If2a4dfdbe01e5bf1f2cfc6b2a61afc95f6f2addd
2017-08-16 19:33:34 +00:00
Suprabh Shukla
93a9e9f7f2 Disabling the activate button when paused am: 9ffee0d534
am: d27e28eab7

Change-Id: I975f6132333510ac6b40bf9683296885bdc54f05
2017-08-16 19:33:30 +00:00
Suprabh Shukla
24547155ea Disabling the activate button when paused am: de5df8b090
am: 779237e37f

Change-Id: I43d2f39fc179380a169fb1d04be8e473eedcadfb
2017-08-16 19:32:31 +00:00
Suprabh Shukla
1370eb3d52 Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d
am: 1e9af33c41

Change-Id: Iea61138c41fdb00ee30e0fba0d06b1d59b9c6afa
2017-08-16 19:30:03 +00:00
Suprabh Shukla
d27e28eab7 Disabling the activate button when paused
am: 9ffee0d534

Change-Id: I76f0f749ad159b50520e6f95d9bfaf2d8cca3429
2017-08-16 19:27:40 +00:00
Suprabh Shukla
26f4aceece Disabling the activate button when paused
am: af5d8b9b03

Change-Id: Icf4cd1c4ff5a520a72f9deedf85c486e892da250
2017-08-16 19:26:00 +00:00
Suprabh Shukla
1e9af33c41 Disabling the activate button when paused am: 8e08a9bb71
am: 08207f457d

Change-Id: I693fde0d9935e0b92fa8848b205db3a810a58b67
2017-08-16 19:25:59 +00:00
Suprabh Shukla
779237e37f Disabling the activate button when paused
am: de5df8b090

Change-Id: I7878f3f3addbb0f47f3c145a34977a9ebb62a055
2017-08-16 19:25:59 +00:00
Suprabh Shukla
08207f457d Disabling the activate button when paused
am: 8e08a9bb71

Change-Id: I9b9ccd0bd849d34343ff0a6d6b579274d02264c6
2017-08-16 19:22:01 +00:00
Maurice Lam
2bc609a1bd Add fingerprint illustration image
Test: Manual
Bug: 38210310
Change-Id: I95b4940792c172cf866f71c0fef9859e69d60074
2017-08-16 11:44:19 -07:00
Maurice Lam
595627c630 Merge "Use default primary color for choose lock screens" into oc-mr1-dev 2017-08-16 18:25:02 +00:00
TreeHugger Robot
0ece5f2a06 Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev 2017-08-16 07:51:27 +00:00
Bill Yi
cf96c9b13f Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: If0ff6ff971291e101e464f028e79fc18afa5b6a7
2017-08-15 21:53:30 -07:00
Maurice Lam
e9a6e8f1e5 Use default primary color for choose lock screens
Make the settings screens that inherit from SuwThemeGlif use the
default blue primary color.

Test: Manual
Bug: 63143321
Change-Id: I07026139a5e0562c192ec1ca9304d5cd3647d5b0
2017-08-15 19:30:14 -07:00
Maurice Lam
2bb6238044 Don't launch Choose Lock again if recreating
When ChooseLockGeneric is recreated, don't automatically launch
ChooseLock[Password/Pattern] even if the corresponding intent extras
are specified, because one would have been launched in the previous
onCreate.

Test: Manual
Bug: 64605627
Change-Id: I227a14abb2f4dd6c4577186a3d8164df0bec7791
2017-08-15 16:26:05 -07:00
Daniel Nishi
1533c85ade Re-init storage size on resume.
In Storage settings, we used to cache the sizes of the volume that we
were observing. This meant that we cached the free and total sizes. If a
large amount of data is cleared in another app and we resume the
Settings app, however, it will result in a large change in free space.

Because we calculate the categorization breakdown again on resume, this
causes most of the categories to reflect the current size.
Unfortunately, the free size is stale. This means that the amount of
data deleted gets attributed to system, instead of to nothing at all.

By restarting the loader to fetch the free/total size of the volume, we
can avoid this issue.

Change-Id: I07b244f02230d28a58fcb70d8d9cd595f2a0f68f
Fixes: 64135242
Test: Manual
2017-08-15 15:32:09 -07:00
Suprabh Shukla
9ffee0d534 Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.


Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
2017-08-15 03:43:10 +00:00
Suprabh Shukla
de5df8b090 Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
2017-08-15 03:40:37 +00:00
Suprabh Shukla
8e08a9bb71 Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.

Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
2017-08-15 03:35:43 +00:00
Suprabh Shukla
af5d8b9b03 Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.

Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
2017-08-15 02:37:37 +00: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
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
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