OSDN Git Service
Kevin Chyn [Fri, 11 Aug 2017 17:34:35 +0000 (17:34 +0000)]
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
am:
2e7b65f74a
Change-Id: I20ab95a2a6b677ac04cd46dbf89775f1cd8f071c
TreeHugger Robot [Fri, 11 Aug 2017 17:26:08 +0000 (17:26 +0000)]
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
Ajay Nadathur [Fri, 11 Aug 2017 17:21:24 +0000 (17:21 +0000)]
Merge "Update strings for skip fingerprint setup" into oc-mr1-dev
am:
719d80e6e0
Change-Id: I844147fa567fd168dbf14effb746d96aee12ad3a
Ajay Nadathur [Fri, 11 Aug 2017 17:12:26 +0000 (17:12 +0000)]
Merge "Update strings for skip fingerprint setup" into oc-mr1-dev
Kevin Chyn [Fri, 11 Aug 2017 03:06:19 +0000 (03:06 +0000)]
Merge "Clean up AssistGesturePreferenceController" into oc-mr1-dev
am:
14450c5669
Change-Id: I511a265ff31d6ced75bc3915c97e09eb95cbbc51
TreeHugger Robot [Fri, 11 Aug 2017 03:01:33 +0000 (03:01 +0000)]
Merge "Clean up AssistGesturePreferenceController" into oc-mr1-dev
Kevin Chyn [Fri, 4 Aug 2017 00:03:13 +0000 (17:03 -0700)]
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
Ajay Nadathur [Thu, 10 Aug 2017 19:36:00 +0000 (12:36 -0700)]
Update strings for skip fingerprint setup
bug:
64092225
Test: Manually tested and verified updated strings used
Change-Id: I813f72abb8cb9fd2ba9ec952c0926ecd2f670ed0
Doris Ling [Thu, 10 Aug 2017 22:36:27 +0000 (22:36 +0000)]
Initialize the volume seekbar preference max and progress. am:
cbc231c545
am:
cd4dc413f4
Change-Id: I5408c62bbf0c1a7669388e4fffd76b317bbf8e15
Doris Ling [Thu, 10 Aug 2017 22:35:40 +0000 (22:35 +0000)]
Initialize the volume seekbar preference max and progress. am:
cbc231c545
am:
f9ff9b9f5c
Change-Id: Idf70f2a7a277924a6486ae7b976d57abd1789051
Doris Ling [Thu, 10 Aug 2017 22:29:23 +0000 (22:29 +0000)]
Initialize the volume seekbar preference max and progress.
am:
cbc231c545
Change-Id: Ifd70d6362064f640dfd899d4437d582d853ed7a7
Doris Ling [Thu, 10 Aug 2017 22:28:20 +0000 (22:28 +0000)]
Initialize the volume seekbar preference max and progress.
am:
cbc231c545
Change-Id: Ibfe977a33e25f5cd7188062595f2c8aa990ee8f3
Doris Ling [Tue, 8 Aug 2017 23:52:42 +0000 (16:52 -0700)]
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
b7490bea28cb28d301fe4ec0275cef7129621206)
Antony Sargent [Thu, 10 Aug 2017 07:29:33 +0000 (07:29 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev am:
49cd8f2327
am:
8cd8519eab
Change-Id: I74d3cae7409336fe4d4ac33aa8802664bcf5cc7d
Antony Sargent [Thu, 10 Aug 2017 07:28:51 +0000 (07:28 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev am:
49cd8f2327
am:
0fe460a8e3
Change-Id: I000eba2d8266b3d86f08c336f4ae3217ae48b8ac
Antony Sargent [Thu, 10 Aug 2017 07:25:53 +0000 (07:25 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
am:
49cd8f2327
Change-Id: I4b8989fd95405bfeb7ada518b0ce2f76dec5cdb3
Antony Sargent [Thu, 10 Aug 2017 07:25:52 +0000 (07:25 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
am:
49cd8f2327
Change-Id: I02c6056ab8efb238cb8ba97ea4d4ea6de247c13d
TreeHugger Robot [Thu, 10 Aug 2017 07:23:29 +0000 (07:23 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
Android Build Merger (Role) [Thu, 10 Aug 2017 06:18:20 +0000 (06:18 +0000)]
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
Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:14:27 +0000 (06:14 +0000)]
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am:
9476e824be
am:
7398553a81
Change-Id: Ib1f0f6349ad278f4db4da83fe2149215dd3c06ce
Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:13:36 +0000 (06:13 +0000)]
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am:
9476e824be
am:
835152f391
Change-Id: I7fa8c65dc7f1a353989720f6a66cb12a63a51a42
Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:04:37 +0000 (06:04 +0000)]
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
am:
9476e824be
Change-Id: I584d95282cc7c5f681fd6bc5ac4c0f03ad22053c
Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:04:30 +0000 (06:04 +0000)]
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
am:
9476e824be
Change-Id: I7aa611840a3e14476f7f637be866920b5723d39c
Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:00:29 +0000 (06:00 +0000)]
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
Antony Sargent [Wed, 9 Aug 2017 22:57:17 +0000 (15:57 -0700)]
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
Doris Ling [Thu, 10 Aug 2017 03:54:12 +0000 (03:54 +0000)]
Merge "Log preference change as Integer instead of Long." into oc-mr1-dev
am:
7074e25a0e
Change-Id: I2e0994f910863ad892f6008f27cbcc59a6e3c1ef
TreeHugger Robot [Thu, 10 Aug 2017 03:41:07 +0000 (03:41 +0000)]
Merge "Log preference change as Integer instead of Long." into oc-mr1-dev
Doris Ling [Thu, 10 Aug 2017 01:53:50 +0000 (01:53 +0000)]
Merge "Initialize the volume seekbar preference max and progress." into oc-mr1-dev
am:
db56114b34
Change-Id: I696eb7a3267febf3ad8f21d7c5e9e7887bafb59e
Kevin Chyn [Thu, 27 Jul 2017 00:35:23 +0000 (17:35 -0700)]
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
TreeHugger Robot [Thu, 10 Aug 2017 01:41:45 +0000 (01:41 +0000)]
Merge "Initialize the volume seekbar preference max and progress." into oc-mr1-dev
Justin Klaassen [Thu, 10 Aug 2017 00:51:33 +0000 (00:51 +0000)]
DO NOT MERGE - Ask device owner for master clear in demo mode am:
a22c8345fa
am:
0a982f39c2
Change-Id: If3364d5493c94e7688b32abe092ed34171622d78
Fan Zhang [Thu, 10 Aug 2017 00:44:59 +0000 (00:44 +0000)]
Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev
am:
0dc85bcc1e
Change-Id: I3942d07dd5c0acd5640ad50b7311ba15177f5a6d
TreeHugger Robot [Thu, 10 Aug 2017 00:38:43 +0000 (00:38 +0000)]
Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev
Justin Klaassen [Thu, 10 Aug 2017 00:37:58 +0000 (00:37 +0000)]
DO NOT MERGE - Ask device owner for master clear in demo mode am:
a22c8345fa -s ours
am:
be3c8bf442
Change-Id: I3514945d92ca8036a5e890317ff9343eb7784b0d
Fan Zhang [Thu, 10 Aug 2017 00:37:34 +0000 (00:37 +0000)]
Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev
am:
5b820431d3
Change-Id: I269323c219ccd8e5d343b62bfbc6160959f5340f
Justin Klaassen [Thu, 10 Aug 2017 00:36:20 +0000 (00:36 +0000)]
DO NOT MERGE - Ask device owner for master clear in demo mode
am:
a22c8345fa -s ours
Change-Id: Idba1b64f82a297c5617073e29c5f07902ca69177
Doris Ling [Tue, 8 Aug 2017 21:03:29 +0000 (14:03 -0700)]
Log preference change as Integer instead of Long.
Change-Id: I3dc93a4b8a5aa7f03bef05d39bd4504ed205334f
Fix:
64485529
Test: make RunSettingsRoboTests
TreeHugger Robot [Thu, 10 Aug 2017 00:28:03 +0000 (00:28 +0000)]
Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev
Fan Zhang [Thu, 3 Aug 2017 00:32:43 +0000 (17:32 -0700)]
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
Justin Klaassen [Thu, 10 Aug 2017 00:23:52 +0000 (00:23 +0000)]
DO NOT MERGE - Ask device owner for master clear in demo mode
am:
a22c8345fa
Change-Id: Idf0f52476201a55c6d3a8051158e0ea3a7f555b0
qqzhou [Thu, 10 Aug 2017 00:09:08 +0000 (00:09 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am:
2c2b6b48de
am:
13d1167e44
Change-Id: I960589b0eb1fff23b1254f462ce52d1b2e433b23
Daniel Nishi [Thu, 10 Aug 2017 00:08:13 +0000 (00:08 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am:
97e0e42959
am:
b2da45dd09 -s ours
Change-Id: Ic8d931d7ca59e69d168b0ca787dfbf8643899eea
Matthew Fritze [Thu, 10 Aug 2017 00:06:54 +0000 (00:06 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev am:
3161375f78
am:
8efbe4e120 -s ours
Change-Id: I3b2d7249a8b174dc6fe0aa072cc8767c8c859090
mingliang.x.lei [Thu, 10 Aug 2017 00:06:32 +0000 (00:06 +0000)]
Merge "Fix memory leak in Bluetooth settings" am:
5a652c0286 am:
8d3bb3e2ad am:
c46b5e60b9
am:
8ba28798aa
Change-Id: Ib0f0e1d0ec3bbcf2223e5609bc6218f0c360a5cb
The Android Open Source Project [Thu, 10 Aug 2017 00:06:08 +0000 (00:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
dd6d975214 -s ours
am:
5d13310d94 -s ours
Change-Id: I15188bd1727dca63df2ddf3cbd1435c5bfbfc79a
Daniel Nishi [Thu, 10 Aug 2017 00:05:18 +0000 (00:05 +0000)]
Merge "Expose the notification-swipe controls." into oc-dr1-dev am:
c075f8943e
am:
5f3f655ad2
Change-Id: I74680d46cc09148a58062c5c4f24404b6cc19713
Ruchi Kandoi [Thu, 10 Aug 2017 00:04:52 +0000 (00:04 +0000)]
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am:
9eff3f90d8
am:
3b012860db
Change-Id: I9c36d1d2f111e39a517fac319ececb7a4abf25cd
Salvador Martinez [Thu, 10 Aug 2017 00:02:05 +0000 (00:02 +0000)]
Merge "Update availability for mobile network" into oc-dr1-dev am:
4bcc3eb193
am:
3781030b94
Change-Id: Id6bee10ec7356c9446278d1d314d527a5bc8bdc3
Jayachandran C [Tue, 8 Aug 2017 20:06:51 +0000 (13:06 -0700)]
Do not translate "Wi-Fi calling" for VF DE
Test: Validated it by mimicking using T-Mobile SIM
Bug:
64139042
Change-Id: Iad3a6b9b7a47af140b14adebae55babfe31a4c26
qqzhou [Wed, 9 Aug 2017 23:04:07 +0000 (23:04 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am:
2c2b6b48de
am:
467aad4219
Change-Id: I8084bdf06e20e94a2963f5bfe590a7588a9c2e4c
Daniel Nishi [Wed, 9 Aug 2017 22:54:24 +0000 (22:54 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am:
97e0e42959 -s ours
am:
14be0e4124 -s ours
Change-Id: Ib0be13003a7a56fb64d0f8a901bc38850627e8f8
Matthew Fritze [Wed, 9 Aug 2017 22:52:43 +0000 (22:52 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev am:
3161375f78 -s ours
am:
730bad152c -s ours
Change-Id: I3a79f410b37f330deed8bdb8a6e6c7070f3ce732
The Android Open Source Project [Wed, 9 Aug 2017 22:52:06 +0000 (22:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
dd6d975214 -s ours
am:
aeee659147 -s ours
Change-Id: I446a2efc2cc4afda46abdb775ffb36044ae82983
Daniel Nishi [Wed, 9 Aug 2017 22:51:45 +0000 (22:51 +0000)]
Merge "Expose the notification-swipe controls." into oc-dr1-dev am:
c075f8943e
am:
8bbc28a95b
Change-Id: I2f52d59322a5b5f3960aa686adca06451ca87d13
qqzhou [Wed, 9 Aug 2017 22:41:12 +0000 (22:41 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
am:
2c2b6b48de
Change-Id: Id7c3417b82cd6f814f5ffbdd993a8c22be1c7a81
Daniel Nishi [Wed, 9 Aug 2017 22:39:55 +0000 (22:39 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
am:
97e0e42959 -s ours
Change-Id: Id1083efaf83092cf8329fac64b933dfb9e652396
Matthew Fritze [Wed, 9 Aug 2017 22:38:28 +0000 (22:38 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
am:
3161375f78 -s ours
Change-Id: I34e117b92e73a36f9c3c70f7c2e6b224ed308a0b
The Android Open Source Project [Wed, 9 Aug 2017 22:37:57 +0000 (22:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
dd6d975214 -s ours
Change-Id: I2ae2cce68305a32c8f1272a46b3eb784e32b8b22
Daniel Nishi [Wed, 9 Aug 2017 22:37:34 +0000 (22:37 +0000)]
Merge "Expose the notification-swipe controls." into oc-dr1-dev
am:
c075f8943e
Change-Id: I479a411c032df7426d89838a668f4303c4d67a54
Justin Klaassen [Wed, 9 Aug 2017 04:58:05 +0000 (21:58 -0700)]
DO NOT MERGE - Ask device owner for master clear in demo mode
Bug:
62712426
Test: make RunSettingsRoboTests -j19
Change-Id: I29f92ff1062590f2c5eb7713e5969da7870fc582
qqzhou [Wed, 9 Aug 2017 21:07:36 +0000 (21:07 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
am:
2c2b6b48de
Change-Id: I4255d1eea7583a448172dbfaba5fdec1eb168c28
TreeHugger Robot [Wed, 9 Aug 2017 20:57:50 +0000 (20:57 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
Fan Zhang [Wed, 9 Aug 2017 18:28:38 +0000 (11:28 -0700)]
Update icon and string for new device intro suggestion
Change-Id: If1cca8e54e277d0ad58b76318df58842f2bec886
Fixes:
64342027
Test: visual
Doris Ling [Tue, 8 Aug 2017 23:52:42 +0000 (16:52 -0700)]
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
Ruchi Kandoi [Wed, 9 Aug 2017 20:35:36 +0000 (20:35 +0000)]
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am:
9eff3f90d8
am:
bf81a17a31
Change-Id: I8ac2a1d903588f27b57b7f5993cb833100436108
Salvador Martinez [Wed, 9 Aug 2017 20:28:30 +0000 (20:28 +0000)]
Merge "Update availability for mobile network" into oc-dr1-dev am:
4bcc3eb193
am:
7bc388d823
Change-Id: I33cb44239c0725efd34611c06ed1734a6898d943
Ajay Nadathur [Wed, 9 Aug 2017 20:27:45 +0000 (20:27 +0000)]
Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev
am:
0ed0319005
Change-Id: I37fdea03ab0193a6c42da584166c30ce6ee7b3c7
Ruchi Kandoi [Wed, 9 Aug 2017 20:22:10 +0000 (20:22 +0000)]
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev
am:
9eff3f90d8
Change-Id: I35b7606035a45c1705d0d8775b55c5d7ec9aa672
Salvador Martinez [Wed, 9 Aug 2017 20:21:32 +0000 (20:21 +0000)]
Merge "Update availability for mobile network" into oc-dr1-dev
am:
4bcc3eb193
Change-Id: I8dca27c407709961ed28c64b76304894d5456781
TreeHugger Robot [Wed, 9 Aug 2017 20:15:20 +0000 (20:15 +0000)]
Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev
Fan Zhang [Wed, 9 Aug 2017 20:05:14 +0000 (20:05 +0000)]
Merge "Close cursor after getting data from DB" into oc-mr1-dev
am:
298d559c40
Change-Id: Ie93dd52be56f24d8bf5d3e12fd1ae02cb189a588
Eric Schwarzenbach [Wed, 9 Aug 2017 20:02:03 +0000 (20:02 +0000)]
Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev
am:
51bde3c8fe
Change-Id: Ie9139274f1c472baa87121d5a6faf8c2b40b6a3f
Justin Klaassen [Wed, 9 Aug 2017 20:01:40 +0000 (20:01 +0000)]
Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev
am:
d59854de24
Change-Id: I244bebfc463e3d045556a74a2de0cb9ef5f862af
TreeHugger Robot [Wed, 9 Aug 2017 19:58:36 +0000 (19:58 +0000)]
Merge "Close cursor after getting data from DB" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 19:49:41 +0000 (19:49 +0000)]
Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 19:40:03 +0000 (19:40 +0000)]
Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev
Andrew Sapperstein [Wed, 9 Aug 2017 19:33:30 +0000 (19:33 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am:
64b15c4a7b
am:
92592b4c25
Change-Id: I9dea2428459cf654f1e509114f2ec97ea9e6811b
Daniel Nishi [Wed, 9 Aug 2017 19:27:58 +0000 (19:27 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
am:
97e0e42959
Change-Id: I14f7ce1b372520d52f6e91e047aea15e764f18a3
Matthew Fritze [Wed, 9 Aug 2017 19:26:10 +0000 (19:26 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
am:
3161375f78
Change-Id: Iea4b58025fbc83557b4eb37940931eb0b831cc45
Daniel Nishi [Wed, 9 Aug 2017 19:25:35 +0000 (19:25 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 19:15:27 +0000 (19:15 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
mingliang.x.lei [Wed, 9 Aug 2017 18:53:07 +0000 (18:53 +0000)]
Merge "Fix memory leak in Bluetooth settings" am:
5a652c0286 am:
8d3bb3e2ad
am:
c46b5e60b9
Change-Id: I1c8766701e83c9354bebf6554742c24756de7117
Matthew Fritze [Wed, 9 Aug 2017 18:37:19 +0000 (18:37 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev
am:
e0c0616d6f
Change-Id: I4c63b3c4fad2824d45cc6637d08074a7fb3059fd
mingliang.x.lei [Wed, 9 Aug 2017 18:36:33 +0000 (18:36 +0000)]
Merge "Fix memory leak in Bluetooth settings" am:
5a652c0286
am:
8d3bb3e2ad
Change-Id: Iebccb788115a2be1fca3144199fc3e857a11556f
mingliang.x.lei [Wed, 9 Aug 2017 18:34:07 +0000 (18:34 +0000)]
Merge "Fix memory leak in Bluetooth settings"
am:
5a652c0286
Change-Id: Ica95ac1bed6dbbc305315a32c1c9a92bb83d4574
Treehugger Robot [Wed, 9 Aug 2017 18:27:43 +0000 (18:27 +0000)]
Merge "Fix memory leak in Bluetooth settings"
TreeHugger Robot [Wed, 9 Aug 2017 18:22:21 +0000 (18:22 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev
Fan Zhang [Wed, 9 Aug 2017 18:04:15 +0000 (18:04 +0000)]
Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev
am:
293899d5ce
Change-Id: Ic1518ede3d6ae01f409c44582415233371ba48ab
Fan Zhang [Wed, 9 Aug 2017 18:03:29 +0000 (18:03 +0000)]
Merge "Misc fixes for settings" into oc-mr1-dev
am:
54d816fd90
Change-Id: I7a015ea3ddd7b7cdd9db6896e6459ce3f491dabc
TreeHugger Robot [Wed, 9 Aug 2017 17:53:22 +0000 (17:53 +0000)]
Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 17:52:49 +0000 (17:52 +0000)]
Merge "Misc fixes for settings" into oc-mr1-dev
Ajay Nadathur [Tue, 1 Aug 2017 00:18:56 +0000 (17:18 -0700)]
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
Justin Klaassen [Wed, 9 Aug 2017 04:58:05 +0000 (21:58 -0700)]
Ask device owner for master clear in demo mode
Bug:
62712426
Test: make RunSettingsRoboTests -j19
Change-Id: I29f92ff1062590f2c5eb7713e5969da7870fc582
The Android Open Source Project [Wed, 9 Aug 2017 17:14:44 +0000 (17:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
882d35715e -s ours
Change-Id: I2eccdf0b32f8a206717eedbe14a39102e9cb2070
TreeHugger Robot [Wed, 9 Aug 2017 16:46:44 +0000 (16:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
The Android Open Source Project [Wed, 9 Aug 2017 16:31:10 +0000 (16:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
dd6d975214 -s ours
Change-Id: Ibdf27617dfdd337155c1d2bbc756621234bdf515
Daniel Nishi [Wed, 9 Aug 2017 16:30:01 +0000 (16:30 +0000)]
Merge "Expose the notification-swipe controls." into oc-dr1-dev
am:
c075f8943e
Change-Id: If4e022ce3189995eade9b7ef8ce131bf97be71b3
TreeHugger Robot [Wed, 9 Aug 2017 16:20:46 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Daniel Nishi [Wed, 9 Aug 2017 16:16:49 +0000 (16:16 +0000)]
Merge "Expose the notification-swipe controls." into oc-dr1-dev
Oren Blasberg [Wed, 9 Aug 2017 16:06:02 +0000 (16:06 +0000)]
Merge "Update SMS mirroring icon to new style." into oc-mr1-dev
am:
a3a0a1e2e8
Change-Id: I9de7aeaa4e81b969c40e137125777f8eb7274152
OSDN Git Service
