OSDN Git Service
Michael Wright [Tue, 11 Mar 2014 23:26:39 +0000 (23:26 +0000)]
am
a54f852d: am
ed28fc89: Utilize new Android LED constants. DO NOT MERGE
* commit '
a54f852d3df7ac2e245ccffe8409b217330e5092':
Utilize new Android LED constants. DO NOT MERGE
Jose Lima [Tue, 11 Mar 2014 23:20:32 +0000 (23:20 +0000)]
am
dd0db799: am
5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
* commit '
dd0db799ee25833a8989a823299f039ac31fef58':
Added LEANBACK_LAUNCHER Intent category
Robert Greenwalt [Tue, 11 Mar 2014 23:20:28 +0000 (23:20 +0000)]
am
ee142967: am
e5098b50: am
e8af5e10: am
6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
* commit '
ee142967f60388d73c3bb99f321a781aa07f1eec':
DO NOT MERGE Debounce wifi country code Info
Zhihai Xu [Tue, 11 Mar 2014 23:20:25 +0000 (23:20 +0000)]
am
cb714ae6: am
74f36d31: am
c48c9626: am
82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev
* commit '
cb714ae68e3d1c0047fdb6980fabcafcd57b37b6':
DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
Vinit Deshapnde [Tue, 11 Mar 2014 23:20:22 +0000 (23:20 +0000)]
am
dbba6f07: am
2e76f5d8: am
5f683ca8: am
5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
* commit '
dbba6f076999afaad720c7c5657f7cbf9cdf2d14':
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
John Spurlock [Tue, 11 Mar 2014 23:20:19 +0000 (23:20 +0000)]
am
b41c951f: am
cb5f813b: am
0a3cb2ce: am
b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
* commit '
b41c951fb1b2a27d3278948f809e90a7c203ca4b':
Fix doc typos in Vibrator.java
Scott Main [Tue, 11 Mar 2014 23:20:16 +0000 (23:20 +0000)]
am
60d18cea: am
21207588: am
790c5a4c: am
29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs
* commit '
60d18ceaf12ec24cea18d21121845dc4edcd5272':
fix some typos for GoogleApiClient doc
Scott Main [Tue, 11 Mar 2014 23:20:13 +0000 (23:20 +0000)]
am
a17a7000: am
2ada4e31: am
7b0c111b: am
69e49a81: Merge "fix typos" into klp-docs
* commit '
a17a7000f2e1c5d38694c6329a8efdcad48fe1d5':
fix typos
Michael Wright [Tue, 11 Mar 2014 23:16:25 +0000 (23:16 +0000)]
am
ed28fc89: Utilize new Android LED constants. DO NOT MERGE
* commit '
ed28fc89e3085a88c6bd8b4269988150f3eceb56':
Utilize new Android LED constants. DO NOT MERGE
Michael Wright [Fri, 18 Oct 2013 22:26:48 +0000 (15:26 -0700)]
Utilize new Android LED constants. DO NOT MERGE
Also, have EventHub manage game controllers' player LEDs
Change-Id: Ic7dba19ad236a3c7d1aff5d3f938bd239b98d51d
Jose Lima [Tue, 11 Mar 2014 19:19:11 +0000 (19:19 +0000)]
am
5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
* commit '
5f0c0498a1382ef955cccca95920ec878fe2a64c':
Added LEANBACK_LAUNCHER Intent category
Robert Greenwalt [Tue, 11 Mar 2014 19:19:07 +0000 (19:19 +0000)]
am
e5098b50: am
e8af5e10: am
6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
* commit '
e5098b502c28d8f40ff3b39070fc5fb7f1a3e445':
DO NOT MERGE Debounce wifi country code Info
Zhihai Xu [Tue, 11 Mar 2014 19:19:05 +0000 (19:19 +0000)]
am
74f36d31: am
c48c9626: am
82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev
* commit '
74f36d31892d8fdfddbecc7bf3018aa3a190e5fb':
DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
Vinit Deshapnde [Tue, 11 Mar 2014 19:19:02 +0000 (19:19 +0000)]
am
2e76f5d8: am
5f683ca8: am
5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
* commit '
2e76f5d8a282f4f948f88208e77dc4b3d0ec6634':
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
John Spurlock [Tue, 11 Mar 2014 19:18:59 +0000 (19:18 +0000)]
am
cb5f813b: am
0a3cb2ce: am
b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
* commit '
cb5f813bb642e72777643dcd2bcbd92cc2039388':
Fix doc typos in Vibrator.java
Scott Main [Tue, 11 Mar 2014 19:18:55 +0000 (19:18 +0000)]
am
21207588: am
790c5a4c: am
29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs
* commit '
212075889eab9aab2c48881803888a1b827d77ba':
fix some typos for GoogleApiClient doc
Scott Main [Tue, 11 Mar 2014 19:18:48 +0000 (19:18 +0000)]
am
2ada4e31: am
7b0c111b: am
69e49a81: Merge "fix typos" into klp-docs
* commit '
2ada4e310d728756fc9bf69086987bfe215dc487':
fix typos
Jose Lima [Tue, 11 Mar 2014 18:08:53 +0000 (18:08 +0000)]
Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
Robert Greenwalt [Tue, 11 Mar 2014 17:44:20 +0000 (17:44 +0000)]
am
e8af5e10: am
6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
* commit '
e8af5e10e04697acb26b47e5d60b99e5c61a020c':
DO NOT MERGE Debounce wifi country code Info
Zhihai Xu [Tue, 11 Mar 2014 17:43:56 +0000 (17:43 +0000)]
am
c48c9626: am
82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev
* commit '
c48c9626bd2eb91aab33a034baf139aa2b92671d':
DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
Vinit Deshapnde [Tue, 11 Mar 2014 17:43:50 +0000 (17:43 +0000)]
am
5f683ca8: am
5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
* commit '
5f683ca80611c3e98c91f631ee05dccf3e7e0227':
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
John Spurlock [Tue, 11 Mar 2014 17:43:46 +0000 (17:43 +0000)]
am
0a3cb2ce: am
b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
* commit '
0a3cb2ce1b2472b7e4ca6739eaeaa50975abf6ab':
Fix doc typos in Vibrator.java
Scott Main [Tue, 11 Mar 2014 17:43:42 +0000 (17:43 +0000)]
am
790c5a4c: am
29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs
* commit '
790c5a4c06e0ceee8fbdbed575e93ef257124569':
fix some typos for GoogleApiClient doc
Scott Main [Tue, 11 Mar 2014 17:43:38 +0000 (17:43 +0000)]
am
7b0c111b: am
69e49a81: Merge "fix typos" into klp-docs
* commit '
7b0c111b5f3595de5cac61b0657a6f2ecb7e77bd':
fix typos
Jose Lima [Tue, 11 Mar 2014 17:41:39 +0000 (10:41 -0700)]
Added LEANBACK_LAUNCHER Intent category
Change-Id: I4f5ccfa9725106f558972c73abbe3f9435267c75
Narayan Kamath [Tue, 11 Mar 2014 15:21:04 +0000 (15:21 +0000)]
am
a8706527: am
b071a07d: am
a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."
* commit '
a870652789cc2b06b921fe66aa1bf48d4fc3e97c':
Remove java.io.tmpdir assignment in AndroidRuntime (again).
Narayan Kamath [Tue, 11 Mar 2014 15:17:45 +0000 (15:17 +0000)]
am
b071a07d: am
a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."
* commit '
b071a07da89a8736fa4fd757f9a6c6e990d0e858':
Remove java.io.tmpdir assignment in AndroidRuntime (again).
Narayan Kamath [Tue, 11 Mar 2014 15:14:26 +0000 (08:14 -0700)]
am
a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."
* commit '
a79af3647f7f93825b84cc25187527b5aac60a69':
Remove java.io.tmpdir assignment in AndroidRuntime (again).
Narayan Kamath [Tue, 11 Mar 2014 15:09:44 +0000 (15:09 +0000)]
Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."
Narayan Kamath [Tue, 11 Mar 2014 15:02:10 +0000 (15:02 +0000)]
Remove java.io.tmpdir assignment in AndroidRuntime (again).
This was brought back by a bad merge conflict resolution
in change
0efbd9a463c848118c7685f4bfc8765a82caa761.
Change-Id: I0c7cbe8ee396293619eabf4d0a3c2f06c76bdd6e
Narayan Kamath [Tue, 11 Mar 2014 12:08:58 +0000 (12:08 +0000)]
am
b485d8e1: am
194e77aa: am
0f3fd6c6: Merge "Remove stray logging statement."
* commit '
b485d8e1e405296307197ae07c6ed214be3b4f58':
Remove stray logging statement.
Narayan Kamath [Tue, 11 Mar 2014 12:06:00 +0000 (12:06 +0000)]
am
194e77aa: am
0f3fd6c6: Merge "Remove stray logging statement."
* commit '
194e77aafe32cacc00f69b25bec6eeea67eb0205':
Remove stray logging statement.
Narayan Kamath [Tue, 11 Mar 2014 12:03:36 +0000 (05:03 -0700)]
am
0f3fd6c6: Merge "Remove stray logging statement."
* commit '
0f3fd6c66e8376e62ed61dd2b92ea4807571b3de':
Remove stray logging statement.
Narayan Kamath [Tue, 11 Mar 2014 12:00:54 +0000 (12:00 +0000)]
Merge "Remove stray logging statement."
Narayan Kamath [Tue, 11 Mar 2014 11:08:41 +0000 (11:08 +0000)]
Remove stray logging statement.
bug: https://code.google.com/p/android/issues/detail?id=66974
Change-Id: Ie34c102de143cf6aeb16c78778dda3ef5e928380
Jeff Brown [Tue, 11 Mar 2014 00:19:07 +0000 (00:19 +0000)]
am
f54d62dc: am
fc7315c6: am
6d71e165: Merge "Round off when calculate next step in Seekbar"
* commit '
f54d62dc80b43a72adaa273836f00153ce7edc72':
Round off when calculate next step in Seekbar
Jeff Brown [Tue, 11 Mar 2014 00:15:38 +0000 (00:15 +0000)]
am
fc7315c6: am
6d71e165: Merge "Round off when calculate next step in Seekbar"
* commit '
fc7315c6c17e6ebc559d2ea0afb8be64c5d7b86c':
Round off when calculate next step in Seekbar
Jeff Brown [Tue, 11 Mar 2014 00:15:14 +0000 (00:15 +0000)]
am
14006523: am
33282d66: am
a41ddccd: Merge "Fixed typo errors in documentation"
* commit '
140065230900b465f85f64c5da5181d124076e1d':
Fixed typo errors in documentation
Jeff Brown [Tue, 11 Mar 2014 00:15:11 +0000 (00:15 +0000)]
am
daa1c969: am
aaf23a9a: am
c3f5d694: Merge "Hang off call by power button while screen is on"
* commit '
daa1c96954f666b9f661501e11014a57533eefad':
Hang off call by power button while screen is on
Jeff Brown [Tue, 11 Mar 2014 00:15:03 +0000 (00:15 +0000)]
am
f2e837e5: am
e7f7af96: am
35c8ebab: Merge "take account of RotationVector\'s new extra parameter"
* commit '
f2e837e57900514a554f174a29730157160c1fa1':
take account of RotationVector's new extra parameter
Jeff Brown [Tue, 11 Mar 2014 00:11:57 +0000 (17:11 -0700)]
am
6d71e165: Merge "Round off when calculate next step in Seekbar"
* commit '
6d71e165ba961251f0705b75aafed74eba1bc570':
Round off when calculate next step in Seekbar
Jeff Brown [Tue, 11 Mar 2014 00:11:14 +0000 (00:11 +0000)]
am
33282d66: am
a41ddccd: Merge "Fixed typo errors in documentation"
* commit '
33282d66155e8d68acea512989ec61cb15fae1ce':
Fixed typo errors in documentation
Jeff Brown [Tue, 11 Mar 2014 00:11:10 +0000 (00:11 +0000)]
am
aaf23a9a: am
c3f5d694: Merge "Hang off call by power button while screen is on"
* commit '
aaf23a9a653457cccf54293b2ff76196718c7a1a':
Hang off call by power button while screen is on
Jeff Brown [Tue, 11 Mar 2014 00:11:05 +0000 (00:11 +0000)]
am
e7f7af96: am
35c8ebab: Merge "take account of RotationVector\'s new extra parameter"
* commit '
e7f7af964baa3c5d36abd163e33ad139310049d2':
take account of RotationVector's new extra parameter
Jeff Brown [Tue, 11 Mar 2014 00:08:27 +0000 (17:08 -0700)]
am
a41ddccd: Merge "Fixed typo errors in documentation"
* commit '
a41ddccdc67ace7c9363efebbf6e51710928ce12':
Fixed typo errors in documentation
Jeff Brown [Tue, 11 Mar 2014 00:08:24 +0000 (17:08 -0700)]
am
c3f5d694: Merge "Hang off call by power button while screen is on"
* commit '
c3f5d694324fbe2831405ce60bc43bd0d0183d07':
Hang off call by power button while screen is on
Jeff Brown [Tue, 11 Mar 2014 00:08:21 +0000 (17:08 -0700)]
am
35c8ebab: Merge "take account of RotationVector\'s new extra parameter"
* commit '
35c8ebab0ac66bf2c12b6986f90a07be402e0076':
take account of RotationVector's new extra parameter
Jeff Brown [Tue, 11 Mar 2014 00:06:40 +0000 (00:06 +0000)]
Merge "Round off when calculate next step in Seekbar"
Jeff Brown [Tue, 11 Mar 2014 00:06:24 +0000 (00:06 +0000)]
Merge "Fixed typo errors in documentation"
Jeff Brown [Tue, 11 Mar 2014 00:06:01 +0000 (00:06 +0000)]
Merge "Hang off call by power button while screen is on"
Jeff Brown [Tue, 11 Mar 2014 00:04:49 +0000 (00:04 +0000)]
Merge "take account of RotationVector's new extra parameter"
Adam Powell [Mon, 10 Mar 2014 23:35:16 +0000 (23:35 +0000)]
am
c8b43bc0: am
fd6b9975: Prevent overflow from MeasureSpec.adjust; measure cache fix
* commit '
c8b43bc0021aea63858044551f13cae86f4e5699':
Prevent overflow from MeasureSpec.adjust; measure cache fix
Adam Powell [Mon, 10 Mar 2014 23:31:04 +0000 (23:31 +0000)]
am
fd6b9975: Prevent overflow from MeasureSpec.adjust; measure cache fix
* commit '
fd6b99750bfab7f930ee375a79009874a3196165':
Prevent overflow from MeasureSpec.adjust; measure cache fix
Adam Powell [Fri, 7 Mar 2014 01:55:16 +0000 (17:55 -0800)]
Prevent overflow from MeasureSpec.adjust; measure cache fix
Extract the size from the MeasureSpec value before adding the
delta. The opposite order could result in a negative delta causing
overflow into size from the EXACTLY mode, creating a very large size
value in the resulting MeasureSpec.
Don't reapply optical bounds insets after pulling a value from the
measurement cache. (The insets will have already been applied before
insertion into the cache.)
Change-Id: Ib0154f4d6c3a7c31e7fee24fd7d5d10cc5dc71a1
Robert Greenwalt [Mon, 10 Mar 2014 20:06:23 +0000 (20:06 +0000)]
am
6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
* commit '
6d9ed0c35327adfba50004fe9270ee6471459fb0':
DO NOT MERGE Debounce wifi country code Info
Robert Greenwalt [Mon, 10 Mar 2014 20:04:09 +0000 (20:04 +0000)]
Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
Benoit Goby [Mon, 10 Mar 2014 19:05:13 +0000 (19:05 +0000)]
am
6835033a: am
c6f0b54d: Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev
* commit '
6835033af4f42132337a65eeeb1e4362a36b0465':
Add CAP_BLOCK_SUSPEND to system server
Benoit Goby [Mon, 10 Mar 2014 19:02:54 +0000 (19:02 +0000)]
am
c6f0b54d: Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev
* commit '
c6f0b54d695b49966a13bb196800a985ac6ce212':
Add CAP_BLOCK_SUSPEND to system server
Benoit Goby [Mon, 10 Mar 2014 18:59:05 +0000 (18:59 +0000)]
Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev
Zhihai Xu [Mon, 10 Mar 2014 18:49:47 +0000 (18:49 +0000)]
am
82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev
* commit '
82ec1442487d66935cb0c30f6da3545d8c33af6e':
DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
Zhihai Xu [Mon, 10 Mar 2014 18:46:56 +0000 (18:46 +0000)]
Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev
Zhihai Xu [Tue, 7 Jan 2014 19:36:01 +0000 (19:36 +0000)]
DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
This reverts commit
371427b53c70d1a71012de404c29187fe303a22a.
bug:
12099469
Change-Id: I497832b54856a9909fc8651ee67555e02e0e763e
Brian Carlstrom [Mon, 10 Mar 2014 17:54:14 +0000 (17:54 +0000)]
am
9e736723: am
ec4c7752: am
ab97d617: Merge "Only pass -Xprofile-* options to ART"
* commit '
9e73672362e2ed98ccfcc15695645daa42a61524':
Only pass -Xprofile-* options to ART
Vinit Deshapnde [Mon, 10 Mar 2014 17:54:01 +0000 (17:54 +0000)]
am
5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
* commit '
5243a760452dc06ec2fd0c50e1c23c0d8c3d16e7':
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
Vinit Deshapnde [Mon, 10 Mar 2014 17:51:18 +0000 (17:51 +0000)]
Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
Brian Carlstrom [Mon, 10 Mar 2014 17:51:05 +0000 (17:51 +0000)]
am
ec4c7752: am
ab97d617: Merge "Only pass -Xprofile-* options to ART"
* commit '
ec4c7752c22ae26924378d953a6f4a0e8e8b036d':
Only pass -Xprofile-* options to ART
Brian Carlstrom [Mon, 10 Mar 2014 17:47:26 +0000 (10:47 -0700)]
am
ab97d617: Merge "Only pass -Xprofile-* options to ART"
* commit '
ab97d617e8043f7396dc6031c4ddeb2ae632230f':
Only pass -Xprofile-* options to ART
Brian Carlstrom [Mon, 10 Mar 2014 17:44:30 +0000 (17:44 +0000)]
Merge "Only pass -Xprofile-* options to ART"
Brian Carlstrom [Mon, 10 Mar 2014 17:20:01 +0000 (10:20 -0700)]
Only pass -Xprofile-* options to ART
Bug:
13391896
Change-Id: I5d6a3b900c9b20f02e1d4ccb73f712e9260c7dfd
John Spurlock [Mon, 10 Mar 2014 16:24:31 +0000 (16:24 +0000)]
am
b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
* commit '
b2bd63f00631b68df3595a4369ec4802e6443bc7':
Fix doc typos in Vibrator.java
Scott Main [Mon, 10 Mar 2014 16:24:29 +0000 (16:24 +0000)]
am
29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs
* commit '
29de50633348fb6329ed38980abce0010253a941':
fix some typos for GoogleApiClient doc
Scott Main [Mon, 10 Mar 2014 16:24:26 +0000 (16:24 +0000)]
am
69e49a81: Merge "fix typos" into klp-docs
* commit '
69e49a819a5fd3a9d0ede1ba18f204e5e2050da6':
fix typos
John Spurlock [Mon, 10 Mar 2014 16:22:22 +0000 (16:22 +0000)]
Merge "Fix doc typos in Vibrator.java" into klp-docs
Scott Main [Mon, 10 Mar 2014 16:21:10 +0000 (16:21 +0000)]
Merge "fix some typos for GoogleApiClient doc" into klp-docs
Scott Main [Mon, 10 Mar 2014 16:20:45 +0000 (16:20 +0000)]
Merge "fix typos" into klp-docs
John Spurlock [Mon, 10 Mar 2014 15:29:35 +0000 (11:29 -0400)]
Fix doc typos in Vibrator.java
Change-Id: Ie95cd7fa16042897e6acf94badec98bc19bde57a
Narayan Kamath [Mon, 10 Mar 2014 10:51:11 +0000 (10:51 +0000)]
am
8272c84c: am
bbf82665: am
6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."
* commit '
8272c84cb531a4f148f0b0a31d8359d381137378':
LP64: Make 9 patches architecture agnostic.
Narayan Kamath [Mon, 10 Mar 2014 10:47:45 +0000 (10:47 +0000)]
am
bbf82665: am
6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."
* commit '
bbf826659e8e5d0be683b2459207c495303d53b6':
LP64: Make 9 patches architecture agnostic.
Narayan Kamath [Mon, 10 Mar 2014 10:46:07 +0000 (03:46 -0700)]
am
6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."
* commit '
6e2fb587d71631bd29fdb844a6451d68e2144337':
LP64: Make 9 patches architecture agnostic.
Narayan Kamath [Mon, 10 Mar 2014 10:43:57 +0000 (10:43 +0000)]
Merge "LP64: Make 9 patches architecture agnostic."
Narayan Kamath [Mon, 3 Mar 2014 17:12:03 +0000 (17:12 +0000)]
LP64: Make 9 patches architecture agnostic.
The Res_png_9patch struct had several pointer members
whose size differed between 32 and 64 bit platforms.
These members have been replaced by uint32_t offsets
to serialized data. The serialized form for 9patches
places a Res_png_9patch object at the beginning of
serialized data, followed by int32_t arrays of xDivs,
yDivs and colors.
Note that these offsets are not strictly required,
since they can be computed from the values of numXDivs,
numYDivs & numColors, however they are called in tight
loops so having them computed once is a beneficial.
This change also removed the unused patch_equals function
from aapt's Image.cpp.
Change-Id: I3b9ac8ae5c05510d41377cae4dff1c69b40c2531
Wei Wang [Sat, 8 Mar 2014 02:18:50 +0000 (02:18 +0000)]
am
e3318add: am
1062080c: am
0ea81eed: (-s ours) am
1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev
* commit '
e3318addc9c42a7b6d9d1ba8eaff786236b6dec0':
DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
Wei Wang [Sat, 8 Mar 2014 02:15:08 +0000 (02:15 +0000)]
am
1062080c: am
0ea81eed: (-s ours) am
1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev
* commit '
1062080cd323c14d5bd24fb308da9431a0d250e5':
DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
Wei Wang [Sat, 8 Mar 2014 02:11:17 +0000 (02:11 +0000)]
am
0ea81eed: (-s ours) am
1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev
* commit '
0ea81eed882d288c9473e377639b0b88280fd044':
DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
Adam Powell [Sat, 8 Mar 2014 02:09:36 +0000 (02:09 +0000)]
am
62563523: am
c4a6df22: am
96192157: am
f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev
* commit '
6256352364c53ce841e7635f637713a0b7677be6':
Fix a bug where OnTouchListeners in action views could be removed
Marco Nelissen [Sat, 8 Mar 2014 02:09:33 +0000 (02:09 +0000)]
am
1b49f105: am
bf0fdac1: am
f41efb44: am
57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev
* commit '
1b49f10580a33838de54389095dbe5dddd0bc22b':
Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Craig Mautner [Sat, 8 Mar 2014 02:09:30 +0000 (02:09 +0000)]
am
f8c4c3c7: am
508e88e3: am
9bf7f893: (-s ours) am
93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev
* commit '
f8c4c3c765ca5d4faa4aed6940e5a26c9c7f1d44':
Show the keyguard if unsecure window on top. DO NOT MERGE.
Wei Wang [Sat, 8 Mar 2014 02:05:57 +0000 (02:05 +0000)]
am
1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev
* commit '
1327e59f36ceea5a1ee7dc66b311206345353de5':
DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
Adam Powell [Sat, 8 Mar 2014 02:03:06 +0000 (02:03 +0000)]
am
c4a6df22: am
96192157: am
f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev
* commit '
c4a6df22649378631c4e541ed81c5848735427dd':
Fix a bug where OnTouchListeners in action views could be removed
Marco Nelissen [Sat, 8 Mar 2014 02:03:03 +0000 (02:03 +0000)]
am
bf0fdac1: am
f41efb44: am
57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev
* commit '
bf0fdac12d325098b65cde2c76dece85b753d663':
Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Craig Mautner [Sat, 8 Mar 2014 02:03:00 +0000 (02:03 +0000)]
am
508e88e3: am
9bf7f893: (-s ours) am
93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev
* commit '
508e88e329cd157c3de94ccbac7374038f7e2355':
Show the keyguard if unsecure window on top. DO NOT MERGE.
Wei Wang [Sat, 8 Mar 2014 02:01:01 +0000 (02:01 +0000)]
Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev
Dave Allison [Sat, 8 Mar 2014 02:00:39 +0000 (02:00 +0000)]
am
324aa693: am
b94904ab: am
3fc3b9fd: Merge "ART profiler usage."
* commit '
324aa693b82656809b97e307676adbbce37c3d95':
ART profiler usage.
Tim Kilbourn [Sat, 8 Mar 2014 02:00:36 +0000 (02:00 +0000)]
am
032305fb: am
b559b371: Merge "Dump leanback info in aapt dump badging." into klp-modular-dev
* commit '
032305fbcf1f1923030723d60621d8bbfa138511':
Dump leanback info in aapt dump badging.
Ying Wang [Sat, 8 Mar 2014 02:00:34 +0000 (02:00 +0000)]
am
f5f4d930: am
74bebf6f: Exclude the host aapt and aidl from PDK build.
* commit '
f5f4d9306011ea1b10d25c959334f3e62df4447e':
Exclude the host aapt and aidl from PDK build.
Dave Allison [Sat, 8 Mar 2014 01:56:29 +0000 (01:56 +0000)]
am
b94904ab: am
3fc3b9fd: Merge "ART profiler usage."
* commit '
b94904ab6dfbb9db7e8042f10886042a295857d4':
ART profiler usage.
Jeff Brown [Sat, 8 Mar 2014 01:55:44 +0000 (01:55 +0000)]
am
6f9f8e7a: am
01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev
* commit '
6f9f8e7aad2f74bc2089a081139111012e62f7db':
Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
Adam Powell [Sat, 8 Mar 2014 01:55:41 +0000 (01:55 +0000)]
am
96192157: am
f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev
* commit '
96192157b88d3630827a9ffd55693866734b4da3':
Fix a bug where OnTouchListeners in action views could be removed
Marco Nelissen [Sat, 8 Mar 2014 01:55:36 +0000 (01:55 +0000)]
am
f41efb44: am
57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev
* commit '
f41efb446a40f0904f3788c2a773f2a700b1342a':
Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Craig Mautner [Sat, 8 Mar 2014 01:55:33 +0000 (01:55 +0000)]
am
9bf7f893: (-s ours) am
93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev
* commit '
9bf7f893e0833fca9b240c11b98d6d7dc1892081':
Show the keyguard if unsecure window on top. DO NOT MERGE.
OSDN Git Service
