Daniel Nishi
11c93deda6
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am: 97e0e42959 -s ours am: 14be0e4124 -s ours
...
am: 319c45ad51
2017-08-10 02:24:19 +00:00
Matthew Fritze
6de9f65ced
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev am: 3161375f78 -s ours am: 730bad152c -s ours
...
am: 580810a738
2017-08-10 02:22:54 +00:00
The Android Open Source Project
1ad08db58c
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: dd6d975214 -s ours am: aeee659147 -s ours
...
am: 71460b0859
2017-08-10 02:22:31 +00:00
Daniel Nishi
591c654fb7
Merge "Expose the notification-swipe controls." into oc-dr1-dev am: c075f8943e am: 8bbc28a95b
...
am: 6df5c65f45
2017-08-10 02:22:09 +00:00
Ruchi Kandoi
01e0523441
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am: 9eff3f90d8 am: bf81a17a31
...
am: 706c6ba20e
2017-08-10 02:21:48 +00:00
Salvador Martinez
f3692132ca
Merge "Update availability for mobile network" into oc-dr1-dev am: 4bcc3eb193 am: 7bc388d823
...
am: 35c0949b2e
2017-08-10 02:20:50 +00:00
Ajay Nadathur
3253b7ee7c
Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev am: 0ed0319005
...
am: b9c3eb954a
2017-08-10 02:20:25 +00:00
Fan Zhang
2b050a3663
Merge "Close cursor after getting data from DB" into oc-mr1-dev am: 298d559c40
...
am: 876513ec38
2017-08-10 02:20:02 +00:00
Eric Schwarzenbach
c03105dfb3
Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev am: 51bde3c8fe
...
am: 33840ce005
2017-08-10 02:19:36 +00:00
Justin Klaassen
27ef303dd1
Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev am: d59854de24
...
am: 6652cfcd7e
2017-08-10 02:19:12 +00:00
TreeHugger Robot
d0b09f7868
Merge "Remove code for old wifi tether feature"
2017-08-10 00:08:03 +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
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
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
Andrew Sapperstein
3c520f58b5
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am: 64b15c4a7b am: 92592b4c25
...
am: fa0f823f79
2017-08-09 20:07:37 +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
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
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
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
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
The Android Open Source Project
920493a16b
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 882d35715e -s ours
...
am: 6979eaaf4e
2017-08-09 17:39:19 +00:00
The Android Open Source Project
6979eaaf4e
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 882d35715e
2017-08-09 17:14:44 +00:00
TreeHugger Robot
882d35715e
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-08-09 16:46:44 +00:00
TreeHugger Robot
9010ba4479
Merge "Remove old VPN tests which instrumented Settings"
2017-08-09 16:40:42 +00:00
