Alison Cichowlas
130a028f33
If two groups are posted to settings, remove old group and log.
...
Bug: 62136650
Test: manual: set debugger in asynctask at line 110 to force
race condition, triggered task twice then released both.
also ran existing tests with no new failures.
Change-Id: I8508fe9f191ca6cd0bb6dfbc62d884420d3fd747
2017-06-06 17:02:23 -04:00
Daniel Nishi
57d6778b75
Merge "Use the config default days to retain."
2017-06-06 20:37:41 +00:00
Fan Zhang
0ca782ab18
Add logging to track search no-result case
...
Change-Id: Iea95468c33e6663c0dad374954468947575bb3df
Fix: 37211659
Test: make RunSettingsRoboTests
2017-06-06 13:24:38 -07:00
Fan Zhang
4b525acee0
Merge "Fix master build"
2017-06-06 20:23:09 +00:00
Fan Zhang
71af32a218
Fix master build
...
Caused by bad merge from ag/2360433
Test: make RunSettingsRoboTests
Change-Id: I3fb55768686a6edc56dee60421c116dcf590239f
2017-06-06 13:22:35 -07:00
Hiroki Yamamoto
ea5e18c809
Merge "NFC: Reset Tap&pay summary text if default payment is not set" am: e990bf3041 am: 56a8267f59 am: 77452b8a57
...
am: a1f5332068
2017-06-06 19:47:06 +00:00
TreeHugger Robot
b424cf771b
Merge "Refactor anomaly detection"
2017-06-06 19:44:19 +00:00
Hiroki Yamamoto
a1f5332068
Merge "NFC: Reset Tap&pay summary text if default payment is not set" am: e990bf3041 am: 56a8267f59
...
am: 77452b8a57
2017-06-06 19:34:49 +00:00
Hiroki Yamamoto
77452b8a57
Merge "NFC: Reset Tap&pay summary text if default payment is not set" am: e990bf3041
...
am: 56a8267f59
2017-06-06 19:28:41 +00:00
Hiroki Yamamoto
56a8267f59
Merge "NFC: Reset Tap&pay summary text if default payment is not set"
...
am: e990bf3041
2017-06-06 19:22:09 +00:00
Andrew Sapperstein
c7f31699ba
Merge "Revert "Initial search bar implementation."" into oc-dev am: dfc1983601
...
am: b5fb71acc6
2017-06-06 19:16:56 +00:00
Treehugger Robot
e990bf3041
Merge "NFC: Reset Tap&pay summary text if default payment is not set"
2017-06-06 19:12:55 +00:00
Matthew Fritze
6ab30cf253
Merge "Check for dynamic summaries at display time for search" into oc-dev am: 2046c59b77
...
am: 74eda7150b
2017-06-06 19:11:26 +00:00
Andrew Sapperstein
83e85cadd8
Merge "Revert "Add search bar to SearchActivity."" into oc-dev am: 37f87b6c64
...
am: 93adcee630
2017-06-06 19:11:03 +00:00
Andrew Sapperstein
b5fb71acc6
Merge "Revert "Initial search bar implementation."" into oc-dev
...
am: dfc1983601
2017-06-06 19:10:43 +00:00
TreeHugger Robot
dfc1983601
Merge "Revert "Initial search bar implementation."" into oc-dev
2017-06-06 19:04:26 +00:00
Matthew Fritze
74eda7150b
Merge "Check for dynamic summaries at display time for search" into oc-dev
...
am: 2046c59b77
2017-06-06 19:00:29 +00:00
Andrew Sapperstein
93adcee630
Merge "Revert "Add search bar to SearchActivity."" into oc-dev
...
am: 37f87b6c64
2017-06-06 19:00:04 +00:00
TreeHugger Robot
2046c59b77
Merge "Check for dynamic summaries at display time for search" into oc-dev
2017-06-06 18:52:31 +00:00
TreeHugger Robot
37f87b6c64
Merge "Revert "Add search bar to SearchActivity."" into oc-dev
2017-06-06 18:42:25 +00:00
Matthew Fritze
84ef9daa4f
Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev am: b8028f63ec
...
am: 64736b6ae1
2017-06-06 18:13:41 +00:00
William Luh
5264b00d13
Use the standard place holder for the security summary. DO NOT MERGE
...
This removes the jitter when the cache is empty and there is
initially no summary, and then it is replaced by the fetched summary
when it's available.
Bug:36463348
Test: make RunSettingsRoboTests
Change-Id: I92cafbf23e3c562a470488dea28fd5106bbdf885
2017-06-06 11:00:49 -07:00
Matthew Fritze
64736b6ae1
Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev
...
am: b8028f63ec
2017-06-06 17:58:30 +00:00
Daniel Nishi
3be2832cfa
Merge "Band aid to fix overly long text in donut." into oc-dev am: b5abb2c1d2
...
am: 0be5066922
2017-06-06 17:46:33 +00:00
TreeHugger Robot
b8028f63ec
Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev
2017-06-06 17:44:23 +00:00
Matthew Fritze
7e6bc2807f
Merge "Update the no-results icon in settings search" into oc-dev am: 02e360dbc9
...
am: 3a7f413468
2017-06-06 17:40:32 +00:00
Daniel Nishi
0be5066922
Merge "Band aid to fix overly long text in donut." into oc-dev
...
am: b5abb2c1d2
2017-06-06 17:40:04 +00:00
Matthew Fritze
3a7f413468
Merge "Update the no-results icon in settings search" into oc-dev
...
am: 02e360dbc9
2017-06-06 17:34:31 +00:00
Daniel Nishi
b5abb2c1d2
Merge "Band aid to fix overly long text in donut." into oc-dev
2017-06-06 17:34:01 +00:00
Andrew Sapperstein
a0e816d9d3
Revert "Initial search bar implementation."
...
This reverts commit 14934599dd
2017-06-06 17:30:17 +00:00
Andrew Sapperstein
61353aa4fd
Revert "Add search bar to SearchActivity."
...
This reverts commit fac61b71e5
2017-06-06 17:29:41 +00:00
TreeHugger Robot
02e360dbc9
Merge "Update the no-results icon in settings search" into oc-dev
2017-06-06 17:25:57 +00:00
Matthew Fritze
ed761c4e74
Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""
...
This reverts commit c1e9f8787f
2017-06-06 17:20:30 +00:00
TreeHugger Robot
c3ff66e490
Merge "Prevent showing multiple keyguard dialog in vpn setup UI"
2017-06-06 17:17:06 +00:00
Bill Yi
70acb67771
Merge "Import translations. DO NOT MERGE" into oc-dev am: 11465af11e -s ours
...
am: d650629364
2017-06-06 16:34:19 +00:00
Bill Yi
d650629364
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 11465af11e
2017-06-06 16:28:22 +00:00
TreeHugger Robot
11465af11e
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-06-06 16:17:44 +00:00
Matthew Fritze
0b4b716627
Check for dynamic summaries at display time for search
...
In order to hide dynamic summaries which use SettingPref,
we check if the summary is equal to "%s".
This is a temporary, band-aid fix which should be
changed in the next release.
Bug: 36101902
Test: make RunSettingsRoboTests
Change-Id: I6cadb3ba68f09ba18ad9a6d2a817804c5d4a08e5
2017-06-06 08:34:16 -07:00
TreeHugger Robot
e952333630
Merge "String changes"
2017-06-06 15:16:06 +00:00
Salvador Martinez
bf35714ff2
Merge "Revert "Remove dynamic summary from Security Patch info"" into oc-dev am: a8e887be86
...
am: 4eb906a672
2017-06-06 15:04:52 +00:00
jackqdyulei
7f04c81fe3
Merge "Make footer preferences non-clickable by default" into oc-dev am: 8fbb0bc1f2
...
am: 0686f63083
2017-06-06 15:04:09 +00:00
Lorenzo Colitti
acb76030de
Merge changes I23540440,I67269e1a into oc-dev am: 4249a7092b
...
am: 844c385c09
2017-06-06 13:54:56 +00:00
Yohann Roussel
89fea15a84
resolve merge conflicts of 1104b94dbc to master
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I537fb871134f801ec9489b48fe748b525e5a65ea
2017-06-06 12:06:45 +00:00
Hiroki Yamamoto
a322f6eab3
NFC: Reset Tap&pay summary text if default payment is not set
...
Reset Tap&pay summary text even default payment is null
to show the correct status that is no payment service.
Test: manual
Bug: 62366917
Change-Id: Ida9cf0b205e56163505862498b1ac4d679c2c92a
2017-06-06 11:23:03 +00:00
TreeHugger Robot
e95b730c4f
Merge "Ensure wifi ssid cannot exceed 32 bytes."
2017-06-06 06:33:49 +00:00
TreeHugger Robot
f4c91d32d5
Merge "Add help url placeholders for new pages"
2017-06-06 06:20:48 +00:00
Salvador Martinez
4eb906a672
Merge "Revert "Remove dynamic summary from Security Patch info"" into oc-dev
...
am: a8e887be86
2017-06-06 04:35:19 +00:00
Salvador Martinez
a8e887be86
Merge "Revert "Remove dynamic summary from Security Patch info"" into oc-dev
2017-06-06 04:29:32 +00:00
Fan Zhang
cd9836c441
Revert "Remove dynamic summary from Security Patch info"
...
The change breaks build
Bug: 62359766
Bug: 36101902
This reverts commit 2b562f84b6
2017-06-06 04:20:15 +00:00
Fan Zhang
89dc1d1ee2
Revert "Remove dynamic summary from Security Patch info"
...
The change breaks build
Fix: 62359766
Bug: 36101902
This reverts commit 2b562f84b6
2017-06-06 04:13:04 +00:00
