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
TreeHugger Robot
d0b09f7868
Merge "Remove code for old wifi tether feature"
2017-08-10 00:08:03 +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
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
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
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
Doris Ling
b7490bea28
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
2017-08-09 13:56:13 -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
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
TreeHugger Robot
3161375f78
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
2017-08-09 19:15:27 +00:00
Matthew Fritze
e69329cc84
Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev am: e0c0616d6f
...
am: f9831dc7be
2017-08-09 18:57:08 +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
mingliang.x.lei
8d3bb3e2ad
Merge "Fix memory leak in Bluetooth settings"
...
am: 5a652c0286
2017-08-09 18:34:07 +00:00
Treehugger Robot
5a652c0286
Merge "Fix memory leak in Bluetooth settings"
2017-08-09 18:27:43 +00:00
TreeHugger Robot
e0c0616d6f
Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev
2017-08-09 18:22:21 +00:00
Fan Zhang
b5a5cc251a
Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev am: 293899d5ce
...
am: 25f9060ab7
2017-08-09 18:17:29 +00:00
Fan Zhang
471f603ea5
Merge "Misc fixes for settings" into oc-mr1-dev am: 54d816fd90
...
am: e809b806f9
2017-08-09 18:16:57 +00:00
Fan Zhang
25f9060ab7
Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev
...
am: 293899d5ce
2017-08-09 18:04:15 +00:00
Fan Zhang
e809b806f9
Merge "Misc fixes for settings" into oc-mr1-dev
...
am: 54d816fd90
2017-08-09 18:03:29 +00:00
TreeHugger Robot
293899d5ce
Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev
2017-08-09 17:53:22 +00:00
TreeHugger Robot
54d816fd90
Merge "Misc fixes for settings" into oc-mr1-dev
2017-08-09 17:52:49 +00:00
Ajay Nadathur
bf3a135170
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
2017-08-09 17:51:50 +00:00
Justin Klaassen
3025727e16
Ask device owner for master clear in demo mode
...
Bug: 62712426
Test: make RunSettingsRoboTests -j19
Change-Id: I29f92ff1062590f2c5eb7713e5969da7870fc582
2017-08-09 10:44:19 -07:00
Daniel Nishi
5f3f655ad2
Merge "Expose the notification-swipe controls." into oc-dr1-dev
...
am: c075f8943e
2017-08-09 16:30:01 +00:00
Daniel Nishi
c075f8943e
Merge "Expose the notification-swipe controls." into oc-dr1-dev
2017-08-09 16:16:49 +00:00
qqzhou
c18c517467
Settings: Fix NPE in ChannelNotificationSettings
...
java.lang.NullPointerException: Attempt to invoke virtual method 'int
android.app.NotificationChannel.getImportance()' on a null object
reference at com.android.settings.notification.ChannelNotificationSettings.
onActivityResult.
Change-Id: I3ec7b51e2533dc108b1a14c151e3ad70d22113e5
CRs-Fixed: 2068192
Fixes: 64116799
Fixes: 64134707
Test: monkey
2017-08-09 11:38:58 -04:00
Adrian Roos
d3c5da9e18
Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev am: a147d4a616
...
am: 1d192addc6
2017-08-09 14:18:21 +00:00
Julia Reynolds
cad51d7753
Merge "Use colorful +s" into oc-mr1-dev am: e286c0627b
...
am: 5d17c4284d
2017-08-09 14:17:57 +00:00
Adrian Roos
1d192addc6
Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev
...
am: a147d4a616
2017-08-09 13:55:00 +00:00
Julia Reynolds
5d17c4284d
Merge "Use colorful +s" into oc-mr1-dev
...
am: e286c0627b
2017-08-09 13:54:40 +00:00
Andrew Sapperstein
5a53f22c02
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am: 64b15c4a7b am: 6eafaf46aa
...
am: d4d55b73ad
2017-08-09 13:43:06 +00:00
TreeHugger Robot
a147d4a616
Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev
2017-08-09 13:36:40 +00:00
