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
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
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
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
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
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
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
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
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
Makoto Onuki
a1d38b3c95
Fix some exception messages and enhance unit tets
...
Bug 29275393
Change-Id: Idaa8564d41f86de2a2cbefa4ff3c08b89a3a6dd2
2016-06-10 15:32:26 -07:00
Andreas Gampe
bf06232f4d
Otadexopt: Expose progress percentage
...
To be able to report progress of an A/B OTA dexopt, expose a
progress function that the script can query.
Bug: 25612095
Bug: 29223204
Change-Id: Ie8162946d18f6fa78649a40ad5d3949d31a181cd
2016-06-10 15:21:39 -07:00
Todd Kennedy
db6cd50708
Merge \"fix prefix generation\" into nyc-mr1-dev
...
am: 0f8427773e
2016-06-10 16:08:47 +00:00
Todd Kennedy
e2e1ef0581
fix prefix generation
...
when performing bitwise operations, java promotes byte's to int's.
this is normally okay except when the value is negative. in that
case, java extends the sign bits. this means that after shifting,
all of the upper bits are most likely going to be all f's. instead,
undo the sign extension by pulling out just the 8 bits we're
interested in.
Change-Id: I89f7244f6b675be2cca4a185a7002b5f8a6eece1
2016-06-09 15:22:15 -07:00
Todd Kennedy
ca251e5325
Merge \"make round icon usage configurable\" into nyc-mr1-dev
...
am: 7b52b2eccd
2016-06-09 17:13:28 +00:00
Todd Kennedy
a83bfca63f
make round icon usage configurable
...
We want to only use round icons for Nexus devices, so, add a configuration
boolean to control it. By default we will use the legacy, rectangle icons.
Bug: 28981414
Change-Id: Ib6448bc09287de852a48a943461a6882bd890a30
2016-06-09 07:25:03 -07:00
Chen Xu
e9819bae1a
Merge \\"resolve merge conflicts of afed6f8 to nyc-dev\\" into nyc-dev am: 0c4f1c7e5c
...
am: bee500e374
2016-06-09 02:47:10 +00:00
fionaxu
e285ab3aae
Merge \"resolve merge conflicts of afed6f8 to nyc-dev\" into nyc-dev
...
am: 0c4f1c7e5c
2016-06-09 02:39:54 +00:00
fionaxu
bee500e374
Merge \"resolve merge conflicts of afed6f8 to nyc-dev\" into nyc-dev
...
am: 0c4f1c7e5c
2016-06-09 02:39:52 +00:00
fionaxu
7978147771
resolve merge conflicts of afed6f8 to nyc-dev
...
Bug: 28557603
Change-Id: Icb19f3d031cce2d846d5f6e9ad4d28d002db6bac
2016-06-08 17:23:09 -07:00
Alan Viverette
7fa09ec4dc
Merge \"Return correct default theme on API >= 24\" into nyc-dev
...
am: afaa1e9db1
2016-06-08 20:20:44 +00:00
Ian Pedowitz
af2f098c8c
Merge \\"Return correct default theme on API >= 24\\" into nyc-dev am: afaa1e9db1
...
am: 1bb283131f
2016-06-08 18:59:14 +00:00
Makoto Onuki
c29f62c738
Push DO/PO package names from DPMS to PM
...
Bug 29126573
Change-Id: I95ea1559f6acf5d2f0e1b0953568cdfc938e83b9
2016-06-08 11:52:13 -07:00
Alan Viverette
1bb283131f
Merge \"Return correct default theme on API >= 24\" into nyc-dev
...
am: afaa1e9db1
2016-06-08 18:35:22 +00:00
fionaxu
c10e4fae05
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717
...
am: c95d552de0
2016-06-08 18:11:09 +00:00
fionaxu
c95d552de0
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c
...
am: 698e044717
2016-06-08 17:23:27 +00:00
Makoto Onuki
a3a56ab9d1
Merge \"ShortcutManager: deal with changing resource IDs on app update\" into nyc-mr1-dev
...
am: 3bb4366006
2016-06-08 17:11:55 +00:00
fionaxu
698e044717
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e
...
am: 965084dd0c
2016-06-08 17:11:49 +00:00
fionaxu
965084dd0c
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e
...
am: 1e8fe12f4e
2016-06-08 17:04:09 +00:00
Alan Viverette
4b2b615669
Return correct default theme on API >= 24
...
This method was broken, but it was returning light theme on N preview
builds, so we'll keep it consistent as we move into N release.
Bug: 29192690
Change-Id: I0d16abbe48756070dcd653c39d0da4124ea66b28
2016-06-08 11:45:15 -04:00
fionaxu
c196526f8e
resolve merge conflicts of 2c53526 to lmp-mr1-dev
...
Change-Id: I4fe45fae0a98934ac9b0f6f48c8cab8546392641
2016-06-07 22:01:19 -07:00
fionaxu
2c53526b4b
Backport loadSafeLabel changes am: be2865a60a am: 4c50846519
...
am: 9a825b0fd5
2016-06-07 23:23:10 +00:00
fionaxu
9a825b0fd5
Backport loadSafeLabel changes am: be2865a60a
...
am: 4c50846519
2016-06-07 23:20:04 +00:00
