OSDN Git Service
Eric Schwarzenbach [Mon, 7 Aug 2017 20:19:50 +0000 (13:19 -0700)]
Remove references to NetworkBadging.
Removes all references to the deprecated NetworkBadging class. Replaces
Badging enums with AccessPoint.Speed. Uses SettingsLib Utils class to
get the WifiIcons.
Note: This change depends on ag/
2676505.
Bug:
62355275
Test: make -j40 RunSettingsRoboTests
Change-Id: If3301ce30e22a7b2cc4d534b0a89e6d7ddfef45b
Jesse Evans [Tue, 15 Aug 2017 02:43:00 +0000 (02:43 +0000)]
Merge "Change strings from Instant app account to setting" into oc-mr1-dev am:
858ea46a3a
am:
eee0e82fba
Change-Id: I996ed8caf0581cc3f273423b7d8d3989235e2f4e
TreeHugger Robot [Tue, 15 Aug 2017 01:47:05 +0000 (01:47 +0000)]
Merge "Add userId to key when type is USER"
Jesse Evans [Tue, 15 Aug 2017 01:37:07 +0000 (01:37 +0000)]
Merge "Change strings from Instant app account to setting" into oc-mr1-dev
am:
858ea46a3a
Change-Id: I22fb4b6d3ee5456a591f8dfa8f78d9f6d6da82dd
TreeHugger Robot [Tue, 15 Aug 2017 01:18:27 +0000 (01:18 +0000)]
Merge "Change strings from Instant app account to setting" into oc-mr1-dev
TreeHugger Robot [Mon, 14 Aug 2017 22:38:11 +0000 (22:38 +0000)]
Merge "Use ThreadUtils instead of AsyncTask to get app title/icon"
Fan Zhang [Wed, 9 Aug 2017 23:18:15 +0000 (16:18 -0700)]
Use ThreadUtils instead of AsyncTask to get app title/icon
Change-Id: I44459d9e4a11329a3bd3bfda5057e05eb7e04d6a
Fixes:
63620905
Test: robotest
jackqdyulei [Fri, 11 Aug 2017 20:00:04 +0000 (13:00 -0700)]
Add userId to key when type is USER
Before this cl, the app list couldn't distinguish different users
because all of them have the same key: USER.
This cl adds userId into key, to make sure the preference key
is unique.
Bug:
64605854
Test: RunSettingsRoboTests
Change-Id: Ia4de2ff85b214465a35f1983ca69a9280d053154
Bill Yi [Mon, 14 Aug 2017 14:02:17 +0000 (14:02 +0000)]
Revert "Import translations. DO NOT MERGE" am:
d8d29f2964 -s ours am:
fdbe5d9f82 -s ours
am:
52744ebaf1 -s ours
Change-Id: If66ec28de393372d32e7479d4de1517cea149b56
Bill Yi [Mon, 14 Aug 2017 13:49:45 +0000 (13:49 +0000)]
Revert "Import translations. DO NOT MERGE" am:
d8d29f2964 -s ours
am:
fdbe5d9f82 -s ours
Change-Id: I3ba9ad28e11f9ef58d78b255434c3a8173829984
Bill Yi [Mon, 14 Aug 2017 13:43:14 +0000 (13:43 +0000)]
Revert "Import translations. DO NOT MERGE" am:
d8d29f2964 -s ours am:
6ece6e96fb -s ours
am:
ffded27909 -s ours
Change-Id: I6708e27a6f2ecb431c7cac77d12d6cab89b01bfa
Bill Yi [Mon, 14 Aug 2017 13:39:44 +0000 (13:39 +0000)]
Revert "Import translations. DO NOT MERGE" am:
d8d29f2964 -s ours
am:
6ece6e96fb -s ours
Change-Id: I0b39167d3a80e650d55104a6f8b1d19a3c4a52f9
Bill Yi [Mon, 14 Aug 2017 13:39:07 +0000 (13:39 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
Bill Yi [Mon, 14 Aug 2017 13:38:36 +0000 (13:38 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
5530c73afa58dbe5fd9fa5b8e6e0bfee2b64d70c.
Change-Id: I7804b7e3e00574424a95788ece7a4d28bcd761a7
Exempt-From-Owner-Approval: translation import
Bill Yi [Mon, 14 Aug 2017 13:35:42 +0000 (13:35 +0000)]
Revert "Import translations. DO NOT MERGE"
am:
d8d29f2964 -s ours
Change-Id: Ia169054dc581d5633ceed24edf4892a10ca601ad
Bill Yi [Mon, 14 Aug 2017 13:35:42 +0000 (13:35 +0000)]
Revert "Import translations. DO NOT MERGE"
am:
d8d29f2964 -s ours
Change-Id: I6f29a8cc9f7667aa5209638e3caf1441216ea319
Bill Yi [Mon, 14 Aug 2017 13:32:35 +0000 (13:32 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
a2a4037f593b6bbbe5c178971f13ef869b7ffe8e.
Change-Id: I2145ac4c4f1092799bbc547ef9ea7d19c101cd95
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 12 Aug 2017 18:46:06 +0000 (18:46 +0000)]
Import translations. DO NOT MERGE am:
a2a4037f59 -s ours am:
8944eb96c8 -s ours
am:
6b925ea6c9 -s ours
Change-Id: Ib3855bf1ea880e55ebfea6908340176bca1f70e7
Bill Yi [Sat, 12 Aug 2017 18:45:28 +0000 (18:45 +0000)]
Import translations. DO NOT MERGE am:
a2a4037f59 -s ours am:
d3f28537a4 -s ours
am:
65dd906932 -s ours
Change-Id: Ib48e8ea3b77bf7ebc6d579bf7ee34981cca4792c
Bill Yi [Sat, 12 Aug 2017 18:43:37 +0000 (18:43 +0000)]
Import translations. DO NOT MERGE am:
a2a4037f59 -s ours
am:
8944eb96c8 -s ours
Change-Id: If0e4af025f0831b132cab08155731d40ac150bdd
Bill Yi [Sat, 12 Aug 2017 18:42:28 +0000 (18:42 +0000)]
Import translations. DO NOT MERGE am:
a2a4037f59 -s ours
am:
d3f28537a4 -s ours
Change-Id: Ib8f0bd25e6c6a1b803b225da833393507c56003a
Bill Yi [Sat, 12 Aug 2017 18:39:26 +0000 (18:39 +0000)]
Import translations. DO NOT MERGE
am:
a2a4037f59 -s ours
Change-Id: I70d51d28867e44da0d95e14089584988ae3c98e9
Bill Yi [Sat, 12 Aug 2017 18:39:26 +0000 (18:39 +0000)]
Import translations. DO NOT MERGE
am:
a2a4037f59 -s ours
Change-Id: I5702da8e0a51efa1ab4ad1e262e53f720a36b96a
TreeHugger Robot [Sat, 12 Aug 2017 17:57:59 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sat, 12 Aug 2017 15:56:25 +0000 (08:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8f1c2c8a6591596db2098eac88bbb99660cfbefa
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 12 Aug 2017 15:36:20 +0000 (08:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iac929c86327445553e3c6e60aa22270bd2c43e5d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Maurice Lam [Sat, 12 Aug 2017 01:32:03 +0000 (01:32 +0000)]
Update strings for screen lock setup am:
3eb4c8333e
am:
a773403cd2 -s ours
Change-Id: I4a20a0f0ca018088098f2ad22fee6d5b3a9e8fad
Jesse Evans [Sat, 12 Aug 2017 00:51:33 +0000 (17:51 -0700)]
Change strings from Instant app account to setting
Test: existing tests
Bug:
63762769
Change-Id: I5499f76b9f8b5f513813c4ee09a4fb00c96c3fd4
Maurice Lam [Sat, 12 Aug 2017 00:22:14 +0000 (00:22 +0000)]
Update strings for screen lock setup
am:
3eb4c8333e
Change-Id: If48e98edbdc3eb7266ca951e23994942f31c2ef4
Maurice Lam [Thu, 3 Aug 2017 03:11:28 +0000 (20:11 -0700)]
Update strings for screen lock setup
Test: Manual, existing tests pass
Bug:
64084524
Change-Id: Iff4b004aaf504ae3d574428e41bf91fd46a66f30
Kevin Chyn [Fri, 11 Aug 2017 17:49:58 +0000 (17:49 +0000)]
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev am:
2e7b65f74a
am:
5e8f4b6320
Change-Id: Iafc8de444be0c455a8b6e3e51c3b6b407fd125e5
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:25:31 +0000 (17:25 +0000)]
Merge "Update strings for skip fingerprint setup" into oc-mr1-dev am:
719d80e6e0
am:
aec29ee4be
Change-Id: I66480f242ed99d3f6488b2c832b0b2745e7432e8
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
Tony Mantler [Fri, 11 Aug 2017 16:28:43 +0000 (16:28 +0000)]
Merge "Don't lose dialogs during configuration change"
Kevin Chyn [Fri, 11 Aug 2017 03:11:27 +0000 (03:11 +0000)]
Merge "Clean up AssistGesturePreferenceController" into oc-mr1-dev am:
14450c5669
am:
e54e3de80c
Change-Id: Ifa1964b6d9d6b32e8b2fc440c40f2431ddcc7b43
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
TreeHugger Robot [Thu, 10 Aug 2017 23:35:07 +0000 (23:35 +0000)]
Merge "onConnectedChanged should not update access points"
Doris Ling [Thu, 10 Aug 2017 22:42:42 +0000 (22:42 +0000)]
Initialize the volume seekbar preference max and progress. am:
cbc231c545 am:
cd4dc413f4
am:
549ff2cddc
Change-Id: Ie4774f927f9fc81f77955b64a823ef3158eac298
Doris Ling [Thu, 10 Aug 2017 22:42:06 +0000 (22:42 +0000)]
Initialize the volume seekbar preference max and progress. am:
cbc231c545 am:
f9ff9b9f5c
am:
f92ca61cca
Change-Id: Iba3641ae83143245ab04cbf37b6ea48bfb2a367b
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
Tony Mantler [Wed, 9 Aug 2017 21:16:48 +0000 (14:16 -0700)]
Don't lose dialogs during configuration change
Bug:
62442606
Test: Rotate device when a dialog is showing
Change-Id: I616d6030e2c43937e4b59dd7f6d78dd7124228dc
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)
Joachim Sauer [Thu, 10 Aug 2017 16:36:47 +0000 (16:36 +0000)]
Merge "Implement auto 12/24h setting toggle."
Joachim Sauer [Thu, 1 Jun 2017 10:23:28 +0000 (11:23 +0100)]
Implement auto 12/24h setting toggle.
This implements an explicit toggle to enable/disable automatic 12h/24h
time formatting detection based on the current locale.
Previously automatic detection was the norm on a freshly wiped device,
but could never be re-enabled once either 12h or 24h format was
configured.
Bug:
32761619
Test: m RunSettingsRoboTests
Change-Id: Idbbb8f79fccec95e33bf2f12767d5736e1118fa7
Antony Sargent [Thu, 10 Aug 2017 07:32:48 +0000 (07:32 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev am:
49cd8f2327 am:
8cd8519eab
am:
c7e3832e80
Change-Id: I8cb5200d38539d56c3f73fb7cd6ffaeb57dccf56
Antony Sargent [Thu, 10 Aug 2017 07:32:23 +0000 (07:32 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev am:
49cd8f2327 am:
0fe460a8e3
am:
d9456d807b
Change-Id: I5bd24cc8cc532ffdcec05c51424140e8dcc764f8
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
Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:26:57 +0000 (06:26 +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
am:
fda92d3491
Change-Id: I9daae3d9f6b2d9d6fac57489028053164e0d9eaf
Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:22:10 +0000 (06:22 +0000)]
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am:
9476e824be am:
7398553a81
am:
eddeef3b0e
Change-Id: I7558b1656b65b8d1da77b53dd24913f21af65080
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 04:02:08 +0000 (04:02 +0000)]
Merge "Log preference change as Integer instead of Long." into oc-mr1-dev am:
7074e25a0e
am:
cb5b48df7a
Change-Id: I8f321efc5f8df7c767f6d10e3fa944d65058aa96
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
TreeHugger Robot [Thu, 10 Aug 2017 02:52:37 +0000 (02:52 +0000)]
Merge "Move tests from tests/app/ to tests/unit/"
Doris Ling [Thu, 10 Aug 2017 02:32:36 +0000 (02:32 +0000)]
Merge "Initialize the volume seekbar preference max and progress." into oc-mr1-dev am:
db56114b34
am:
3503851ee1
Change-Id: I7587f70afd9b0ed0dc4f7351871b6095a3610c8f
Justin Klaassen [Thu, 10 Aug 2017 02:32:14 +0000 (02:32 +0000)]
DO NOT MERGE - Ask device owner for master clear in demo mode am:
a22c8345fa am:
0a982f39c2
am:
26b413d7a4 -s ours
Change-Id: If46907f6fe00b7b87ada7135d3cd53e5a95cbfd5
Fan Zhang [Thu, 10 Aug 2017 02:31:39 +0000 (02:31 +0000)]
Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev am:
0dc85bcc1e
am:
1e61f91d7b
Change-Id: I5610152c59889196124ff728e2607de764047e08
Justin Klaassen [Thu, 10 Aug 2017 02:31:18 +0000 (02:31 +0000)]
DO NOT MERGE - Ask device owner for master clear in demo mode am:
a22c8345fa -s ours am:
be3c8bf442
am:
a2075d2eb4 -s ours
Change-Id: I5578eb0b5ee3aa2eb86872ba2443566ddd6e0ec0
Fan Zhang [Thu, 10 Aug 2017 02:30:57 +0000 (02:30 +0000)]
Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev am:
5b820431d3
am:
a8f7f745e1
Change-Id: Ifd5618ddad3fcc9a535fe719470e67946bcd9d2d
qqzhou [Thu, 10 Aug 2017 02:30:37 +0000 (02:30 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am:
2c2b6b48de am:
13d1167e44
am:
23a16c2ae4
Change-Id: Ib205cc84febc20555853414e4d0b6cc0ad17c7ff
Daniel Nishi [Thu, 10 Aug 2017 02:29:46 +0000 (02:29 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am:
97e0e42959 am:
b2da45dd09 -s ours
am:
2151d69764 -s ours
Change-Id: Id8a648572f40a2d6c9d7e147c965c8b37894b053
Matthew Fritze [Thu, 10 Aug 2017 02:28:43 +0000 (02:28 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev am:
3161375f78 am:
8efbe4e120 -s ours
am:
005748ba21 -s ours
Change-Id: Id3470e2abccbf69d09796a0f747231e6e7f6e003
mingliang.x.lei [Thu, 10 Aug 2017 02:28:19 +0000 (02:28 +0000)]
Merge "Fix memory leak in Bluetooth settings" am:
5a652c0286 am:
8d3bb3e2ad am:
c46b5e60b9 am:
8ba28798aa
am:
cc6b8a868d
Change-Id: Ie742ea8ba0f1e463ddafe7d76e174df6e33fb860
The Android Open Source Project [Thu, 10 Aug 2017 02:27:57 +0000 (02:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
dd6d975214 -s ours am:
5d13310d94 -s ours
am:
df5bd79a29 -s ours
Change-Id: I8fc08eed8251897ed505f021b39f2c4a08d01233
Daniel Nishi [Thu, 10 Aug 2017 02:27:12 +0000 (02:27 +0000)]
Merge "Expose the notification-swipe controls." into oc-dr1-dev am:
c075f8943e am:
5f3f655ad2
am:
a17d748f9b
Change-Id: I2b230a5f8b23303fb5bd88dfa7847751adfe801e
Ruchi Kandoi [Thu, 10 Aug 2017 02:26:48 +0000 (02:26 +0000)]
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am:
9eff3f90d8 am:
3b012860db
am:
71a351af08
Change-Id: If29f26ebf90a856663849327e0a2d167e2cc16a0
Salvador Martinez [Thu, 10 Aug 2017 02:25:43 +0000 (02:25 +0000)]
Merge "Update availability for mobile network" into oc-dr1-dev am:
4bcc3eb193 am:
3781030b94
am:
5cefe64942
Change-Id: I4cc6e34dfa07eab71f17f74cf92102fee9d7bb2f
qqzhou [Thu, 10 Aug 2017 02:25:22 +0000 (02:25 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am:
2c2b6b48de am:
467aad4219
am:
add20708ba
Change-Id: Ic4dadceeb8d6a5197875177343f103e87df08a30
Daniel Nishi [Thu, 10 Aug 2017 02:24:19 +0000 (02:24 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am:
97e0e42959 -s ours am:
14be0e4124 -s ours
am:
319c45ad51 -s ours
Change-Id: I187c1f7713d5565cfa1fad451f9f0c6dd8225363
Matthew Fritze [Thu, 10 Aug 2017 02:22:54 +0000 (02:22 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev am:
3161375f78 -s ours am:
730bad152c -s ours
am:
580810a738 -s ours
Change-Id: Id8e3eb9d1a0058d8a8e3a193cc97abdff3da0d1a
The Android Open Source Project [Thu, 10 Aug 2017 02:22:31 +0000 (02:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
dd6d975214 -s ours am:
aeee659147 -s ours
am:
71460b0859 -s ours
Change-Id: Ib6d0aecabd64c444403868a2a69377c000f5b0d1
Daniel Nishi [Thu, 10 Aug 2017 02:22:09 +0000 (02:22 +0000)]
Merge "Expose the notification-swipe controls." into oc-dr1-dev am:
c075f8943e am:
8bbc28a95b
am:
6df5c65f45
Change-Id: I4cc89e8bebedc294c6c30ca6456f86f48a9a46b4
Ruchi Kandoi [Thu, 10 Aug 2017 02:21:48 +0000 (02:21 +0000)]
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am:
9eff3f90d8 am:
bf81a17a31
am:
706c6ba20e
Change-Id: Ie112f53cb222845c75a71def7b4aaf5dc3c8753e
Salvador Martinez [Thu, 10 Aug 2017 02:20:50 +0000 (02:20 +0000)]
Merge "Update availability for mobile network" into oc-dr1-dev am:
4bcc3eb193 am:
7bc388d823
am:
35c0949b2e
Change-Id: I3f7f56e233c8fe4b06269ef031fdce43800cf782
Ajay Nadathur [Thu, 10 Aug 2017 02:20:25 +0000 (02:20 +0000)]
Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev am:
0ed0319005
am:
b9c3eb954a
Change-Id: Ie7d1d6bd37274ac70c87fc6b8dca5f3118a64a64
Fan Zhang [Thu, 10 Aug 2017 02:20:02 +0000 (02:20 +0000)]
Merge "Close cursor after getting data from DB" into oc-mr1-dev am:
298d559c40
am:
876513ec38
Change-Id: I9a8a0f94a1d55858bd49ffba987eb3ce11d48178
Eric Schwarzenbach [Thu, 10 Aug 2017 02:19:36 +0000 (02:19 +0000)]
Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev am:
51bde3c8fe
am:
33840ce005
Change-Id: I9a0588a9f311049b94d286cad83b4155ce94532c
Justin Klaassen [Thu, 10 Aug 2017 02:19:12 +0000 (02:19 +0000)]
Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev am:
d59854de24
am:
6652cfcd7e
Change-Id: I25161af9d86997b2d0808590fc0a89f8a3b16d04
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
OSDN Git Service
