OSDN Git Service
Ricardo Cervera [Thu, 6 Feb 2014 21:23:40 +0000 (21:23 +0000)]
am
8ff1f285: am
b7d456d4: am
8d65fc2c: am
8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
* commit '
8ff1f285c93a1a44a7419ab216bee2f92518387a':
docs: Updated the retaining an object during conf change. Bug:
10303533
Ricardo Cervera [Thu, 6 Feb 2014 21:20:28 +0000 (21:20 +0000)]
am
b7d456d4: am
8d65fc2c: am
8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
* commit '
b7d456d4a410d1a17933ed0256fecd2144160615':
docs: Updated the retaining an object during conf change. Bug:
10303533
Ricardo Cervera [Thu, 6 Feb 2014 21:19:50 +0000 (21:19 +0000)]
am
6ed26862: am
74d290fd: am
d057fa6d: am
531939d1: Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
* commit '
6ed268623b9e4a10a080e15d64340c16d2dd8a28':
docs: Fixed links to Proguard manual. Bug:
12713887
Ricardo Cervera [Thu, 6 Feb 2014 21:17:12 +0000 (21:17 +0000)]
am
8d65fc2c: am
8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
* commit '
8d65fc2c698ca1e91c669c3e04b45bf0d1c9dffc':
docs: Updated the retaining an object during conf change. Bug:
10303533
Ricardo Cervera [Thu, 6 Feb 2014 21:16:28 +0000 (21:16 +0000)]
am
74d290fd: am
d057fa6d: am
531939d1: Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
* commit '
74d290fd62dfec09708664f354805c548b3dc5eb':
docs: Fixed links to Proguard manual. Bug:
12713887
Ricardo Cervera [Thu, 6 Feb 2014 21:13:29 +0000 (21:13 +0000)]
am
8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
* commit '
8756b0c3cea50d47ba7191d8a493f774b23a1631':
docs: Updated the retaining an object during conf change. Bug:
10303533
Ricardo Cervera [Thu, 6 Feb 2014 21:13:21 +0000 (21:13 +0000)]
am
d057fa6d: am
531939d1: Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
* commit '
d057fa6d40198e07844f702608b7959bad3bd48b':
docs: Fixed links to Proguard manual. Bug:
12713887
Ricardo Cervera [Thu, 6 Feb 2014 21:09:36 +0000 (21:09 +0000)]
am
531939d1: Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
* commit '
531939d151167e56b3106205f4c3d859a9f509ce':
docs: Fixed links to Proguard manual. Bug:
12713887
Ricardo Cervera [Thu, 6 Feb 2014 21:09:12 +0000 (21:09 +0000)]
Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
Ricardo Cervera [Thu, 6 Feb 2014 21:07:09 +0000 (21:07 +0000)]
Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
Craig Mautner [Thu, 6 Feb 2014 20:29:49 +0000 (20:29 +0000)]
am
38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing.
* commit '
38f7dcd7dcb5d98d86f19f3c4725aea89f9792ff':
DO NOT MERGE. Test for Configuration differences before changing.
Craig Mautner [Thu, 6 Feb 2014 18:31:41 +0000 (10:31 -0800)]
DO NOT MERGE. Test for Configuration differences before changing.
Changing Configuration first and then testing for changes yields a
result indicating no change.
Fixes bug
12904769.
Change-Id: If7e39e843f15b1143d9877497d595511afabd020
Adam Lesinski [Thu, 6 Feb 2014 20:16:30 +0000 (20:16 +0000)]
am
7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev
* commit '
7f416631413e75a1756bd316a2e1906725d72f24':
Check feature bits before loading optional services
Adam Lesinski [Thu, 6 Feb 2014 20:13:20 +0000 (20:13 +0000)]
Merge "Check feature bits before loading optional services" into klp-modular-dev
Ricardo Cervera [Tue, 28 Jan 2014 01:47:39 +0000 (17:47 -0800)]
docs: Updated the retaining an object during conf change. Bug:
10303533
Replaced use of deprecated methods with retained fragments.
Change-Id: I0f0a045da88f9817077070729ef0af283bea93e4
Review: http://quixote.mtv.corp.google.com:8007/guide/topics/resources/runtime-changes.html
Ricardo Cervera [Mon, 27 Jan 2014 19:02:39 +0000 (11:02 -0800)]
docs: Fixed links to Proguard manual. Bug:
12713887
The SourceForge manual cannot be linked to sections directly because
of JavaScript and HTML frames. I used the MIT links from the bug
report instead.
Review: http://quixote.mtv.corp.google.com:8001/tools/help/proguard.html
Change-Id: I1be210d392d78a7560a89f421074ba6d99499da0
Deepanshu Gupta [Thu, 6 Feb 2014 03:06:38 +0000 (03:06 +0000)]
am
ea2ec77f: am
3adb34ee: am
9fcfbfe2: am
3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
* commit '
ea2ec77f9538de2ea795d3e257f19e8cff659665':
Add methods for Time_Delegate
Deepanshu Gupta [Thu, 6 Feb 2014 03:06:35 +0000 (03:06 +0000)]
am
a0023027: am
23de8dc2: am
28e049ef: am
0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
* commit '
a0023027e5b7245e2cef304d96826a7ae1c361aa':
Optimize layout rendering in layoutlib
Deepanshu Gupta [Thu, 6 Feb 2014 03:06:32 +0000 (03:06 +0000)]
am
bd762373: am
096e4359: am
f2f108fe: am
a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
* commit '
bd762373964eb3cb71bdd79cbf82c27faa22699d':
Add missing files to fix libphonenumber for layoutlib.
Deepanshu Gupta [Thu, 6 Feb 2014 03:06:29 +0000 (03:06 +0000)]
am
db0427a0: am
5800b19a: am
50b0ce4e: am
fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
* commit '
db0427a0ac986e0823e7bbe9b7c12a97aabe133e':
Fix the measurement of text bounds.
Deepanshu Gupta [Thu, 6 Feb 2014 03:06:26 +0000 (03:06 +0000)]
am
650d30c5: am
b156c019: am
d5129e75: am
8a892279: Fix a bug in Nine Patch library.
* commit '
650d30c5ec3c0b345651a56c45eb334fabf51b17':
Fix a bug in Nine Patch library.
Deepanshu Gupta [Thu, 6 Feb 2014 03:03:54 +0000 (03:03 +0000)]
am
3adb34ee: am
9fcfbfe2: am
3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
* commit '
3adb34ee079504b5854d23bc7a38dafc0a985219':
Add methods for Time_Delegate
Deepanshu Gupta [Thu, 6 Feb 2014 03:03:50 +0000 (03:03 +0000)]
am
23de8dc2: am
28e049ef: am
0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
* commit '
23de8dc2625d4aeb4dc9085c5865ed571f96261a':
Optimize layout rendering in layoutlib
Deepanshu Gupta [Thu, 6 Feb 2014 03:03:45 +0000 (03:03 +0000)]
am
096e4359: am
f2f108fe: am
a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
* commit '
096e43590381b218cec88adeac4261427c19e139':
Add missing files to fix libphonenumber for layoutlib.
Deepanshu Gupta [Thu, 6 Feb 2014 03:03:41 +0000 (03:03 +0000)]
am
5800b19a: am
50b0ce4e: am
fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
* commit '
5800b19a7a3422620cb28e2327a96bf824f5cc9c':
Fix the measurement of text bounds.
Deepanshu Gupta [Thu, 6 Feb 2014 03:03:36 +0000 (03:03 +0000)]
am
b156c019: am
d5129e75: am
8a892279: Fix a bug in Nine Patch library.
* commit '
b156c0197d052dd4be71ad2b858acc01f50ad49f':
Fix a bug in Nine Patch library.
Deepanshu Gupta [Thu, 6 Feb 2014 02:59:51 +0000 (02:59 +0000)]
am
9fcfbfe2: am
3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
* commit '
9fcfbfe296d7033ee031171f61b3a33044abee42':
Add methods for Time_Delegate
Deepanshu Gupta [Thu, 6 Feb 2014 02:59:48 +0000 (02:59 +0000)]
am
28e049ef: am
0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
* commit '
28e049ef73f5d9301a198ac53535442b697b7ef4':
Optimize layout rendering in layoutlib
Deepanshu Gupta [Thu, 6 Feb 2014 02:59:45 +0000 (02:59 +0000)]
am
f2f108fe: am
a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
* commit '
f2f108fe86337a429a0940f264761dbc27f817fe':
Add missing files to fix libphonenumber for layoutlib.
Deepanshu Gupta [Thu, 6 Feb 2014 02:59:41 +0000 (02:59 +0000)]
am
50b0ce4e: am
fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
* commit '
50b0ce4e8ed353ed841782aeb58963bc084f2e16':
Fix the measurement of text bounds.
Deepanshu Gupta [Thu, 6 Feb 2014 02:59:38 +0000 (02:59 +0000)]
am
d5129e75: am
8a892279: Fix a bug in Nine Patch library.
* commit '
d5129e75968030620a1372e39fcfbc17fe584e17':
Fix a bug in Nine Patch library.
Deepanshu Gupta [Thu, 6 Feb 2014 02:56:45 +0000 (02:56 +0000)]
am
3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
* commit '
3bf38b4165877274067a385cfe6472639a203a58':
Add methods for Time_Delegate
Deepanshu Gupta [Thu, 6 Feb 2014 02:56:42 +0000 (02:56 +0000)]
am
0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
* commit '
0db6e6a567e25d560586863c7be654a0c1da5795':
Optimize layout rendering in layoutlib
Deepanshu Gupta [Thu, 6 Feb 2014 02:56:39 +0000 (02:56 +0000)]
am
a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
* commit '
a955314d905f8567c852226ce4f74994826e8777':
Add missing files to fix libphonenumber for layoutlib.
Deepanshu Gupta [Thu, 6 Feb 2014 02:56:36 +0000 (02:56 +0000)]
am
fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
* commit '
fd8cba3ab83972eefc796fa122b0ec9222078b1c':
Fix the measurement of text bounds.
Deepanshu Gupta [Thu, 6 Feb 2014 02:56:32 +0000 (02:56 +0000)]
am
8a892279: Fix a bug in Nine Patch library.
* commit '
8a892279bd1b212311f4200f306a317985463918':
Fix a bug in Nine Patch library.
Deepanshu Gupta [Thu, 6 Feb 2014 02:06:02 +0000 (02:06 +0000)]
Merge "Add methods for Time_Delegate" into klp-dev
Deepanshu Gupta [Thu, 6 Feb 2014 02:05:42 +0000 (02:05 +0000)]
Merge "Optimize layout rendering in layoutlib" into klp-dev
Deepanshu Gupta [Thu, 6 Feb 2014 02:05:21 +0000 (02:05 +0000)]
Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
Deepanshu Gupta [Thu, 6 Feb 2014 02:04:49 +0000 (02:04 +0000)]
Merge "Fix the measurement of text bounds." into klp-dev
Deepanshu Gupta [Thu, 6 Feb 2014 01:11:14 +0000 (17:11 -0800)]
Fix a bug in Nine Patch library.
The nine patches were not drawn correctly if they were not positioned at
the top left corner of the canvas.
Bug: http://b.android.com/29959
Change-Id: Icfed522ea07322a3ee9f3955067d3da26c4b0b5b
Craig Mautner [Thu, 6 Feb 2014 01:00:35 +0000 (01:00 +0000)]
am
1bf2b873: Defer detach until animations are complete.
* commit '
1bf2b873470d2ba8a4ac218da73516cc2b20aa76':
Defer detach until animations are complete.
Craig Mautner [Thu, 6 Feb 2014 01:00:32 +0000 (01:00 +0000)]
am
dc548483: Move activities from DisplayContent to TaskStack
* commit '
dc548483ae90ba26ad9e2e2cb79f4673140edb49':
Move activities from DisplayContent to TaskStack
Craig Mautner [Wed, 5 Feb 2014 23:37:40 +0000 (15:37 -0800)]
Defer detach until animations are complete.
Allowing the detach of ActivityStack from DisplayContent to happen
immediately was causing all sorts of problems associated with not
having a Display to complete the animations.
Waiting for animations to complete before either the detach or the
display removal fixes those problems.
Change-Id: I8a5663bfac5c3c1084ff4fcc451e0e38e8080265
Chris Craik [Wed, 5 Feb 2014 21:43:48 +0000 (21:43 +0000)]
am
0ec3ca6e: am
449273e2: Merge "Fix for positioning of glyphs within a bitmap"
* commit '
0ec3ca6e08e5933016beda147ca9a82e96434b15':
Fix for positioning of glyphs within a bitmap
Chris Craik [Wed, 5 Feb 2014 21:40:22 +0000 (13:40 -0800)]
am
449273e2: Merge "Fix for positioning of glyphs within a bitmap"
* commit '
449273e2d575041ffe1a5d435666d36923de888b':
Fix for positioning of glyphs within a bitmap
Chris Craik [Wed, 5 Feb 2014 21:36:42 +0000 (21:36 +0000)]
Merge "Fix for positioning of glyphs within a bitmap"
Craig Mautner [Wed, 5 Feb 2014 21:35:24 +0000 (13:35 -0800)]
Move activities from DisplayContent to TaskStack
Now that activities and tasks can be detached from a display do not
keep their state within the DisplayContent class. All such state is
now moved to the TaskStack class with this change.
Change-Id: Ie6b1811e9ec3f545782bad8c3461bd4f2d336b93
Adam Lesinski [Tue, 28 Jan 2014 23:34:50 +0000 (15:34 -0800)]
Check feature bits before loading optional services
At startup, we check with PackageManager whether a system service is
available before attempting to load it. A system service is available
if its associated feature (similar to hardware features) is present.
This does not remove unavailable services from the compiled jar.
Change-Id: I13571805083aa4e65519a74acb52efd17b9fb3d7
Stephen Hines [Wed, 5 Feb 2014 02:00:43 +0000 (02:00 +0000)]
am
eadd6941: am
bc80e40b: Merge "Add message to RS docs about application vs. library packaging."
* commit '
eadd69413a5cbdd32ae56967f48b6ab6f3efbe52':
Add message to RS docs about application vs. library packaging.
Stephen Hines [Wed, 5 Feb 2014 01:57:11 +0000 (17:57 -0800)]
am
bc80e40b: Merge "Add message to RS docs about application vs. library packaging."
* commit '
bc80e40b160596c262fee0ee4df4b9f15cc14e89':
Add message to RS docs about application vs. library packaging.
Stephen Hines [Wed, 5 Feb 2014 01:52:31 +0000 (01:52 +0000)]
Merge "Add message to RS docs about application vs. library packaging."
Craig Mautner [Tue, 4 Feb 2014 23:38:28 +0000 (23:38 +0000)]
am
df88d730: Add IIntentSender to ActivityContainer.startActivity
* commit '
df88d73092c62a1a3cd2b2056ca63ae2e70cc238':
Add IIntentSender to ActivityContainer.startActivity
Craig Mautner [Mon, 27 Jan 2014 17:21:32 +0000 (09:21 -0800)]
Add IIntentSender to ActivityContainer.startActivity
PendingIntents and IntentSenders can now be launched. Still does not
work once the host activity has been paused and resumed.
Window manager TaskStacks now exist independently of Displays and app
windows persist after Displays are removed below them. Attaching the
stack to a new Display does not yet restore the windows to it.
Fixes bug
12747909.
Change-Id: I509007ee23fda400b353f483cf6ecce08177763b
Scott Main [Tue, 4 Feb 2014 19:25:04 +0000 (19:25 +0000)]
am
70f908d7: am
3e80914d: am
eea15edc: am
749120f3: dashbaord update for feb \'14
* commit '
70f908d7af916bf0e5b6af2913752dca431b837f':
dashbaord update for feb '14
Scott Main [Tue, 4 Feb 2014 19:22:02 +0000 (19:22 +0000)]
am
3e80914d: am
eea15edc: am
749120f3: dashbaord update for feb \'14
* commit '
3e80914d1683d1641fd6a01f14f126452e17f5c7':
dashbaord update for feb '14
Scott Main [Tue, 4 Feb 2014 19:19:38 +0000 (19:19 +0000)]
am
eea15edc: am
749120f3: dashbaord update for feb \'14
* commit '
eea15edcd47e6830dd6cdecb2c0b1e26eba0e6e3':
dashbaord update for feb '14
Scott Main [Tue, 4 Feb 2014 19:15:36 +0000 (19:15 +0000)]
am
749120f3: dashbaord update for feb \'14
* commit '
749120f39bdac49a96771d06d25b7f9edf70be67':
dashbaord update for feb '14
Scott Main [Tue, 4 Feb 2014 18:57:47 +0000 (10:57 -0800)]
dashbaord update for feb '14
Change-Id: I7ed66b6603f40cbbf3ffcc4824894777e3f8add2
Glenn Kasten [Tue, 4 Feb 2014 18:40:09 +0000 (18:40 +0000)]
am
830d4ffc: am
74dc4bd0: am
983a9381: am
11263b24: Merge "Add adb over Wi-Fi" into klp-docs
* commit '
830d4ffcb79fd2a676942a87d9fe661725d745f3':
Add adb over Wi-Fi
Adam Lesinski [Tue, 4 Feb 2014 18:36:10 +0000 (18:36 +0000)]
am
203356a3: Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev
* commit '
203356a34a82bfc759be02dfa1caa4529dce0732':
Add support for multiple asset dirs (-A)
Glenn Kasten [Tue, 4 Feb 2014 18:35:30 +0000 (18:35 +0000)]
am
74dc4bd0: am
983a9381: am
11263b24: Merge "Add adb over Wi-Fi" into klp-docs
* commit '
74dc4bd09e0dce4855c15cae31dcdd42b05d3532':
Add adb over Wi-Fi
Glenn Kasten [Tue, 4 Feb 2014 18:32:10 +0000 (18:32 +0000)]
am
983a9381: am
11263b24: Merge "Add adb over Wi-Fi" into klp-docs
* commit '
983a9381b87519ddd1c6e12e44a8762dc805894a':
Add adb over Wi-Fi
Adam Lesinski [Tue, 4 Feb 2014 18:31:23 +0000 (18:31 +0000)]
Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev
Glenn Kasten [Tue, 4 Feb 2014 18:29:17 +0000 (18:29 +0000)]
am
11263b24: Merge "Add adb over Wi-Fi" into klp-docs
* commit '
11263b24230a0d5db363d76ad199d692bcff1b35':
Add adb over Wi-Fi
Glenn Kasten [Tue, 4 Feb 2014 18:27:11 +0000 (18:27 +0000)]
Merge "Add adb over Wi-Fi" into klp-docs
Ricardo Cervera [Tue, 4 Feb 2014 17:29:40 +0000 (17:29 +0000)]
am
6dea46b2: am
f7c12817: am
b180bff5: am
ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug:
12870006" into klp-docs
* commit '
6dea46b2e567f614244100f542dce04e44c26bee':
docs: Added note on multiple build.gradle files. Bug:
12870006
Ricardo Cervera [Tue, 4 Feb 2014 17:26:58 +0000 (17:26 +0000)]
am
f7c12817: am
b180bff5: am
ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug:
12870006" into klp-docs
* commit '
f7c12817dc700a5e3d9e4dd3de6b1b50688a4129':
docs: Added note on multiple build.gradle files. Bug:
12870006
Ricardo Cervera [Tue, 4 Feb 2014 17:24:28 +0000 (17:24 +0000)]
am
b180bff5: am
ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug:
12870006" into klp-docs
* commit '
b180bff575b25ab6b692327a3be244310fd90c5e':
docs: Added note on multiple build.gradle files. Bug:
12870006
Ricardo Cervera [Tue, 4 Feb 2014 17:21:18 +0000 (17:21 +0000)]
am
ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug:
12870006" into klp-docs
* commit '
ccec0906bd358ffa9fbac8f8c882f582c43b6092':
docs: Added note on multiple build.gradle files. Bug:
12870006
Ricardo Cervera [Tue, 4 Feb 2014 17:18:59 +0000 (17:18 +0000)]
Merge "docs: Added note on multiple build.gradle files. Bug:
12870006" into klp-docs
Scott Main [Tue, 4 Feb 2014 02:11:48 +0000 (02:11 +0000)]
am
5ae21db1: am
a7f84f3b: am
28a828fa: am
56783a74: remove samples page under tools. redirect in separate cl. bug:
12878293
* commit '
5ae21db11291cca5ea6fe9f8b2b772deca438e5b':
remove samples page under tools. redirect in separate cl. bug:
12878293
Scott Main [Tue, 4 Feb 2014 02:08:28 +0000 (02:08 +0000)]
am
a7f84f3b: am
28a828fa: am
56783a74: remove samples page under tools. redirect in separate cl. bug:
12878293
* commit '
a7f84f3bd4582ce2124891db14fbc2ac52548cf8':
remove samples page under tools. redirect in separate cl. bug:
12878293
Scott Main [Tue, 4 Feb 2014 02:06:01 +0000 (02:06 +0000)]
am
28a828fa: am
56783a74: remove samples page under tools. redirect in separate cl. bug:
12878293
* commit '
28a828fa198122a13d053eae2e46f18487818e91':
remove samples page under tools. redirect in separate cl. bug:
12878293
Scott Main [Tue, 4 Feb 2014 02:01:33 +0000 (02:01 +0000)]
am
56783a74: remove samples page under tools. redirect in separate cl. bug:
12878293
* commit '
56783a742458968a6ec5daf4d9e7a72f755f5ce5':
remove samples page under tools. redirect in separate cl. bug:
12878293
Ricardo Cervera [Tue, 4 Feb 2014 01:08:31 +0000 (17:08 -0800)]
docs: Added note on multiple build.gradle files. Bug:
12870006
Change-Id: I44b5152dc753893d3b9f0a0441066a530e5a30f0
Review: http://quixote.mtv.corp.google.com:8006/google/play-services/setup.html
Scott Main [Tue, 4 Feb 2014 01:07:27 +0000 (17:07 -0800)]
remove samples page under tools. redirect in separate cl.
bug:
12878293
Change-Id: I51b0946d5d408ba92b3ae6fdfad8f14209cdbd5d
Glenn Kasten [Mon, 3 Feb 2014 22:01:25 +0000 (14:01 -0800)]
Add adb over Wi-Fi
Change-Id: I6ada6c88e3a006abc4685b66d6decd1bec175941
Tim Murray [Mon, 3 Feb 2014 22:45:26 +0000 (22:45 +0000)]
am
6ceac9f0: (-s ours) am
f5294ed5: (-s ours) Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP."
* commit '
6ceac9f099b0ef7ca29351bbefa128df8101b5c2':
DO NOT MERGE: Mark new util type functions as @hide in AOSP.
Tim Murray [Mon, 3 Feb 2014 22:45:23 +0000 (22:45 +0000)]
am
b1bec0d9: am
3fb6feac: Merge "Check that bound allocations are 1D"
* commit '
b1bec0d916c00c7ceb09c691f1e5977909ba698d':
Check that bound allocations are 1D
Tim Murray [Mon, 3 Feb 2014 22:45:20 +0000 (22:45 +0000)]
am
67d9e0be: am
0cc37f4c: Merge "Fix debug context."
* commit '
67d9e0be8e4ff709c03865c3b4ac9f40d5dcfdbb':
Fix debug context.
Tim Murray [Mon, 3 Feb 2014 22:45:11 +0000 (22:45 +0000)]
am
42e4aee5: am
0539b7b4: Merge "Enable asynchronous destruction of BaseObjs."
* commit '
42e4aee598d2eceab6fc20fc9801b5c2fbf2e50d':
Enable asynchronous destruction of BaseObjs.
Tim Murray [Mon, 3 Feb 2014 22:45:08 +0000 (22:45 +0000)]
am
42955bab: am
d8b4dd95: Merge "Fix most logging macros for context pointers."
* commit '
42955bab2a275f3ea22d5a50b556cec88697a573':
Fix most logging macros for context pointers.
Tim Murray [Mon, 3 Feb 2014 22:45:05 +0000 (22:45 +0000)]
am
d39e19eb: am
351879df: Merge "Fix getBytesSize for YUV allocations."
* commit '
d39e19eb8af54683d03ae955a5a58fea48a58754':
Fix getBytesSize for YUV allocations.
Tim Murray [Mon, 3 Feb 2014 22:45:02 +0000 (22:45 +0000)]
am
16e9362e: am
8fced317: Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs."
* commit '
16e9362e5f5b4f09a46198218380bb386fee28e5':
Move RenderScript from graphics/ to new fw/base subdirectory rs.
Tim Murray [Mon, 3 Feb 2014 22:44:58 +0000 (22:44 +0000)]
am
8df3ea66: am
b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."
* commit '
8df3ea66994e96d72040c44099dd2d74ba15ec67':
Convert Java/JNI to 64-bit, part 2.
Tim Murray [Mon, 3 Feb 2014 22:44:54 +0000 (22:44 +0000)]
am
72d637e2: am
e22e268e: Merge changes If93a5d78,I1957f7ac
* commit '
72d637e297a143e5b18c8e8f4eb85695ed6b10f1':
Convert Java/JNI to 64-bit, part 1.
Add long/double read support.
Tim Murray [Mon, 3 Feb 2014 22:44:51 +0000 (22:44 +0000)]
am
bccee732: am
61eb6b55: Merge "Use Object + type in place of specific array"
* commit '
bccee732b53d06c0e983b3f325e0d9ad889de134':
Use Object + type in place of specific array
Tim Murray [Mon, 3 Feb 2014 22:44:47 +0000 (22:44 +0000)]
am
69914882: am
e559d7ee: Merge "Utility API for creating types."
* commit '
69914882509b8ad81c23eadd1ebae53fb532042b':
Utility API for creating types.
Tim Murray [Mon, 3 Feb 2014 22:44:44 +0000 (22:44 +0000)]
am
271c3b74: am
b1c1518e: Merge "Remove old hidden API."
* commit '
271c3b7499f53f6e7e168d68910efda5cc19f5fd':
Remove old hidden API.
Tim Murray [Mon, 3 Feb 2014 22:44:39 +0000 (22:44 +0000)]
am
9bad32c3: am
aea3b581: Merge "Remove hidden API setSurfaceTexture."
* commit '
9bad32c3830e45615a6b71e3f80ca7b95ef638b5':
Remove hidden API setSurfaceTexture.
Tim Murray [Mon, 3 Feb 2014 22:41:42 +0000 (14:41 -0800)]
am
f5294ed5: (-s ours) Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP."
* commit '
f5294ed57cf388973a1db29b062b1577966f90d1':
DO NOT MERGE: Mark new util type functions as @hide in AOSP.
Tim Murray [Mon, 3 Feb 2014 22:41:39 +0000 (14:41 -0800)]
am
3fb6feac: Merge "Check that bound allocations are 1D"
* commit '
3fb6feacc62e1021c705b53d46e915ecf50582d2':
Check that bound allocations are 1D
Tim Murray [Mon, 3 Feb 2014 22:41:30 +0000 (14:41 -0800)]
am
0cc37f4c: Merge "Fix debug context."
* commit '
0cc37f4cdeaed95e4f61f1a6e7b78f07e7025e97':
Fix debug context.
Tim Murray [Mon, 3 Feb 2014 22:41:27 +0000 (14:41 -0800)]
am
0539b7b4: Merge "Enable asynchronous destruction of BaseObjs."
* commit '
0539b7b4116622d33c91dbaa9a3040c7a3a703d6':
Enable asynchronous destruction of BaseObjs.
Tim Murray [Mon, 3 Feb 2014 22:41:24 +0000 (14:41 -0800)]
am
d8b4dd95: Merge "Fix most logging macros for context pointers."
* commit '
d8b4dd9555e987df92206562061080b327598f41':
Fix most logging macros for context pointers.
Tim Murray [Mon, 3 Feb 2014 22:41:21 +0000 (14:41 -0800)]
am
351879df: Merge "Fix getBytesSize for YUV allocations."
* commit '
351879df3aff02987a6f4c4485bf004a96fcb150':
Fix getBytesSize for YUV allocations.
Tim Murray [Mon, 3 Feb 2014 22:41:17 +0000 (14:41 -0800)]
am
8fced317: Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs."
* commit '
8fced3174ad45e5d618f28c82d69bd21261f6108':
Move RenderScript from graphics/ to new fw/base subdirectory rs.
Tim Murray [Mon, 3 Feb 2014 22:41:14 +0000 (14:41 -0800)]
am
b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."
* commit '
b4cf2a2aee78b0ed3e75b5a07baaf5479fe708d9':
Convert Java/JNI to 64-bit, part 2.
Tim Murray [Mon, 3 Feb 2014 22:41:11 +0000 (14:41 -0800)]
am
e22e268e: Merge changes If93a5d78,I1957f7ac
* commit '
e22e268e6d158f37173b1bce37a5614daabcf18c':
Convert Java/JNI to 64-bit, part 1.
Add long/double read support.
OSDN Git Service
