Fyodor Kupolov
e4c1812750
Merge \\\"Use granted userId to look up provider info\\\" into nyc-dev am: f9f2c7ceef am: 7bc1db96ed
...
am: d50b61ff36
2016-06-22 22:54:09 +00:00
Fyodor Kupolov
d50b61ff36
Merge \\"Use granted userId to look up provider info\\" into nyc-dev am: f9f2c7ceef
...
am: 7bc1db96ed
2016-06-22 22:47:46 +00:00
Fyodor Kupolov
7bc1db96ed
Merge \"Use granted userId to look up provider info\" into nyc-dev
...
am: f9f2c7ceef
2016-06-22 22:41:42 +00:00
Fyodor Kupolov
f9f2c7ceef
Merge "Use granted userId to look up provider info" into nyc-dev
2016-06-22 22:28:38 +00:00
Adam Lesinski
b5c8a98b76
Merge \\\"ContextImpl: Keep DisplayAdjustments and Display in sync\\\" into nyc-dev am: 0bf31c3fa6 am: a72a6aae37
...
am: ce71c120df
2016-06-22 21:22:15 +00:00
Adam Lesinski
ce71c120df
Merge \\"ContextImpl: Keep DisplayAdjustments and Display in sync\\" into nyc-dev am: 0bf31c3fa6
...
am: a72a6aae37
2016-06-22 19:27:30 +00:00
Adam Lesinski
a72a6aae37
Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
...
am: 0bf31c3fa6
2016-06-22 19:17:43 +00:00
Adam Lesinski
e894efa9b6
Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
...
am: 0bf31c3fa6
2016-06-22 19:16:44 +00:00
Fyodor Kupolov
9bbaacf845
Use granted userId to look up provider info
...
In getPersistedUriPermissions, use granted userId instead of the calling
userId to look up provider info.
Bug: 29058113
Change-Id: Ia637be414f9ef3b8e9bce13bb56bd335cfb28ac7
2016-06-22 10:31:18 -07:00
Adam Lesinski
4ece3d6bb1
ContextImpl: Keep DisplayAdjustments and Display in sync
...
Make sure that when our Resources get updated, that DisplayAdjustment
and Display properly reflect the potentially new screen dimensions.
Bug:28388969
Change-Id: I340550ea094ece87abc8790dd46aaa60ab3cedd3
2016-06-21 17:55:58 -07:00
Makoto Onuki
02f355df6b
Merge \"Merge \\"Shortcut Manager: Address API council feedback and fix TODOs\\" into nyc-mr1-dev am: 3c67b3e47c\" into nyc-mr1-dev-plus-aosp
...
am: 24c52732d7
2016-06-22 00:55:32 +00:00
Makoto Onuki
5665a66b44
Merge \"Shortcut Manager: Address API council feedback and fix TODOs\" into nyc-mr1-dev
...
am: 3c67b3e47c
2016-06-21 23:50:32 +00:00
Makoto Onuki
3c67b3e47c
Merge "Shortcut Manager: Address API council feedback and fix TODOs" into nyc-mr1-dev
2016-06-21 23:35:16 +00:00
Makoto Onuki
b5a012fd6f
Shortcut Manager: Address API council feedback and fix TODOs
...
Bug 29515722
Bug 29516909
Bug 29515090
Bug 29516954
Bug 29515088
Change-Id: Ibe1d27033cbd0fd50d37e3d9945b47551211c568
2016-06-21 14:42:48 -07:00
Todd Kennedy
6b2df04ce4
Merge \\"Change prefix based upon mask\\" into nyc-mr1-dev am: 1dffcfdd7b
...
am: 322bb3fd0a
2016-06-21 19:00:02 +00:00
Todd Kennedy
322bb3fd0a
Merge \"Change prefix based upon mask\" into nyc-mr1-dev
...
am: 1dffcfdd7b
2016-06-21 18:54:15 +00:00
Todd Kennedy
409b0a13e1
Change prefix based upon mask
...
The mask may not be all F's.
Change-Id: I50ff4e4fb95af2037b84a1531b60dd9c0986bf86
2016-06-21 09:42:08 -07:00
Tony Mak
39fcc6acbc
Merge "Fix the handling of bundle array in RestrictionsManager"
2016-06-21 09:14:48 +00:00
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
Tony Mak
1d18efe080
Fix the handling of bundle array in RestrictionsManager
...
Fix: 29506624
Change-Id: I0683d406f8b70d5d5f78bfc337d3952b6513d102
2016-06-20 19:41:08 +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
