Makoto Onuki
7e346ef853
Merge \\"Launcher shortcut callback should deliver manifest shortcuts too\\" into nyc-mr1-dev am: 901c03faba
...
am: c07a7518d6
2016-06-20 21:22:15 +00:00
Makoto Onuki
c07a7518d6
Merge \"Launcher shortcut callback should deliver manifest shortcuts too\" into nyc-mr1-dev
...
am: 901c03faba
2016-06-20 21:15:26 +00:00
Makoto Onuki
901c03faba
Merge "Launcher shortcut callback should deliver manifest shortcuts too" into nyc-mr1-dev
2016-06-20 21:06:42 +00:00
Roozbeh Pournader
d8914879b5
Merge \\"Fix AAPT-compatible output format for locales\\" into nyc-mr1-dev am: 63ed39f395
...
am: e7978c11c8
2016-06-20 19:38:05 +00:00
Roozbeh Pournader
e7978c11c8
Merge \"Fix AAPT-compatible output format for locales\" into nyc-mr1-dev
...
am: 63ed39f395
2016-06-20 19:27:50 +00:00
Roozbeh Pournader
63ed39f395
Merge "Fix AAPT-compatible output format for locales" into nyc-mr1-dev
2016-06-20 19:22:27 +00:00
Todd Kennedy
7182948b56
Merge \"Merge \\"fix resolver\\" into nyc-mr1-dev am: acc21f572d\" into nyc-mr1-dev-plus-aosp
...
am: 3e68026036
2016-06-20 19:12:31 +00:00
Todd Kennedy
fcb121216c
Merge \"fix resolver\" into nyc-mr1-dev
...
am: acc21f572d
2016-06-20 19:06:15 +00:00
TreeHugger Robot
acc21f572d
Merge "fix resolver" into nyc-mr1-dev
2016-06-20 18:45:04 +00:00
Todd Kennedy
958b3410bf
fix resolver
...
Change-Id: I31649d0f85b7b6553a6ecf38fd7c08279b85a0a6
2016-06-20 10:06:06 -07:00
Makoto Onuki
4d6b87ffdf
Launcher shortcut callback should deliver manifest shortcuts too
...
- Also include "activity" in the key fields, as this is now an
important field.
- Also optimize ShortcutInfo parceling for the "key field only" case.
Bug 29394043
Bug 29451629
Change-Id: I61b2bc2f61ad6ebdcbaf6d02f1bd88777c45a7f0
2016-06-20 09:28:05 -07:00
Roozbeh Pournader
309ebd6430
Fix AAPT-compatible output format for locales
...
The previous code used a format that is not supported by AAPT,
although it claimed it was. The new code generates locale codes in
the format AAPT can consume, using xx and xx-rYY for simple locales,
and the b+ format for everything else.
Bug: 25599046
Change-Id: I34d432f23b84913d313d6562c110d7fad87c457a
2016-06-17 22:24:54 -07:00
Makoto Onuki
cb0f366fe2
Merge \\"Update manifest shortcut XML schema\\" into nyc-mr1-dev am: a65d8b6609
...
am: 5a533c9ae3
2016-06-17 21:51:37 +00:00
Gina Dimino
4926ee18c0
Merge \\\"Docs: Suppress errors in SystemApi Build Bug: 28427390\\\" into nyc-dev am: d06520a488 am: b7181150c4
...
am: cb08f6805a
2016-06-17 20:42:09 +00:00
Makoto Onuki
5a533c9ae3
Merge \"Update manifest shortcut XML schema\" into nyc-mr1-dev
...
am: a65d8b6609
2016-06-17 20:40:16 +00:00
Makoto Onuki
a65d8b6609
Merge "Update manifest shortcut XML schema" into nyc-mr1-dev
2016-06-17 20:29:38 +00:00
Makoto Onuki
df6da040e0
Update manifest shortcut XML schema
...
Use the standard <intent> tag instead of custom tags.
- Also fix setDynamicShortcuts(), which was broken in the previous CL.
- Also tolerate runtime exceptions while parsing XMLs
- Also fix b/29422018 while I'm at it
Bug 29390156
Bug 29077932
Bug 29422018
Change-Id: I2756c9d66c6d7b2962a982d9e57a7d84a5755b28
2016-06-17 11:51:20 -07:00
Gina Dimino
cb08f6805a
Merge \\"Docs: Suppress errors in SystemApi Build Bug: 28427390\\" into nyc-dev am: d06520a488
...
am: b7181150c4
2016-06-16 21:13:04 +00:00
Gina Dimino
b7181150c4
Merge \"Docs: Suppress errors in SystemApi Build Bug: 28427390\" into nyc-dev
...
am: d06520a488
2016-06-16 21:08:17 +00:00
Gina Dimino
0bae4dcd76
Merge \"Docs: Suppress errors in SystemApi Build Bug: 28427390\" into nyc-dev
...
am: d06520a488
2016-06-16 21:08:15 +00:00
Gina Dimino
d06520a488
Merge "Docs: Suppress errors in SystemApi Build Bug: 28427390" into nyc-dev
2016-06-16 21:02:14 +00:00
Makoto Onuki
092d4e91e8
Merge \\"Shortcut: Reset throttling upon inline reply\\" into nyc-mr1-dev am: 489bafbb4b
...
am: 58b2258506
2016-06-16 17:17:56 +00:00
Makoto Onuki
58b2258506
Merge \"Shortcut: Reset throttling upon inline reply\" into nyc-mr1-dev
...
am: 489bafbb4b
2016-06-16 17:10:42 +00:00
Makoto Onuki
489bafbb4b
Merge "Shortcut: Reset throttling upon inline reply" into nyc-mr1-dev
2016-06-16 17:05:55 +00:00
Amith Yamasani
274ae72b47
Merge \\\"More thorough cleansing of expired users\\\" into nyc-dev am: 4f2b1b455e am: bf1301f542
...
am: 80027e9d93
2016-06-16 00:38:28 +00:00
Amith Yamasani
80027e9d93
Merge \\"More thorough cleansing of expired users\\" into nyc-dev am: 4f2b1b455e
...
am: bf1301f542
2016-06-16 00:28:45 +00:00
Amith Yamasani
bf1301f542
Merge \"More thorough cleansing of expired users\" into nyc-dev
...
am: 4f2b1b455e
2016-06-16 00:24:17 +00:00
Amith Yamasani
c5ffdb9ee4
Merge \"More thorough cleansing of expired users\" into nyc-dev
...
am: 4f2b1b455e
2016-06-16 00:24:14 +00:00
Makoto Onuki
a8607b119d
Merge \\"ShortcutManger: Auto-adjust ranks.\\" into nyc-mr1-dev am: 70a91541e9
...
am: 35f77b2b74
2016-06-15 23:14:15 +00:00
Makoto Onuki
35f77b2b74
Merge \"ShortcutManger: Auto-adjust ranks.\" into nyc-mr1-dev
...
am: 70a91541e9
2016-06-15 21:59:09 +00:00
Makoto Onuki
70a91541e9
Merge "ShortcutManger: Auto-adjust ranks." into nyc-mr1-dev
2016-06-15 21:44:58 +00:00
Makoto Onuki
9e1f5595bd
ShortcutManger: Auto-adjust ranks.
...
Spec: go/shortcutmanager-spec-ranks
Bug 28984376
Bug 28536066
Change-Id: Ibffb92233c62792af06eeadc5a9a6379d0506a3c
2016-06-15 14:24:44 -07:00
Amith Yamasani
d04aaa323c
More thorough cleansing of expired users
...
If any /data/system_[c|d]e folders were not erased
when the user was removed (maybe due to a reboot),
make sure they're cleaned up on restart as well
as when the userId is recycled later.
Mark the users' system folders with the correct
serial number for later verification.
AccountManager shouldn't be querying accounts of
partially created/destroyed users.
Change-Id: I4313756b7464f34cd5ce4fb296d61daa50b41fcb
Fixes: 29285673
2016-06-15 11:32:16 -07:00
Todd Kennedy
20c0209e2f
Merge \\"New API w/ multiple prefixes\\" into nyc-mr1-dev am: d07b87cb1c
...
am: 162b74a6fd
2016-06-15 00:07:56 +00:00
Todd Kennedy
162b74a6fd
Merge \"New API w/ multiple prefixes\" into nyc-mr1-dev
...
am: d07b87cb1c
2016-06-15 00:03:12 +00:00
Todd Kennedy
a97045b245
New API w/ multiple prefixes
...
Use the new API that contains multiple hash prefixes and a mask. Also
do some small refactoring necessary to handle multiple prefixes and
use a common implementation of the hash generation
Change-Id: Ib52f767ea6aadc30c67c5bdee949e9f9c5f04e44
2016-06-14 16:01:05 -07:00
Makoto Onuki
d6e1f3bec1
Shortcut: Reset throttling upon inline reply
...
When the user does an "inline reply", we consider the notification
publisher app is "activated" and reset the shortcut throttling.
Bug 28705275
Change-Id: Ic9ffa13635274ead7e9d1e832cd31dea997830aa
2016-06-14 14:12:07 -07:00
Makoto Onuki
eacbc45469
Merge \"Merge \\\"Push DO/PO package names from DPMS to PM\\\" into nyc-dev am: f419bd9e03 am: 93322e6818\" into nyc-mr1-dev-plus-aosp
...
am: 1dc43402e9
2016-06-13 22:52:46 +00:00
Makoto Onuki
31a5d3affa
Merge \\"Push DO/PO package names from DPMS to PM\\" into nyc-dev am: f419bd9e03
...
am: 93322e6818
2016-06-13 22:30:20 +00:00
Makoto Onuki
93322e6818
Merge \"Push DO/PO package names from DPMS to PM\" into nyc-dev
...
am: f419bd9e03
2016-06-13 22:17:10 +00:00
TreeHugger Robot
58806af09c
Merge "new ClipData constructor."
2016-06-13 21:30:48 +00:00
Makoto Onuki
78f16950c6
Merge \"Push DO/PO package names from DPMS to PM\" into nyc-dev
...
am: f419bd9e03
2016-06-13 21:23:18 +00:00
Makoto Onuki
f419bd9e03
Merge "Push DO/PO package names from DPMS to PM" into nyc-dev
2016-06-13 21:16:29 +00:00
Steve McKay
57eaaf6857
new ClipData constructor.
...
Add new constructor with args: ClipDescription, ArrayList<Item>.
This allows description and item list to be constructed separately.
Change-Id: I09f63d308dbafdb2c749019848afb0d2d24b8c44
2016-06-13 12:54:14 -07:00
Andreas Gampe
3196999a50
Merge \\"Otadexopt: Expose progress percentage\\" into nyc-mr1-dev am: b71c36b000
...
am: cda39b3af7
2016-06-13 17:02:11 +00:00
Andreas Gampe
cda39b3af7
Merge \"Otadexopt: Expose progress percentage\" into nyc-mr1-dev
...
am: b71c36b000
2016-06-13 16:58:06 +00:00
TreeHugger Robot
b71c36b000
Merge "Otadexopt: Expose progress percentage" into nyc-mr1-dev
2016-06-13 16:52:18 +00:00
Makoto Onuki
8aabf5e997
Merge \\"Fix some exception messages and enhance unit tets\\" into nyc-mr1-dev am: 5b8f5fd38b
...
am: 1c14929ae8
2016-06-13 16:46:24 +00:00
Makoto Onuki
1c14929ae8
Merge \"Fix some exception messages and enhance unit tets\" into nyc-mr1-dev
...
am: 5b8f5fd38b
2016-06-13 16:39:46 +00:00
Makoto Onuki
5b8f5fd38b
Merge "Fix some exception messages and enhance unit tets" into nyc-mr1-dev
2016-06-13 16:28:32 +00:00
