Justin Klaassen
26b413d7a4
DO NOT MERGE - Ask device owner for master clear in demo mode am: a22c8345fa
...
am: 0a982f39c2
2017-08-10 00:51:33 +00:00
Fan Zhang
1e61f91d7b
Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev
...
am: 0dc85bcc1e
2017-08-10 00:44:59 +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
a2075d2eb4
DO NOT MERGE - Ask device owner for master clear in demo mode am: a22c8345fa -s ours
...
am: be3c8bf442
2017-08-10 00:37:58 +00:00
Fan Zhang
a8f7f745e1
Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev
...
am: 5b820431d3
2017-08-10 00:37:34 +00:00
Justin Klaassen
be3c8bf442
DO NOT MERGE - Ask device owner for master clear in demo mode
...
am: a22c8345fa
2017-08-10 00:36:20 +00: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
Justin Klaassen
0a982f39c2
DO NOT MERGE - Ask device owner for master clear in demo mode
...
am: a22c8345fa
2017-08-10 00:23:52 +00:00
qqzhou
23a16c2ae4
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am: 2c2b6b48de
...
am: 13d1167e44
2017-08-10 00:09:08 +00:00
Daniel Nishi
2151d69764
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am: 97e0e42959
...
am: b2da45dd09
2017-08-10 00:08:13 +00:00
Matthew Fritze
005748ba21
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev am: 3161375f78
...
am: 8efbe4e120
2017-08-10 00:06:54 +00:00
mingliang.x.lei
cc6b8a868d
Merge "Fix memory leak in Bluetooth settings" am: 5a652c0286 am: 8d3bb3e2ad am: c46b5e60b9
...
am: 8ba28798aa
2017-08-10 00:06:32 +00:00
The Android Open Source Project
df5bd79a29
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: dd6d975214 -s ours
...
am: 5d13310d94
2017-08-10 00:06:08 +00:00
Daniel Nishi
a17d748f9b
Merge "Expose the notification-swipe controls." into oc-dr1-dev am: c075f8943e
...
am: 5f3f655ad2
2017-08-10 00:05:18 +00:00
Ruchi Kandoi
71a351af08
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am: 9eff3f90d8
...
am: 3b012860db
2017-08-10 00:04:52 +00:00
Salvador Martinez
5cefe64942
Merge "Update availability for mobile network" into oc-dr1-dev am: 4bcc3eb193
...
am: 3781030b94
2017-08-10 00:02:05 +00:00
qqzhou
add20708ba
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am: 2c2b6b48de
...
am: 467aad4219
2017-08-09 23:04:07 +00:00
Daniel Nishi
319c45ad51
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am: 97e0e42959 -s ours
...
am: 14be0e4124
2017-08-09 22:54:24 +00:00
Matthew Fritze
580810a738
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev am: 3161375f78 -s ours
...
am: 730bad152c
2017-08-09 22:52:43 +00:00
The Android Open Source Project
71460b0859
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: dd6d975214 -s ours
...
am: aeee659147
2017-08-09 22:52:06 +00:00
Daniel Nishi
6df5c65f45
Merge "Expose the notification-swipe controls." into oc-dr1-dev am: c075f8943e
...
am: 8bbc28a95b
2017-08-09 22:51:45 +00:00
qqzhou
467aad4219
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
...
am: 2c2b6b48de
2017-08-09 22:41:12 +00:00
Daniel Nishi
14be0e4124
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
...
am: 97e0e42959
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
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
2017-08-09 22:37:57 +00:00
Daniel Nishi
8bbc28a95b
Merge "Expose the notification-swipe controls." into oc-dr1-dev
...
am: c075f8943e
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
qqzhou
13d1167e44
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
...
am: 2c2b6b48de
2017-08-09 21:07:36 +00: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
Ruchi Kandoi
706c6ba20e
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am: 9eff3f90d8
...
am: bf81a17a31
2017-08-09 20:35:36 +00:00
Salvador Martinez
35c0949b2e
Merge "Update availability for mobile network" into oc-dr1-dev am: 4bcc3eb193
...
am: 7bc388d823
2017-08-09 20:28:30 +00:00
Ajay Nadathur
b9c3eb954a
Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev
...
am: 0ed0319005
2017-08-09 20:27:45 +00:00
Ruchi Kandoi
bf81a17a31
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev
...
am: 9eff3f90d8
2017-08-09 20:22:10 +00:00
Salvador Martinez
7bc388d823
Merge "Update availability for mobile network" into oc-dr1-dev
...
am: 4bcc3eb193
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
Fan Zhang
876513ec38
Merge "Close cursor after getting data from DB" into oc-mr1-dev
...
am: 298d559c40
2017-08-09 20:05:14 +00:00
Eric Schwarzenbach
33840ce005
Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev
...
am: 51bde3c8fe
2017-08-09 20:02:03 +00:00
Justin Klaassen
6652cfcd7e
Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev
...
am: d59854de24
2017-08-09 20:01:40 +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
Andrew Sapperstein
fa0f823f79
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am: 64b15c4a7b
...
am: 92592b4c25
2017-08-09 19:33:30 +00:00
Daniel Nishi
b2da45dd09
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
...
am: 97e0e42959
2017-08-09 19:27:58 +00:00
Matthew Fritze
8efbe4e120
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
...
am: 3161375f78
2017-08-09 19:26:10 +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
mingliang.x.lei
8ba28798aa
Merge "Fix memory leak in Bluetooth settings" am: 5a652c0286 am: 8d3bb3e2ad
...
am: c46b5e60b9
2017-08-09 18:53:07 +00:00
Matthew Fritze
f9831dc7be
Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev
...
am: e0c0616d6f
2017-08-09 18:37:19 +00:00
