Doris Ling
|
109bb5e59a
|
Move tests from tests/app/ to tests/unit/
- first round: move tests that currently pass
Bug: 62103184
Test: make SettingsUnitTests
Change-Id: Ief3adf88e5090621e5ec3957a71d1b56b4be186a
|
2017-08-09 17:12:46 -07:00 |
|
Fan Zhang
|
b5a5cc251a
|
Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev am: 293899d5ce
am: 25f9060ab7
Change-Id: I7c55bfcfb82be93e2902ef51e159115cbf6851d3
|
2017-08-09 18:17:29 +00:00 |
|
Fan Zhang
|
471f603ea5
|
Merge "Misc fixes for settings" into oc-mr1-dev am: 54d816fd90
am: e809b806f9
Change-Id: I1a1b5f2833389f0e40fe5a3a1e4b8e47db5ec9d3
|
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
Change-Id: Ic1518ede3d6ae01f409c44582415233371ba48ab
|
2017-08-09 18:04:15 +00:00 |
|
Fan Zhang
|
e809b806f9
|
Merge "Misc fixes for settings" into oc-mr1-dev
am: 54d816fd90
Change-Id: I7a015ea3ddd7b7cdd9db6896e6459ce3f491dabc
|
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 -s ours
Change-Id: I7cc3fc399369cce3bdf42e32bb91a48314645e01
|
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 -s ours
Change-Id: I2eccdf0b32f8a206717eedbe14a39102e9cb2070
|
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
Change-Id: Ib61b9481ec9c102d17d2f75b4832948807fe487a
|
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
Change-Id: I9de7aeaa4e81b969c40e137125777f8eb7274152
|
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
Change-Id: I1f349fbaad0c6807f1e3dccf30fe47b6c48d3eec
|
2017-08-09 14:18:21 +00:00 |
|
Julia Reynolds
|
cad51d7753
|
Merge "Use colorful +s" into oc-mr1-dev am: e286c0627b
am: 5d17c4284d
Change-Id: Ibe772dacaafd554b51cc9f5340453244106eefee
|
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
Change-Id: I6a585ed52bf746fe125cd8abcdd6ca5ac1ef8d87
|
2017-08-09 13:55:00 +00:00 |
|
Julia Reynolds
|
5d17c4284d
|
Merge "Use colorful +s" into oc-mr1-dev
am: e286c0627b
Change-Id: If04c234b436914a208c3a0cc9f3f9c6902d5d2d5
|
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
Change-Id: I5cbad3a82c0bc68453034cd00d7e184b97c965a6
|
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
Change-Id: I27c05398a20cfe1ece5313c31a0a502fd7ce3f42
|
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
Change-Id: Ic1bd3074c086723c231c05fe2706f6ccc30c4cdd
|
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 -s ours
Change-Id: I03053ee698c00815ae88b8cd8a3c60a28df8849f
|
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
Change-Id: Ib6e3348917eb90515aeef8e7131e55c95ee0768e
|
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 |
|
Eric Schwarzenbach
|
f89bbc5fce
|
Merge "Add modify string to resources." into oc-mr1-dev am: 9e47d2c233
am: 06917056fd
Change-Id: Ie464ce313d3145b804e53420033a2d705589344f
|
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
Change-Id: I439eea568712e0818613ad8b88b2b9770ae72a68
|
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
Change-Id: Ia51c480090bc796e8844ac6af04c0b994751603b
|
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 |
|
Maurice Lam
|
b2aa7e7da0
|
Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef am: dbfde54fb6 am: d415cbfc0d
am: 6b5f99bcbd
Change-Id: Ibf17029cec44e8767bf843358f497efebc9cec7d
|
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
Change-Id: Ic3a74f8ce7d4a068d4a21fe367cd232a103bf130
|
2017-08-08 23:26:20 +00:00 |
|
Maurice Lam
|
d415cbfc0d
|
Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef
am: dbfde54fb6
Change-Id: Ie98fa2d24ebe48e868762cf85129139974ce845f
|
2017-08-08 23:05:55 +00:00 |
|
Maurice Lam
|
dbfde54fb6
|
Merge "Show help string when onEnrollmentHelp() is called"
am: 5a926705ef
Change-Id: I5af1cac8ee4018e40005484631b6f3f3434e03b9
|
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
Change-Id: I189c0936ca9c96d1a686d33bc7da729f6a17d55b
|
2017-08-08 22:53:23 +00:00 |
|
Fan Zhang
|
b5989fc3b7
|
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev
am: fef5f6aa4a
Change-Id: I8c5ee9684f4a1fb8356aa35ab6ca26b80ada7436
|
2017-08-08 22:28:07 +00:00 |
|
Salvador Martinez
|
a98dc7ee56
|
Refactor tether logic for reuse am: 135619d483 am: 4c2fc34707 -s ours
am: d76eddacff -s ours
Change-Id: I4a31f3a870c794b9e348445f419bf08e64d87194
|
2017-08-08 22:22:01 +00:00 |
|
Salvador Martinez
|
d76eddacff
|
Refactor tether logic for reuse am: 135619d483
am: 4c2fc34707 -s ours
Change-Id: I0fc8272a026d188010ce8a613f02cc6c892828c7
|
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
Change-Id: I216dcb55a0f2423766abb4c30fc996f13afda2e4
|
2017-08-08 22:08:50 +00:00 |
|
Salvador Martinez
|
f4b6da9d09
|
Refactor tether logic for reuse am: 135619d483 -s ours am: cc92875825 -s ours
am: 3c7d47bf87 -s ours
Change-Id: I6a6edaa938b521d571415af72424a9684321fb8d
|
2017-08-08 22:07:21 +00:00 |
|
Maurice Lam
|
5a926705ef
|
Merge "Show help string when onEnrollmentHelp() is called"
|
2017-08-08 22:02:20 +00:00 |
|
Salvador Martinez
|
3c7d47bf87
|
Refactor tether logic for reuse am: 135619d483 -s ours
am: cc92875825 -s ours
Change-Id: Ifdf63b4f14dffb0cdf4149f228e03dd7807d3562
|
2017-08-08 21:59:50 +00:00 |
|
Salvador Martinez
|
cc92875825
|
Refactor tether logic for reuse
am: 135619d483 -s ours
Change-Id: I5b00c372d02e86dc683c49e1142167316613f96f
|
2017-08-08 21:53:54 +00:00 |
|