Fan Zhang
4093146e4d
Merge \\"Catch RejectedExecutionException when loading app data.\\" into nyc-mr1-dev am: 0a2a3a6ac1
...
am: 4a27ef8f04
2016-07-27 01:49:08 +00:00
Fan Zhang
5df0fa467b
Catch RejectedExecutionException when loading app data. am: c63d245779
...
am: b512c7a268
2016-07-27 01:49:07 +00:00
Justin Klaassen
d263f37e76
Merge \\"Only set fullIndex flag when performing a full update\\" into nyc-mr1-dev am: 2d0c3f072b
...
am: 7475d1c09a
2016-07-27 01:49:06 +00:00
Justin Klaassen
b215a8b968
Only set fullIndex flag when performing a full update am: 5d219a2cfa
...
am: 57840c76be
2016-07-27 01:49:05 +00:00
Fan Zhang
4a27ef8f04
Merge \"Catch RejectedExecutionException when loading app data.\" into nyc-mr1-dev
...
am: 0a2a3a6ac1
2016-07-27 01:22:44 +00:00
Fan Zhang
b512c7a268
Catch RejectedExecutionException when loading app data.
...
am: c63d245779
2016-07-27 01:22:41 +00:00
Justin Klaassen
7475d1c09a
Merge \"Only set fullIndex flag when performing a full update\" into nyc-mr1-dev
...
am: 2d0c3f072b
2016-07-27 01:22:37 +00:00
Justin Klaassen
57840c76be
Only set fullIndex flag when performing a full update
...
am: 5d219a2cfa
2016-07-27 01:22:34 +00:00
TreeHugger Robot
0a2a3a6ac1
Merge "Catch RejectedExecutionException when loading app data." into nyc-mr1-dev
2016-07-27 00:58:25 +00:00
TreeHugger Robot
2d0c3f072b
Merge "Only set fullIndex flag when performing a full update" into nyc-mr1-dev
2016-07-26 22:47:30 +00:00
Jeff Sharkey
33035aa992
Merge \\"Offer trampoline to help articles.\\" into nyc-mr1-dev am: fc86ca6f0d
...
am: c14b790d2f
2016-07-26 22:16:04 +00:00
Jeff Sharkey
fa35b19603
Offer trampoline to help articles. am: 4f425c890b
...
am: aaaf41d982
2016-07-26 22:16:03 +00:00
Jeff Sharkey
c14b790d2f
Merge \"Offer trampoline to help articles.\" into nyc-mr1-dev
...
am: fc86ca6f0d
2016-07-26 22:12:45 +00:00
Jeff Sharkey
aaaf41d982
Offer trampoline to help articles.
...
am: 4f425c890b
2016-07-26 22:10:44 +00:00
Jeff Sharkey
fc86ca6f0d
Merge "Offer trampoline to help articles." into nyc-mr1-dev
2016-07-26 21:52:06 +00:00
Justin Klaassen
5d219a2cfa
Only set fullIndex flag when performing a full update
...
Previously UpdateData#fullIndex was default true which meant if a
partial update came in before a call to Index#update() then the
partial update would be treated as a full index and future calls
to Index#update() would be ignored.
Bug: 30366360
Change-Id: I6e2738c25c9623f49171ecba0f3e0ce0076b7e42
2016-07-26 14:32:57 -07:00
Fan Zhang
c63d245779
Catch RejectedExecutionException when loading app data.
...
Default thread pool from AsyncTask can queue up to a certain number of
tasks. We will use a custom pool with enough queue size to load app
data.
Fixes: 30355247
Change-Id: I5ad4c340191c785463011c1698d1d4625aba44ec
2016-07-26 13:30:04 -07:00
Fan Zhang
0dc7a13a5e
Merge \\"Revert \\"About Phone\\" summary back to Android version.\\" into nyc-mr1-dev am: 2dc574e59a
...
am: dde1feddbd
2016-07-25 23:15:55 +00:00
Fan Zhang
c73a4cb7e0
Revert \\"About Phone\\" summary back to Android version. am: fd4f729e1f
...
am: 942e24d46f
2016-07-25 23:15:54 +00:00
Fan Zhang
1858ed019e
Merge \\"Refresh state after loading conditions from xml.\\" into nyc-mr1-dev am: 58e217b180
...
am: a988f59ce8
2016-07-25 23:15:54 +00:00
Fan Zhang
709739d87d
Refresh state after loading conditions from xml. am: a0ebd1a9f0
...
am: 91a1c1cad0
2016-07-25 23:15:53 +00:00
Fan Zhang
dde1feddbd
Merge \"Revert \"About Phone\" summary back to Android version.\" into nyc-mr1-dev
...
am: 2dc574e59a
2016-07-25 23:08:19 +00:00
Fan Zhang
942e24d46f
Revert \"About Phone\" summary back to Android version.
...
am: fd4f729e1f
2016-07-25 23:08:17 +00:00
Fan Zhang
a988f59ce8
Merge \"Refresh state after loading conditions from xml.\" into nyc-mr1-dev
...
am: 58e217b180
2016-07-25 23:08:15 +00:00
Fan Zhang
91a1c1cad0
Refresh state after loading conditions from xml.
...
am: a0ebd1a9f0
2016-07-25 23:08:14 +00:00
Jeff Sharkey
4f425c890b
Offer trampoline to help articles.
...
This allows other parts of the system internals to re-use common
logic for building help links, and it allows all help links to live
in a single common overlay.
Adds a help link slot for "Android is upgrading" notification.
Bug: 30033319, 30122837
Change-Id: I7dec3e63cfb8c7a8ee9a562cc61cb70f3f99fdae
2016-07-25 16:45:15 -06:00
Fan Zhang
2dc574e59a
Merge "Revert "About Phone" summary back to Android version." into nyc-mr1-dev
2016-07-25 22:13:27 +00:00
Fan Zhang
58e217b180
Merge "Refresh state after loading conditions from xml." into nyc-mr1-dev
2016-07-25 22:13:17 +00:00
Fan Zhang
fd4f729e1f
Revert "About Phone" summary back to Android version.
...
Change-Id: Icc834b8fb1fd9235092cee720c904c8532b8e3fc
Fixes: 30355258
Bug: 28419411
2016-07-25 14:22:00 -07:00
Fan Zhang
a0ebd1a9f0
Refresh state after loading conditions from xml.
...
Fixes: 30330909
When start Settings, conditions is loaded from a xml with potentially
stale state. ConditionLoader needs to refresh states after reading xml
to make sure they are up to date.
Change-Id: Ice1b8bacb0486c5dd230b83670c1494710d1c061
2016-07-25 13:58:39 -07:00
Phil Weaver
fa4718a05c
Merge \\"Fix return when virtual keyboard setting changes.\\" into nyc-mr1-dev am: 0bda6fb550
...
am: a1ef5a8590
2016-07-25 20:36:37 +00:00
Phil Weaver
8f3c8a56a2
Fix return when virtual keyboard setting changes. am: 3587914cef
...
am: fc3352e585
2016-07-25 20:36:36 +00:00
Phil Weaver
a1ef5a8590
Merge \"Fix return when virtual keyboard setting changes.\" into nyc-mr1-dev
...
am: 0bda6fb550
2016-07-25 20:34:42 +00:00
Phil Weaver
fc3352e585
Fix return when virtual keyboard setting changes.
...
am: 3587914cef
2016-07-25 20:34:41 +00:00
Phil Weaver
0bda6fb550
Merge "Fix return when virtual keyboard setting changes." into nyc-mr1-dev
2016-07-25 20:23:06 +00:00
Jason Monk
4a826dcae0
Merge \\"Fix multiple bluetooth devices bug\\" into nyc-mr1-dev am: d5b3043bba
...
am: d50e012545
2016-07-25 19:22:52 +00:00
Jason Monk
3ac2f08f97
Fix multiple bluetooth devices bug am: 6666f9cc37
...
am: 5129b26123
2016-07-25 19:22:51 +00:00
Jason Monk
d50e012545
Merge \"Fix multiple bluetooth devices bug\" into nyc-mr1-dev
...
am: d5b3043bba
2016-07-25 19:19:19 +00:00
Jason Monk
5129b26123
Fix multiple bluetooth devices bug
...
am: 6666f9cc37
2016-07-25 19:19:19 +00:00
Svetoslav Ganov
0c9f05fe26
Merge "Add Bluetooth toggle prompts - settings"
2016-07-25 18:43:40 +00:00
Makoto Onuki
78f1692056
Merge \\"Improve string comment\\" into nyc-mr1-dev am: e8bed6d959
...
am: eb29897252
2016-07-25 18:36:22 +00:00
Makoto Onuki
a6a4dc70d2
Improve string comment am: 8e8bcb6900
...
am: 282e662b4e
2016-07-25 18:36:22 +00:00
Jason Monk
d5b3043bba
Merge "Fix multiple bluetooth devices bug" into nyc-mr1-dev
2016-07-25 18:35:57 +00:00
Makoto Onuki
eb29897252
Merge \"Improve string comment\" into nyc-mr1-dev
...
am: e8bed6d959
2016-07-25 18:32:18 +00:00
Makoto Onuki
282e662b4e
Improve string comment
...
am: 8e8bcb6900
2016-07-25 18:32:17 +00:00
Makoto Onuki
e8bed6d959
Merge "Improve string comment" into nyc-mr1-dev
2016-07-25 18:12:00 +00:00
Bill Yi
0c2a71c18a
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: bcc18fa732 -s ours
...
am: bab8334482
2016-07-25 17:23:16 +00:00
Bill Yi
82a6d3bcba
Import translations. DO NOT MERGE am: 4f77347f7d -s ours
...
am: df340e3bf2
2016-07-25 17:23:14 +00:00
Bill Yi
bab8334482
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
...
am: bcc18fa732
2016-07-25 17:03:33 +00:00
Bill Yi
df340e3bf2
Import translations. DO NOT MERGE
...
am: 4f77347f7d
2016-07-25 17:03:32 +00:00
