TreeHugger Robot
d0b09f7868
Merge "Remove code for old wifi tether feature"
2017-08-10 00:08:03 +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
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
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
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
Oren Blasberg
ab861c64a0
Merge "Update SMS mirroring icon to new style." into oc-mr1-dev am: a3a0a1e2e8
...
am: aaf5b20eb1
2017-08-09 16:14:36 +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
TreeHugger Robot
b2d8490250
Merge "Import translations. DO NOT MERGE"
2017-08-09 15:46:22 +00: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
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
f242ac3a94
Merge "Move work notification settings back to bottom" into oc-mr1-dev am: 466adba25e
...
am: a266a2a0c0
2017-08-09 09:25:40 +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
Eric Schwarzenbach
f89bbc5fce
Merge "Add modify string to resources." into oc-mr1-dev am: 9e47d2c233
...
am: 06917056fd
2017-08-09 01:18:26 +00: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
The Android Open Source Project
ad70f5acce
Import translations. DO NOT MERGE
...
Change-Id: Ie7b187e5540b995700b187de4c58808727ce68b4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-08 18:07:56 -07:00
Eric Schwarzenbach
06917056fd
Merge "Add modify string to resources." into oc-mr1-dev
...
am: 9e47d2c233
2017-08-09 01:04:33 +00:00
Maurice Lam
aed6b7bd76
Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef am: dbfde54fb6 am: d415cbfc0d am: 6b5f99bcbd
...
am: b2aa7e7da0
2017-08-09 00:47:01 +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
Maurice Lam
d415cbfc0d
Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef
...
am: dbfde54fb6
2017-08-08 23:05:55 +00:00
Maurice Lam
dbfde54fb6
Merge "Show help string when onEnrollmentHelp() is called"
...
am: 5a926705ef
2017-08-08 22:56:38 +00:00
Fan Zhang
1228a6af18
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev am: fef5f6aa4a
...
am: b5989fc3b7
2017-08-08 22:53:23 +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
a98dc7ee56
Refactor tether logic for reuse am: 135619d483 am: 4c2fc34707 -s ours
...
am: d76eddacff
2017-08-08 22:22:01 +00:00
