Selim Cinek
afb1981e00
am 63a6bc2d: am 79934acb: Merge "Fixed a crash when the detail panel got very big" into lmp-mr1-dev
...
* commit '63a6bc2d996381ae62a71b2d464978b7f884d7d1':
Fixed a crash when the detail panel got very big
2014-10-07 00:35:06 +00:00
Selim Cinek
63a6bc2d99
am 79934acb: Merge "Fixed a crash when the detail panel got very big" into lmp-mr1-dev
...
* commit '79934acb40de31a7c4572bdb7a747edcb12bb8e4':
Fixed a crash when the detail panel got very big
2014-10-07 00:28:51 +00:00
Selim Cinek
79934acb40
Merge "Fixed a crash when the detail panel got very big" into lmp-mr1-dev
2014-10-07 00:22:34 +00:00
Chris Craik
2cf2ae7231
am 1155ed19: am 0aa69ff2: am 1a6c41fb: am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
...
* commit '1155ed1920fb93ff79e4e61fc928f6bd1d68c18c':
Avoid changeBounds animations on Views that are not yet laidout
2014-10-07 00:13:22 +00:00
Mike Lockwood
73c35e27d3
am 66c009eb: am bb68c263: am 3df6b76c: am 56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev
...
* commit '66c009ebfe5b31aa1f176d4856d95f5daad6079d':
Add support for playing audio during bootanimation
2014-10-07 00:13:18 +00:00
Mathieu Chartier
361e204991
am 830467e2: am 5ade30e8: am 405a934e: am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev
...
* commit '830467e2873767ff11960c3b9fecb2e7d4c57b21':
Fix incorrect JNI_ABORT
2014-10-07 00:13:14 +00:00
Jinsuk Kim
c71c833327
am 7f84aec9: am 84659edd: Merge "CEC: Send <Device Vendor ID> after address allocation" into lmp-mr1-dev
...
* commit '7f84aec9b34b3dea2fdf3ee4fc3273e1bdd8a573':
CEC: Send <Device Vendor ID> after address allocation
2014-10-07 00:13:06 +00:00
Geoff Mendal
1180831b64
am bfa09525: (-s ours) am a6b02708: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'bfa09525ab4b307ebe8f4e38f8b3ac6aee19e466':
Import translations. DO NOT MERGE
2014-10-07 00:13:02 +00:00
Jinsuk Kim
4f729b3fc7
am a3ad702f: am 85c927cf: Merge "CEC: Ensure the key transmission finishes all the time" into lmp-mr1-dev
...
* commit 'a3ad702f38b17fe27d5f73bb98a123959ada59ac':
CEC: Ensure the key transmission finishes all the time
2014-10-07 00:12:58 +00:00
Geoff Mendal
b65c9a1bbe
am a997d0e3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit 'a997d0e3b6e46fdeaa8d91ea306c0ce7602aa52b':
Import translations. DO NOT MERGE
2014-10-07 00:06:00 +00:00
Wei Liu
38f4d48288
am a84130d3: am de93b104: am a940f865: Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev
...
* commit 'a84130d3e45ad1ac4cb5843adc027d463c3c304d':
Hide bug report notification in Android Framework from watches.
2014-10-07 00:05:56 +00:00
Chris Craik
1155ed1920
am 0aa69ff2: am 1a6c41fb: am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
...
* commit '0aa69ff2ff9e8556f4963b7dfdad56996a604392':
Avoid changeBounds animations on Views that are not yet laidout
2014-10-07 00:05:32 +00:00
Mike Lockwood
66c009ebfe
am bb68c263: am 3df6b76c: am 56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev
...
* commit 'bb68c263620fe91eefb241efaf099742b3e6069c':
Add support for playing audio during bootanimation
2014-10-07 00:05:28 +00:00
Mathieu Chartier
830467e287
am 5ade30e8: am 405a934e: am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev
...
* commit '5ade30e82e05c783d74e3a52316be4c3ed11239c':
Fix incorrect JNI_ABORT
2014-10-07 00:05:24 +00:00
Jinsuk Kim
7f84aec9b3
am 84659edd: Merge "CEC: Send <Device Vendor ID> after address allocation" into lmp-mr1-dev
...
* commit '84659edd41b0bc7ecde645405e926a641e704824':
CEC: Send <Device Vendor ID> after address allocation
2014-10-06 23:55:09 +00:00
Geoff Mendal
bfa09525ab
am a6b02708: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'a6b027084cdeefcd431a4e6b46c1718ed3dfb874':
Import translations. DO NOT MERGE
2014-10-06 23:55:05 +00:00
Jinsuk Kim
a3ad702f38
am 85c927cf: Merge "CEC: Ensure the key transmission finishes all the time" into lmp-mr1-dev
...
* commit '85c927cfc264eda39a13ac224197525c5fae8bbc':
CEC: Ensure the key transmission finishes all the time
2014-10-06 23:55:02 +00:00
Selim Cinek
face7c1795
Fixed a crash when the detail panel got very big
...
An example was when we have many casting devices or users,
it was simply crashing. Also fixed a bug where the background
would not be drawn anymore.
Bug: 17699850
Change-Id: Ibdb8f75f53da2806dcd7dd1386ebcc345b012f47
2014-10-06 16:54:46 -07:00
Chris Craik
0aa69ff2ff
am 1a6c41fb: am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
...
* commit '1a6c41fbad9c1c6725d189fdcf7dae2fe3f00b4d':
Avoid changeBounds animations on Views that are not yet laidout
2014-10-06 23:51:05 +00:00
Mike Lockwood
bb68c26362
am 3df6b76c: am 56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev
...
* commit '3df6b76c5f6ca38f986305c805c9d90e0b861a41':
Add support for playing audio during bootanimation
2014-10-06 23:51:00 +00:00
Mathieu Chartier
5ade30e82e
am 405a934e: am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev
...
* commit '405a934ec46fccf7d2e6e573bb65a5be4b51665a':
Fix incorrect JNI_ABORT
2014-10-06 23:50:55 +00:00
Jinsuk Kim
84659edd41
Merge "CEC: Send <Device Vendor ID> after address allocation" into lmp-mr1-dev
2014-10-06 23:48:20 +00:00
Jinsuk Kim
ad515e88ee
CEC: Send <Device Vendor ID> after address allocation
...
This is required to pass CTS 11.2.9-2.
Bug: 17882288
Change-Id: Ie2823be8635a458a63a95abd44135035667d5836
2014-10-06 23:47:52 +00:00
Geoff Mendal
a997d0e3b6
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-10-06 23:34:20 +00:00
Geoff Mendal
a6b027084c
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-10-06 23:29:52 +00:00
Jinsuk Kim
85c927cfc2
Merge "CEC: Ensure the key transmission finishes all the time" into lmp-mr1-dev
2014-10-06 23:15:35 +00:00
Wei Liu
a84130d3e4
am de93b104: am a940f865: Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev
...
* commit 'de93b1049eb84ccdb30e9eb7dd1f255a82e41918':
Hide bug report notification in Android Framework from watches.
2014-10-06 22:39:05 +00:00
Chris Craik
1a6c41fbad
am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
...
* commit '6c9f0a01602697aaed99f54c4db0d6296701ed43':
Avoid changeBounds animations on Views that are not yet laidout
2014-10-06 22:35:19 +00:00
Mike Lockwood
3df6b76c5f
am 56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev
...
* commit '56b7d562af4dd0e7bd04163fe9a86a801fcff1fe':
Add support for playing audio during bootanimation
2014-10-06 22:35:13 +00:00
Mathieu Chartier
405a934ec4
am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev
...
* commit '1638a0049b4a5edae6aaf73a55a6aa7e14f71075':
Fix incorrect JNI_ABORT
2014-10-06 22:35:09 +00:00
Wei Liu
de93b1049e
am a940f865: Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev
...
* commit 'a940f8656d5ca6eb2d737a9a480166c760684ee0':
Hide bug report notification in Android Framework from watches.
2014-10-06 22:35:09 +00:00
ztenghui
0a04e31198
am f11d9de4: am 8cdb0bc0: Merge "Use float instead of double to increase spot shadow perf" into lmp-mr1-dev
...
* commit 'f11d9de43af807ad9d72a62fd1167ff6f9e7b903':
Use float instead of double to increase spot shadow perf
2014-10-06 22:31:33 +00:00
ztenghui
f11d9de43a
am 8cdb0bc0: Merge "Use float instead of double to increase spot shadow perf" into lmp-mr1-dev
...
* commit '8cdb0bc08728f18b75eca429678ea9b778191b6e':
Use float instead of double to increase spot shadow perf
2014-10-06 22:23:10 +00:00
Wei Liu
a940f8656d
Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev
2014-10-06 22:10:33 +00:00
Chris Craik
6c9f0a0160
Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
2014-10-06 22:06:23 +00:00
Geoff Mendal
6b8474a3e3
Import translations. DO NOT MERGE
...
Change-Id: I2f46ae080f4869329e7bb9b55f06dc37f2df9af0
Auto-generated-cl: translation import
2014-10-06 15:01:42 -07:00
Geoff Mendal
b501dd1fad
Import translations. DO NOT MERGE
...
Change-Id: I157884cf5f8c29c59f1365a28578d988a0a357a5
Auto-generated-cl: translation import
2014-10-06 14:58:45 -07:00
Chris Craik
f791703f9b
Avoid changeBounds animations on Views that are not yet laidout
...
bug:17683930
This means that GONE views with empty bounds don't trigger
ChangeBounds animations the first time they're shown.
Change-Id: I6503c5b0a790d3d31f7566fab27a0b12c5f61f26
2014-10-06 14:55:17 -07:00
Wei Liu
e255e4e536
Hide bug report notification in Android Framework from watches.
...
Bug: 17806348
Change-Id: I1a90a9bc68d8ef4ff540dbbd9e4af4bfed8a61ae
2014-10-06 14:50:10 -07:00
Mike Lockwood
56b7d562af
Merge "Add support for playing audio during bootanimation" into lmp-dev
2014-10-06 20:50:19 +00:00
Mathieu Chartier
1638a0049b
Merge "Fix incorrect JNI_ABORT" into lmp-dev
2014-10-06 20:27:08 +00:00
ztenghui
8cdb0bc087
Merge "Use float instead of double to increase spot shadow perf" into lmp-mr1-dev
2014-10-06 20:04:08 +00:00
Amit Mahajan
97221b97ee
am 40f43c7a: am 384ff9ef: am 15c581fa: am 17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev
...
* commit '40f43c7aea1bf96846c47ee8fb6766763110d2fc':
ATT: Call does not establish to '*1'
2014-10-06 19:44:29 +00:00
Geoff Mendal
835d1d2004
am 1c8487c8: (-s ours) am aece3ec5: (-s ours) am ce2b1e8c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '1c8487c80e655eca8bcd13eaf39180123f79b124':
Import translations. DO NOT MERGE
2014-10-06 19:44:22 +00:00
Mathieu Chartier
6a5e6df968
Fix incorrect JNI_ABORT
...
If there is a copy, JNI_ABORT does NOT copy back into the
corresponding java array. Changing this to 0 is what you want since
this will copy the data back if needed and free the temporary
storage.
Bug: 16858794
Change-Id: I3f3b426ea3cbba577bb720532c16ebf7493f1c1c
2014-10-06 12:44:09 -07:00
Geoff Mendal
dd67eb7aca
am 62c39bbe: (-s ours) am f132e7ef: (-s ours) am aa5c62f3: (-s ours) am 71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '62c39bbe2e18bbf010ea83ac85e00be0c4be31fb':
Import translations. DO NOT MERGE
2014-10-06 19:40:01 +00:00
Christopher Tate
9513c08c3a
am dd8541d7: am 3dd06aba: am 39006668: am bbebe423: Merge "adb backup/restore fixes" into lmp-dev
...
* commit 'dd8541d7812e7d9dc8d0f8c36b3c740a27b4c627':
adb backup/restore fixes
2014-10-06 19:39:54 +00:00
Dianne Hackborn
8b718b80e0
am db75703b: am 2f577e83: am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change" into lmp-dev
...
* commit 'db75703b261e1d1446cca210d7dcafa3279c31bc':
Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change
2014-10-06 19:39:50 +00:00
Geoff Mendal
9d27bbd5bc
am 45a2eb94: (-s ours) am 4795dfba: (-s ours) am 3647aba8: (-s ours) am ec763118: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '45a2eb9452e6323abbad5bdb4fa8e7aa161e7a99':
Import translations. DO NOT MERGE
2014-10-06 19:39:46 +00:00
John Spurlock
29ab5f7dc0
am 42730c93: am b6f5cb3e: am 81b96aad: am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
...
* commit '42730c93466d2ff533b42f56b4dd0080aad40d59':
Fix NPE in StrictMode handling.
2014-10-06 19:39:41 +00:00