Jinsuk Kim
fe83576b55
am 8ccaedb5: am d66d3e73: am 7b4c9725: Merge "Fix build breakage by updating current.txt" into klp-modular-dev
...
* commit '8ccaedb51b0734d2711b8bf86f6ffeb57a5da172':
Fix build breakage by updating current.txt
2014-04-03 01:44:31 +00:00
Katie McCormick
e547056720
am 62b7e66e: am 035a2bbd: am 85588d19: am cd536cb3: am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
...
* commit '62b7e66e0356810bd11931edf6c14959b70be996':
docs: MediaRouteProvider Developer Guide
2014-04-03 01:44:28 +00:00
Jinsuk Kim
64b1ad5a39
am c9cb9138: am 4c963841: am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev
...
* commit 'c9cb91388b268608c8b7f588dca8417f2661f0ed':
Maintain display power status for playback device
2014-04-03 01:44:24 +00:00
Christopher Tate
4a7000924a
am a7d9b937: Merge "Refuse update of a system app if it changes its shared uid"
...
* commit 'a7d9b93756c8b1e61a721fe14d941ee7ab975513':
Refuse update of a system app if it changes its shared uid
2014-04-03 01:44:20 +00:00
Jinsuk Kim
8ccaedb51b
am d66d3e73: am 7b4c9725: Merge "Fix build breakage by updating current.txt" into klp-modular-dev
...
* commit 'd66d3e736fa101b48076433bc305971a19bb8f6f':
Fix build breakage by updating current.txt
2014-04-03 01:41:24 +00:00
Katie McCormick
62b7e66e03
am 035a2bbd: am 85588d19: am cd536cb3: am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
...
* commit '035a2bbd8b8720673e068cf06d646e616a10ab34':
docs: MediaRouteProvider Developer Guide
2014-04-03 01:41:20 +00:00
Jinsuk Kim
c9cb91388b
am 4c963841: am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev
...
* commit '4c963841db60ed59fd59a6fba79f8e3e6ec7f349':
Maintain display power status for playback device
2014-04-03 01:41:13 +00:00
Christopher Tate
a7d9b93756
Merge "Refuse update of a system app if it changes its shared uid"
2014-04-03 01:39:36 +00:00
Christopher Tate
c935d1f111
Refuse update of a system app if it changes its shared uid
...
Bug 13657183
Change-Id: I6d8fb9c8810ca896d2d10e5a80a3c4a50c9e4fed
2014-04-02 17:00:04 -07:00
Alan Viverette
01dac4cd5b
am 1970f570: Don\'t use TypedArray after recycling it
...
* commit '1970f570714a4746bf592e26731ea0ee8933d363':
Don't use TypedArray after recycling it
2014-04-02 23:51:27 +00:00
Alan Viverette
1970f57071
Don't use TypedArray after recycling it
...
BUG: 13771701
Change-Id: Ib3ccb270f44cd236ce5294f8d0e01f1922005a3b
2014-04-02 16:46:31 -07:00
Jinsuk Kim
d66d3e736f
am 7b4c9725: Merge "Fix build breakage by updating current.txt" into klp-modular-dev
...
* commit '7b4c972577179b2dfcf8a59c31b3730d097c5d46':
Fix build breakage by updating current.txt
2014-04-02 23:17:23 +00:00
Katie McCormick
035a2bbd8b
am 85588d19: am cd536cb3: am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
...
* commit '85588d19bd9fce3d7e837c14e0b9d50cf3a75904':
docs: MediaRouteProvider Developer Guide
2014-04-02 23:17:20 +00:00
Jinsuk Kim
7b4c972577
Merge "Fix build breakage by updating current.txt" into klp-modular-dev
2014-04-02 23:12:09 +00:00
Katie McCormick
85588d19bd
am cd536cb3: am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
...
* commit 'cd536cb32927d74ac8181c8636f2971cb39e7fda':
docs: MediaRouteProvider Developer Guide
2014-04-02 23:11:20 +00:00
Jinsuk Kim
196b6dd13e
Fix build breakage by updating current.txt
...
Change-Id: If9434850c24c8e97bdd49952fb3180d139cab101
2014-04-03 08:10:55 +09:00
Katie McCormick
cd536cb329
am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
...
* commit '0cdf60472be5efc1b6e8ef125f96ba014870b345':
docs: MediaRouteProvider Developer Guide
2014-04-02 23:05:04 +00:00
Katie McCormick
0cdf60472b
Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
2014-04-02 22:58:57 +00:00
Jinsuk Kim
4c963841db
am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev
...
* commit 'b1dca1624dc8d853a52d1918c7672173e9b79836':
Maintain display power status for playback device
2014-04-02 22:43:52 +00:00
Alan Viverette
8246270b53
am e3c38a0b: Fix recents theme, add missing headers
...
* commit 'e3c38a0b0ebefa0a86be944259467c8acc9e5e49':
Fix recents theme, add missing headers
2014-04-02 22:43:07 +00:00
Jinsuk Kim
b1dca1624d
Merge "Maintain display power status for playback device" into klp-modular-dev
2014-04-02 22:39:41 +00:00
Alan Viverette
e3c38a0b0e
Fix recents theme, add missing headers
...
Change-Id: Ib8eea6153eaf7e0e93e54c69fe59e63e98a409a6
2014-04-02 15:39:13 -07:00
Alan Viverette
941177af98
am 09ec3e30: Merge "Disable content transitions, they are not implemented yet"
...
* commit '09ec3e30b71d0bd8d5b711ffd68fbeb27a0930fb':
Disable content transitions, they are not implemented yet
2014-04-02 22:37:23 +00:00
Joe Fernandez
55b38fadd0
docs: MediaRouteProvider Developer Guide
...
Change-Id: I04e63a8972e29d67af6035462fd2808a562ac241
2014-04-02 15:35:15 -07:00
Alan Viverette
09ec3e30b7
Merge "Disable content transitions, they are not implemented yet"
2014-04-02 22:31:21 +00:00
Alan Viverette
3a3395042e
am b325345e: Merge "Switch framework Holo references to Quantum.Light"
...
* commit 'b325345ef0adf2849350d339de1ec5f92b67b7ae':
Switch framework Holo references to Quantum.Light
2014-04-02 22:18:59 +00:00
Winson Chung
6ec89da16e
am ceb9b437: Merge "Adding system service proxy to help test UI/performance."
...
* commit 'ceb9b437f701f68411fcbef7e83b5df45834f9d9':
Adding system service proxy to help test UI/performance.
2014-04-02 22:18:55 +00:00
Alan Viverette
b325345ef0
Merge "Switch framework Holo references to Quantum.Light"
2014-04-02 22:15:16 +00:00
Winson Chung
ceb9b437f7
Merge "Adding system service proxy to help test UI/performance."
2014-04-02 22:14:19 +00:00
Alan Viverette
255e7d83b6
Disable content transitions, they are not implemented yet
...
BUG: 13745751
Change-Id: I5d3c7c2f679084b7a161b7233e18264056eee211
2014-04-02 15:14:03 -07:00
Jorim Jaggi
ae6ffcc3c7
Merge "Wait for Keyguard to be drawn after boot." into master-lockscreen-dev
2014-04-02 21:22:59 +00:00
Alan Viverette
ab6e111634
am 8754b73b: Merge "Add inverse text styles to public"
...
* commit '8754b73bf81aa0164f3e2a1a429ba0fda39202de':
Add inverse text styles to public
2014-04-02 21:13:25 +00:00
Dave Platt
8f7f613b2a
am db89fe2a: Merge "Document and enforce "one request per Listener" rule"
...
* commit 'db89fe2a2b7932f013f7a2dd136324c3daeee253':
Document and enforce "one request per Listener" rule
2014-04-02 21:13:21 +00:00
Ben Cheng
56b7d1401a
am 0e2806b1: am 3399ec31: am b386bfd7: am 89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip."
...
* commit '0e2806b171f135de35153a106d18d86646f4d1c0':
Use default visibility for Snapshot::getLocalClip.
2014-04-02 21:13:18 +00:00
Alan Viverette
8754b73bf8
Merge "Add inverse text styles to public"
2014-04-02 21:11:39 +00:00
Dave Platt
db89fe2a2b
Merge "Document and enforce "one request per Listener" rule"
2014-04-02 21:09:43 +00:00
Ben Cheng
0e2806b171
am 3399ec31: am b386bfd7: am 89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip."
...
* commit '3399ec317d8a318ca384036bc6fecf4656f1f118':
Use default visibility for Snapshot::getLocalClip.
2014-04-02 21:07:25 +00:00
Chris Wren
506fbbfa4c
am af31a7d1: Merge "add variance to notification usage stats"
...
* commit 'af31a7d1cc26733f138119c43385aa86d0a3c04f':
add variance to notification usage stats
2014-04-02 21:07:21 +00:00
Chris Wren
af31a7d1cc
Merge "add variance to notification usage stats"
2014-04-02 21:03:00 +00:00
Ben Cheng
3399ec317d
am b386bfd7: am 89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip."
...
* commit 'b386bfd791d77e24bcfe3261420f82b0a9d3851d':
Use default visibility for Snapshot::getLocalClip.
2014-04-02 20:59:47 +00:00
Chris Wren
5110397488
add variance to notification usage stats
...
Change-Id: I9b6abd08cf01a1d80c8e5dd581c8e82e019542fc
2014-04-02 16:57:56 -04:00
Ben Cheng
b386bfd791
am 89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip."
...
* commit '89dddcc948cb3e826bfddeefae73066849aba0fc':
Use default visibility for Snapshot::getLocalClip.
2014-04-02 20:54:47 +00:00
Ben Cheng
89dddcc948
Merge "Use default visibility for Snapshot::getLocalClip."
2014-04-02 20:51:00 +00:00
Michael Wright
63ee033ca8
am ddbb0a3c: am 744cf2b9: (-s ours) am 4932a355: Merge "Misc. buttons aren\'t gamepad keys." into klp-modular-dev
...
* commit 'ddbb0a3c33a070a6337cdb17b1063eee545df1e8':
Misc. buttons aren't gamepad keys.
2014-04-02 20:48:56 +00:00
ztenghui
71302d0302
am 2766e37d: Merge "Getting the version information into the VectorDrawable"
...
* commit '2766e37d85eb4ae91095dc6822cce421473f08cb':
Getting the version information into the VectorDrawable
2014-04-02 20:45:18 +00:00
Michael Wright
ddbb0a3c33
am 744cf2b9: (-s ours) am 4932a355: Merge "Misc. buttons aren\'t gamepad keys." into klp-modular-dev
...
* commit '744cf2b98f3f643380ab1db53e3d2216ecf9d872':
Misc. buttons aren't gamepad keys.
2014-04-02 20:45:00 +00:00
ztenghui
2766e37d85
Merge "Getting the version information into the VectorDrawable"
2014-04-02 20:39:46 +00:00
Michael Wright
744cf2b98f
am 4932a355: Merge "Misc. buttons aren\'t gamepad keys." into klp-modular-dev
...
* commit '4932a355f1594990173e0d9cd1fa38b8491c4a29':
Misc. buttons aren't gamepad keys.
2014-04-02 20:30:29 +00:00
Michael Wright
4932a355f1
Merge "Misc. buttons aren't gamepad keys." into klp-modular-dev
2014-04-02 20:26:36 +00:00
Ben Cheng
65ba94f79d
Use default visibility for Snapshot::getLocalClip.
...
The method is in libhwui.so but used by libandroid_runtime.so
(via android_view_GLES20Canvas.cpp). If the compiler decides not to
inline this method, the linker won't be able to resolve the dependency
when it has hidden visibility.
The problem is found when testing GCC 4.9.
Change-Id: I3b4d096c7767f0bef0796886dfb2c5ba2ecff48c
2014-04-02 13:26:33 -07:00