OSDN Git Service
Maurice Lam [Thu, 3 Aug 2017 03:11:28 +0000 (20:11 -0700)]
Update strings for screen lock setup
Manual cherry pick of
3eb4c8333e3821a85d19e8b281f315d3608d5b2b
Test: Manual, existing tests pass
Bug:
64084524
Change-Id: Iff4b004aaf504ae3d574428e41bf91fd46a66f30
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
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
Doris Ling [Wed, 9 Aug 2017 22:52:26 +0000 (15:52 -0700)]
Move tests from tests/app/ to tests/unit/
- first round: move tests that currently pass
Bug:
62103184
Test: make SettingsUnitTests
Change-Id: Ief3adf88e5090621e5ec3957a71d1b56b4be186a
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
TreeHugger Robot [Thu, 10 Aug 2017 00:08:03 +0000 (00:08 +0000)]
Merge "Remove code for old wifi tether feature"
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
Andrew Sapperstein [Wed, 9 Aug 2017 20:07:37 +0000 (20:07 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am:
64b15c4a7b am:
92592b4c25
am:
fa0f823f79
Change-Id: I0942e236ae97535b9fdeb6758cb39bea3946e0ad
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
OSDN Git Service
