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
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
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
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
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
Oren Blasberg
aaf5b20eb1
Merge "Update SMS mirroring icon to new style." into oc-mr1-dev
...
am: a3a0a1e2e8
2017-08-09 16:06:02 +00:00
TreeHugger Robot
a3a0a1e2e8
Merge "Update SMS mirroring icon to new style." into oc-mr1-dev
2017-08-09 15:54:19 +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
TreeHugger Robot
a147d4a616
Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev
2017-08-09 13:36:40 +00:00
Andrew Sapperstein
d4d55b73ad
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am: 64b15c4a7b
...
am: 6eafaf46aa
2017-08-09 13:26:31 +00:00
TreeHugger Robot
e286c0627b
Merge "Use colorful +s" into oc-mr1-dev
2017-08-09 13:25:48 +00:00
Andrew Sapperstein
6eafaf46aa
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
...
am: 64b15c4a7b
2017-08-09 13:06:33 +00:00
Adrian Roos
6600ddec73
FRP: Add dedicated explanation strings for ConfirmCredential
...
Change-Id: I1bf63898509032560cd302fde9dfe05473336e49
Fixes: 63958816
Test: adb shell settings put global device_provisioned 1 && adb shell am start -a android.app.action.CONFIRM_FRP_CREDENTIAL; verify strings
2017-08-09 11:08:13 +00:00
Winston Man
a266a2a0c0
Merge "Move work notification settings back to bottom" into oc-mr1-dev
...
am: 466adba25e
2017-08-09 09:19:43 +00:00
Winston Man
466adba25e
Merge "Move work notification settings back to bottom" into oc-mr1-dev
2017-08-09 09:09:35 +00:00
Matthew Fritze
c6211c8829
Fix DataSaverBackend objects created on background threads
...
Add the main looper to the handler created with each
DataSaverBackend to avoid crashes when the objects are
created on background threads.
Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: Ie5ffabbfbe7660761527b3ecd51e6bc5a43c1ace
2017-08-08 19:03:43 -07:00
The Android Open Source Project
8008408285
Import translations. DO NOT MERGE
...
Change-Id: I7c03ce57550b6618594ff59a6cb82d5871207216
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-08 18:14:31 -07:00
TreeHugger Robot
4bcc3eb193
Merge "Update availability for mobile network" into oc-dr1-dev
2017-08-09 01:06:50 +00:00
Eric Schwarzenbach
06917056fd
Merge "Add modify string to resources." into oc-mr1-dev
...
am: 9e47d2c233
2017-08-09 01:04:33 +00:00
TreeHugger Robot
9e47d2c233
Merge "Add modify string to resources." into oc-mr1-dev
2017-08-09 00:46:57 +00:00
Fan Zhang
816efc02fc
Refresh preferences when background data switch is toggled
...
Change-Id: Id58f565645fc3c668b516dbd05049559afa9535e
Fixes: 64466310
Test: robotests
2017-08-08 17:38:28 -07:00
Andrew Sapperstein
92592b4c25
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
...
am: 64b15c4a7b
2017-08-09 00:20:03 +00:00
Maurice Lam
b2aa7e7da0
Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef am: dbfde54fb6 am: d415cbfc0d
...
am: 6b5f99bcbd
2017-08-09 00:02:12 +00:00
TreeHugger Robot
64b15c4a7b
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
2017-08-08 23:59:50 +00:00
Maurice Lam
6b5f99bcbd
Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef am: dbfde54fb6
...
am: d415cbfc0d
2017-08-08 23:26:20 +00:00
Eric Schwarzenbach
69fa528074
Fix issue where connected network sometimes doesn't update.
...
Ensures that the connected network Preference and WifiTracker have the
same reference so that updates to one propagate to the other.
Bug: 64124982
Test: manual
Change-Id: I1b838b1cf65da1b5aebf4f5f37f0df0c5e473dba
2017-08-08 16:08:19 -07:00
Maurice Lam
d415cbfc0d
Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef
...
am: dbfde54fb6
2017-08-08 23:05:55 +00:00
Fan Zhang
623faaa00e
Close cursor after getting data from DB
...
Fixes: 64487360
Test: manual
Change-Id: I7d8a7550dca272a62b2c664cc893e4319e628c18
2017-08-08 16:03:55 -07:00
Maurice Lam
dbfde54fb6
Merge "Show help string when onEnrollmentHelp() is called"
...
am: 5a926705ef
2017-08-08 22:56:38 +00:00
Fan Zhang
b5989fc3b7
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev
...
am: fef5f6aa4a
2017-08-08 22:28:07 +00:00
Salvador Martinez
d76eddacff
Refactor tether logic for reuse am: 135619d483
...
am: 4c2fc34707
2017-08-08 22:18:30 +00:00
TreeHugger Robot
fef5f6aa4a
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev
2017-08-08 22:13:13 +00:00
Salvador Martinez
4c2fc34707
Refactor tether logic for reuse
...
am: 135619d483
2017-08-08 22:08:50 +00:00
