OSDN Git Service
Roman Nurik [Wed, 3 Nov 2010 14:56:40 +0000 (07:56 -0700)]
am
bccecc2b: Merge "Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)" into gingerbread
* commit '
bccecc2b871749695148a7dcf27ff5b8655a77a0':
Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)
Roman Nurik [Wed, 3 Nov 2010 14:55:06 +0000 (07:55 -0700)]
Merge "Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)" into gingerbread
David Turner [Tue, 2 Nov 2010 08:51:44 +0000 (01:51 -0700)]
am
fc187b1e: Merge "update native_window.h ndk header" into gingerbread
* commit '
fc187b1e3a73275dba91e98d912aa23d7b097fc9':
update native_window.h ndk header
David Turner [Tue, 2 Nov 2010 08:49:47 +0000 (01:49 -0700)]
Merge "update native_window.h ndk header" into gingerbread
David 'Digit' Turner [Tue, 2 Nov 2010 08:43:46 +0000 (01:43 -0700)]
am
10795d84: Declare localeconv() in <locale.h>
* commit '
10795d840b0991fd6150475803610b125d4ea262':
Declare localeconv() in <locale.h>
Mathias Agopian [Mon, 1 Nov 2010 21:30:30 +0000 (14:30 -0700)]
update native_window.h ndk header
Change-Id: I70178a1ddd94279a102c2d25d2ce0459cec9d13a
David 'Digit' Turner [Fri, 29 Oct 2010 00:39:11 +0000 (17:39 -0700)]
Declare localeconv() in <locale.h>
The function is not implemented by our C library, but it is not
possible to build GNU libstdc++-v3 if the declaration is not part
of this header.
Change-Id: Iff6fa63465dde0d4e38c0f91709475bb35b31af9
Raphael Moll [Tue, 26 Oct 2010 22:42:14 +0000 (15:42 -0700)]
am
42197997: Merge "SDK Windows: Package customized proguard.bat scripts."
Raphael Moll [Tue, 26 Oct 2010 22:32:23 +0000 (15:32 -0700)]
Merge "SDK Windows: Package customized proguard.bat scripts."
Roman Nurik [Fri, 22 Oct 2010 22:39:25 +0000 (15:39 -0700)]
Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)
Change-Id: I4fa3b0aff4edfe80533066a81b0eacc97caa6f86
Mathias Agopian [Tue, 26 Oct 2010 19:22:09 +0000 (12:22 -0700)]
am
5a2fb6ce: Merge "Greatly simplify sample code by using EGL_NATIVE_VISUAL_ID." into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:18:49 +0000 (12:18 -0700)]
Merge "Greatly simplify sample code by using EGL_NATIVE_VISUAL_ID." into gingerbread
Jack Palevich [Tue, 26 Oct 2010 17:27:09 +0000 (10:27 -0700)]
am
902b355d: Merge "Remove unused Grid object from LabelMaker.java class." into gingerbread
Jack Palevich [Tue, 26 Oct 2010 17:25:12 +0000 (10:25 -0700)]
Merge "Remove unused Grid object from LabelMaker.java class." into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 14:24:45 +0000 (07:24 -0700)]
am
f0c01122: simplify a bit the native-activity sample code
Mathias Agopian [Mon, 25 Oct 2010 23:23:09 +0000 (16:23 -0700)]
Greatly simplify sample code by using EGL_NATIVE_VISUAL_ID.
This is the preferred way of selecting config starting in
gingerbread, this procedure guarantees forward compatibility.
Change-Id: Iff55b545e722205bd029b92da33368129253b8a3
Mathias Agopian [Mon, 25 Oct 2010 01:29:48 +0000 (18:29 -0700)]
simplify a bit the native-activity sample code
there is no reason to set a depth buffer. this is somewhat confusing.
also, it's better to always specify EGL_SURFACE_TYPE.
Change-Id: Ieff499b0b69a3812773cf3fe08b8bf1ca57a82d9
Dianne Hackborn [Tue, 26 Oct 2010 00:07:35 +0000 (17:07 -0700)]
am
a77c1bdd: Work on issue #
3126018: No way to specify NativeActivity\'s native method
Merge commit '
a77c1bdd4abf3c7e82af1f3b4330143d14c84103' into gingerbread-plus-aosp
* commit '
a77c1bdd4abf3c7e82af1f3b4330143d14c84103':
Work on issue #
3126018: No way to specify NativeActivity's native method
Dianne Hackborn [Mon, 25 Oct 2010 00:18:02 +0000 (17:18 -0700)]
Work on issue #
3126018: No way to specify NativeActivity's native method
Update the header file to match the platform change.
Also add an Android.mk so I can actually build this sample when I want to.
Change-Id: I30c3c43fba7c233c59005d916888a46dc7049651
Raphael Moll [Mon, 25 Oct 2010 23:57:55 +0000 (16:57 -0700)]
am
799754e1: Merge "Tools package was missing proguard.bat"
Merge commit '
799754e18b7ce057a9aab8ea243f7dfd1d4edb44' into gingerbread-plus-aosp
* commit '
799754e18b7ce057a9aab8ea243f7dfd1d4edb44':
Tools package was missing proguard.bat
Raphael Moll [Mon, 25 Oct 2010 21:43:05 +0000 (14:43 -0700)]
Merge "Tools package was missing proguard.bat"
Raphael Moll [Mon, 25 Oct 2010 21:41:16 +0000 (14:41 -0700)]
SDK Windows: Package customized proguard.bat scripts.
Requires Change: Ic1dc74cb3ff4dec9b419e2753290c361dffce48e
in platform/sdk.
Change-Id: Ieb2e308c0e9e655b2c047554563d753ac4cbb852
Jack Palevich [Mon, 25 Oct 2010 21:03:27 +0000 (14:03 -0700)]
Remove unused Grid object from LabelMaker.java class.
Also remove unnescessary "executable" bits from a documentation file.
Change-Id: I49bf8a6f0dabece62d16956b7e02c9a846bdd69b
Roman Nurik [Mon, 25 Oct 2010 20:55:34 +0000 (13:55 -0700)]
am
83c50ca7: Merge "Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn\'t support a preview size with the same aspect ratio as the device display." into gingerbread
Merge commit '
83c50ca740fabe25189601db90dc1f65ed4d2061' into gingerbread-plus-aosp
* commit '
83c50ca740fabe25189601db90dc1f65ed4d2061':
Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn't support a preview size with the same aspect ratio as the device display.
Roman Nurik [Mon, 25 Oct 2010 20:50:34 +0000 (13:50 -0700)]
Merge "Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn't support a preview size with the same aspect ratio as the device display." into gingerbread
Scott Main [Mon, 25 Oct 2010 18:17:09 +0000 (11:17 -0700)]
am
0c53c5b6: Merge "Do not merge. This is a cherry-pick from froyo change I392406824607e2bdae646e3156433d82a9ed6521 Revise NotePad application to use better practices such as - inflating menus from XML and supporting API Level 3 without the need for ve
Merge commit '
0c53c5b6f6b449ad7bca14ebb4d650913650b219' into gingerbread-plus-aosp
* commit '
0c53c5b6f6b449ad7bca14ebb4d650913650b219':
Do not merge.
Scott Main [Mon, 25 Oct 2010 18:14:20 +0000 (11:14 -0700)]
Merge "Do not merge. This is a cherry-pick from froyo change I392406824607e2bdae646e3156433d82a9ed6521 Revise NotePad application to use better practices such as - inflating menus from XML and supporting API Level 3 without the need for version qualifiers on resource directories. - to NOT include items in the options menu based on the 'selected' item (that's what a context menu is for). - include all drawables in the app, instead of using system resources." into gingerbread
Raphael Moll [Sun, 24 Oct 2010 05:11:37 +0000 (22:11 -0700)]
Tools package was missing proguard.bat
SDK Bug:
3126278
Change-Id: I8bb9c2e2250b0da4303b09cdfe05717cee887c44
Dianne Hackborn [Fri, 22 Oct 2010 19:11:19 +0000 (12:11 -0700)]
am
c2d70d2a: Update native headers/library to match current platform.
Roman Nurik [Fri, 22 Oct 2010 08:20:48 +0000 (01:20 -0700)]
Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn't support a preview size with the same aspect ratio as the device display.
Change-Id: Ic7ccc324dfe4d46f3aeb5c7edafc7cc97a6fdc49
Dianne Hackborn [Fri, 22 Oct 2010 04:09:47 +0000 (21:09 -0700)]
Update native headers/library to match current platform.
Change-Id: I40ef2fa924881b9653fcddcd09c14455ac1ef37e
Scott Main [Wed, 20 Oct 2010 00:19:03 +0000 (17:19 -0700)]
Do not merge.
This is a cherry-pick from froyo change I392406824607e2bdae646e3156433d82a9ed6521
Revise NotePad application to use better practices such as
- inflating menus from XML and supporting API Level 3 without the need
for version qualifiers on resource directories.
- to NOT include items in the options menu based on the 'selected' item
(that's what a context menu is for).
- include all drawables in the app, instead of using system resources.
Add features:
- the ability to edit the note title through the context menu
- disable menu items in the editor based on menu groups
- add a "save" button to the editor instead of assuming BACK functionality
- and show the title of the current note in the activity title.
- and probably others
Change-Id: I5e6fa5315308edf1a9447ecadd5b289127776bd0
Yu Shan Emily Lau [Wed, 20 Oct 2010 21:06:56 +0000 (14:06 -0700)]
am
9bfa6f90: Merge "1) add the bugreport option which allow the scripted monkey to capature the bugrepor and save it to the sdcard wherenever there is a ANR, java crash and native crash. 2) Add a new option in the scripted monkey which can enter a string through the s
Merge commit '
9bfa6f90b8c56ed7404c0c07a70e27a9fbad3c23' into gingerbread-plus-aosp
* commit '
9bfa6f90b8c56ed7404c0c07a70e27a9fbad3c23':
1) add the bugreport option which allow the scripted monkey to capature the bugrepor and save it to the sdcard wherenever there is a ANR, java crash and native crash.
Yu Shan Emily Lau [Wed, 20 Oct 2010 21:04:52 +0000 (14:04 -0700)]
Merge "1) add the bugreport option which allow the scripted monkey to capature the bugrepor and save it to the sdcard wherenever there is a ANR, java crash and native crash. 2) Add a new option in the scripted monkey which can enter a string through the shell command input text <string>" into gingerbread
Scott Main [Wed, 20 Oct 2010 20:54:47 +0000 (13:54 -0700)]
am
0702c101: am
05523fb0: (-s ours) Do not merge. Revise NotePad application to use better practices such as - inflating menus from XML and supporting API Level 3 without the need for version qualifiers on resource directories. - to NOT include
Merge commit '
0702c101253807064c177cdbfca80391b1a26aea' into gingerbread-plus-aosp
* commit '
0702c101253807064c177cdbfca80391b1a26aea':
Do not merge.
Scott Main [Wed, 20 Oct 2010 17:18:00 +0000 (10:18 -0700)]
am
05523fb0: (-s ours) Do not merge. Revise NotePad application to use better practices such as - inflating menus from XML and supporting API Level 3 without the need for version qualifiers on resource directories. - to NOT include items in the options m
Merge commit '
05523fb0b48280a5364908b00768ec71edb847a2' into gingerbread
* commit '
05523fb0b48280a5364908b00768ec71edb847a2':
Do not merge.
Yu Shan Emily Lau [Tue, 19 Oct 2010 22:41:59 +0000 (15:41 -0700)]
1) add the bugreport option which allow the scripted monkey to capature the bugrepor and save it to the sdcard wherenever there is a ANR, java crash and native crash.
2) Add a new option in the scripted monkey which can enter a string through the shell command input text <string>
Change-Id: Iab7478fdc594c07e5166091d29dc644e430e43cb
Dianne Hackborn [Wed, 20 Oct 2010 01:42:23 +0000 (18:42 -0700)]
am
834eb602: Fix bug in native activity demo.
Merge commit '
834eb602ebd904ec1cd6b5301106c97e67693b4c' into gingerbread-plus-aosp
* commit '
834eb602ebd904ec1cd6b5301106c97e67693b4c':
Fix bug in native activity demo.
Dianne Hackborn [Wed, 20 Oct 2010 01:36:53 +0000 (18:36 -0700)]
Fix bug in native activity demo.
Can't get surface size until after it is made current.
Change-Id: I34847775bde680d05767b6b4cfa8e547eb56aa6d
Scott Main [Wed, 20 Oct 2010 00:19:03 +0000 (17:19 -0700)]
Do not merge.
Revise NotePad application to use better practices such as
- inflating menus from XML and supporting API Level 3 without the need
for version qualifiers on resource directories.
- to NOT include items in the options menu based on the 'selected' item
(that's what a context menu is for).
- include all drawables in the app, instead of using system resources.
Add features:
- the ability to edit the note title through the context menu
- disable menu items in the editor based on menu groups
- add a "save" button to the editor instead of assuming BACK functionality
- and show the title of the current note in the activity title.
- and probably others
Change-Id: Ib7ea41079f3b268f3be1f86febdb1caed98bdd8e
Xavier Ducrohet [Tue, 19 Oct 2010 17:37:02 +0000 (10:37 -0700)]
am
92df1283: Move samples to API 9
Merge commit '
92df1283f7a8e186f04a93a1ec34d8f8fa3202ce' into gingerbread-plus-aosp
* commit '
92df1283f7a8e186f04a93a1ec34d8f8fa3202ce':
Move samples to API 9
Xavier Ducrohet [Tue, 19 Oct 2010 17:32:14 +0000 (10:32 -0700)]
Move samples to API 9
Change-Id: I918a63197ff62d6b935de5a6eb843516a314a241
Jeff Hamilton [Mon, 18 Oct 2010 18:26:33 +0000 (11:26 -0700)]
am
15b480d0: Remove the Tag app.
Merge commit '
15b480d05245b3e2e23e17afce69081eba36574c' into gingerbread-plus-aosp
* commit '
15b480d05245b3e2e23e17afce69081eba36574c':
Remove the Tag app.
Jeff Hamilton [Mon, 18 Oct 2010 18:14:21 +0000 (13:14 -0500)]
Remove the Tag app.
It's moving to package/apps/Tag.
Change-Id: I1f800fd718b3a06feeeba8fa1564acd3ca173510
Jeff Hamilton [Mon, 18 Oct 2010 17:26:35 +0000 (10:26 -0700)]
am
f8580cf6: A bunch of work on the UI.
Merge commit '
f8580cf67655e5b4dcf14b2520a8897e97053608' into gingerbread-plus-aosp
* commit '
f8580cf67655e5b4dcf14b2520a8897e97053608':
A bunch of work on the UI.
Nick Pelly [Mon, 18 Oct 2010 17:26:30 +0000 (10:26 -0700)]
am
b19cc7ba: Merge "Update permission name for Tag app." into gingerbread
Merge commit '
b19cc7baa931fe7af87ab1c6a372bec723a44d75' into gingerbread-plus-aosp
* commit '
b19cc7baa931fe7af87ab1c6a372bec723a44d75':
Update permission name for Tag app.
Jeff Hamilton [Fri, 15 Oct 2010 14:42:07 +0000 (09:42 -0500)]
A bunch of work on the UI.
- Change the tab order and remember the
current tab
- Proper icon for the starred tab, renamed
from saved
- Set the proper sort order for the tag lists
- Very rough first pass at full screen tag viewer
- Hookup the delete button in the tag viewer
- Store the snippets for tags in the database
- Added view creation logic to the parsed
messages and records so they can render
themselves
- Make the URI records look much better
- For URI records if there are multiple activities
that can handle the URI build one item per
activity and bypass the activity chooser
- Pretty print sms[to] and tel URIs
- Hookup URI entries in the viewer to launch the
activities
- Implement the spec for saving tags and timing
out the viewer for scanned tags
- Made a few more strings localizable
Change-Id: I6bdb8adf52445499c62a1b046f99d5b119aff068
Nick Pelly [Mon, 18 Oct 2010 17:07:45 +0000 (10:07 -0700)]
Merge "Update permission name for Tag app." into gingerbread
David Turner [Mon, 18 Oct 2010 08:49:36 +0000 (01:49 -0700)]
am
f1b34883: Merge "Dummy java file in native-only apps is not needed anymore." into gingerbread
Merge commit '
f1b348834c5125912f81a839ec8429c95990b3cd' into gingerbread-plus-aosp
* commit '
f1b348834c5125912f81a839ec8429c95990b3cd':
Dummy java file in native-only apps is not needed anymore.
David Turner [Mon, 18 Oct 2010 08:39:32 +0000 (01:39 -0700)]
Merge "Dummy java file in native-only apps is not needed anymore." into gingerbread
Nick Pelly [Mon, 18 Oct 2010 03:06:52 +0000 (20:06 -0700)]
Update permission name for Tag app.
Change-Id: I161aada35095ebe2395eec2e0900ab5c1272bb2b
Signed-off-by: Nick Pelly <npelly@google.com>
Dianne Hackborn [Sat, 16 Oct 2010 23:55:15 +0000 (16:55 -0700)]
am
8143be8d: Update device admin example to wipe SD card.
Merge commit '
8143be8d0348e4918ccc75e0a44e617c295da2fc' into gingerbread-plus-aosp
* commit '
8143be8d0348e4918ccc75e0a44e617c295da2fc':
Update device admin example to wipe SD card.
Dianne Hackborn [Sat, 16 Oct 2010 01:52:33 +0000 (18:52 -0700)]
Update device admin example to wipe SD card.
Change-Id: I224006f284916761578e3d04b208828f80ea3cb6
Xavier Ducrohet [Sat, 16 Oct 2010 01:22:48 +0000 (18:22 -0700)]
am
24277fdb: Merge "Set SDK samples to API 8 + gingerbread." into gingerbread
Merge commit '
24277fdb61ce6133e31c7ef3e99bd4fc1314f0ac' into gingerbread-plus-aosp
* commit '
24277fdb61ce6133e31c7ef3e99bd4fc1314f0ac':
Set SDK samples to API 8 + gingerbread.
Bill Napier [Fri, 15 Oct 2010 22:58:17 +0000 (15:58 -0700)]
am
66d61ef9: Merge "Add in MonkeyRunner to the Windows SDK."
Merge commit '
66d61ef95f5a0f8abc8b5371409e3c5372c9e10a' into gingerbread-plus-aosp
* commit '
66d61ef95f5a0f8abc8b5371409e3c5372c9e10a':
Add in MonkeyRunner to the Windows SDK.
Bill Napier [Fri, 15 Oct 2010 22:35:11 +0000 (15:35 -0700)]
Merge "Add in MonkeyRunner to the Windows SDK."
Xavier Ducrohet [Fri, 15 Oct 2010 18:35:37 +0000 (11:35 -0700)]
Merge "Set SDK samples to API 8 + gingerbread." into gingerbread
Raphael [Fri, 15 Oct 2010 03:20:06 +0000 (20:20 -0700)]
Set SDK samples to API 8 + gingerbread.
DO NOT MERGE
Change-Id: I1040974ab20426ad1fbdb958a21f10681fb68e69
Nick Kralevich [Fri, 15 Oct 2010 16:21:55 +0000 (09:21 -0700)]
am
8149e894: Create a ParsedNdefMessage class with supporting implementations.
Merge commit '
8149e89466644930069887527143d20cc7c91cfc' into gingerbread-plus-aosp
* commit '
8149e89466644930069887527143d20cc7c91cfc':
Create a ParsedNdefMessage class with supporting implementations.
Nick Kralevich [Fri, 15 Oct 2010 00:04:14 +0000 (17:04 -0700)]
Create a ParsedNdefMessage class with supporting implementations.
Change-Id: I13a199ad01a726a30e8851a675386c34f2dfa605
Nick Kralevich [Thu, 14 Oct 2010 23:00:55 +0000 (16:00 -0700)]
am
ab67f493: Merge "Have getObjects() return ParsedNdefRecords" into gingerbread
Merge commit '
ab67f493dc44c1dfd6c795abcf61dfec2f233014' into gingerbread-plus-aosp
* commit '
ab67f493dc44c1dfd6c795abcf61dfec2f233014':
Have getObjects() return ParsedNdefRecords
Nick Kralevich [Thu, 14 Oct 2010 22:56:24 +0000 (15:56 -0700)]
Merge "Have getObjects() return ParsedNdefRecords" into gingerbread
Nick Kralevich [Thu, 14 Oct 2010 21:34:08 +0000 (14:34 -0700)]
Have getObjects() return ParsedNdefRecords
Change-Id: I7e5f8fdf2ae113f55cc5843f517a8a8b20ab00ee
Brett Chabot [Thu, 14 Oct 2010 21:57:18 +0000 (14:57 -0700)]
am
4f3dcc85: Revert "Add utility for toggling settings from the cmd line."
Merge commit '
4f3dcc857e002d1b5611d0b00bb787eec6318967' into gingerbread-plus-aosp
* commit '
4f3dcc857e002d1b5611d0b00bb787eec6318967':
Revert "Add utility for toggling settings from the cmd line."
Brett Chabot [Thu, 14 Oct 2010 21:15:33 +0000 (14:15 -0700)]
Revert "Add utility for toggling settings from the cmd line."
This reverts commit
a2e81242e01af6619310003a6a035ce82b6f7e09.
Nick Kralevich [Thu, 14 Oct 2010 20:44:50 +0000 (13:44 -0700)]
am
85122d26: add some new mock ndef messages for testing.
Merge commit '
85122d2605a22c8e7bcde868c2b7a7d8d744e613' into gingerbread-plus-aosp
* commit '
85122d2605a22c8e7bcde868c2b7a7d8d744e613':
add some new mock ndef messages for testing.
Jeff Hamilton [Thu, 14 Oct 2010 20:41:35 +0000 (13:41 -0700)]
am
4f6f93d5: Merge "Checkpoint work on the Tag app." into gingerbread
Merge commit '
4f6f93d594791461d0a1df299800a3b238cdc1fc' into gingerbread-plus-aosp
* commit '
4f6f93d594791461d0a1df299800a3b238cdc1fc':
Checkpoint work on the Tag app.
Nick Kralevich [Thu, 14 Oct 2010 20:26:48 +0000 (13:26 -0700)]
add some new mock ndef messages for testing.
Change-Id: Ib238bc427c7350cec4b6765a171d6f3fa0907151
Jeff Hamilton [Thu, 14 Oct 2010 19:57:06 +0000 (12:57 -0700)]
Merge "Checkpoint work on the Tag app." into gingerbread
Jeff Hamilton [Thu, 14 Oct 2010 15:13:25 +0000 (10:13 -0500)]
Checkpoint work on the Tag app.
Change-Id: I375aeabe00528d30ce49e8d3d9f78aaac10b0071
Brett Chabot [Thu, 14 Oct 2010 19:03:27 +0000 (12:03 -0700)]
am
5b599c31: Merge "Add utility for toggling settings from the cmd line." into gingerbread
Merge commit '
5b599c31481633e4f4277a125eeae6ea47600b02' into gingerbread-plus-aosp
* commit '
5b599c31481633e4f4277a125eeae6ea47600b02':
Add utility for toggling settings from the cmd line.
Xavier Ducrohet [Thu, 14 Oct 2010 19:03:25 +0000 (12:03 -0700)]
am
99b80ab4: Merge "GB SDK: don\'t use HV2.bat when generating tools." into gingerbread
Merge commit '
99b80ab47970eee84d014d3719b2b9674dc6904b' into gingerbread-plus-aosp
* commit '
99b80ab47970eee84d014d3719b2b9674dc6904b':
GB SDK: don't use HV2.bat when generating tools.
Gilles Debunne [Thu, 14 Oct 2010 19:01:31 +0000 (12:01 -0700)]
am
03751547: Assets moved to hdpi directory, mdpi version created
Merge commit '
037515476560b1277960d0bb781e4be5610558c0' into gingerbread-plus-aosp
* commit '
037515476560b1277960d0bb781e4be5610558c0':
Assets moved to hdpi directory, mdpi version created
Brett Chabot [Thu, 14 Oct 2010 18:46:18 +0000 (11:46 -0700)]
Merge "Add utility for toggling settings from the cmd line." into gingerbread
Xavier Ducrohet [Thu, 14 Oct 2010 18:42:03 +0000 (11:42 -0700)]
Merge "GB SDK: don't use HV2.bat when generating tools." into gingerbread
Raphael [Thu, 14 Oct 2010 18:25:01 +0000 (11:25 -0700)]
GB SDK: don't use HV2.bat when generating tools.
That's because GB uses the Tools_r& which do not have
hierarchyviewer2 so we should not try to pull the .bat from
hv2. We don't care since we'll ignore these old tools anyway
when packaging the final SDK.
Change-Id: Ie7d161bad59d6e919613db2e854f48964e59c4a9
Gilles Debunne [Thu, 14 Oct 2010 17:11:57 +0000 (10:11 -0700)]
Assets moved to hdpi directory, mdpi version created
Change-Id: I960fa28d2596c26e62cb6914c59c5db2def4a03e
Xavier Ducrohet [Thu, 14 Oct 2010 00:44:35 +0000 (17:44 -0700)]
am
e8690246: Merge "Move GB SDK components to 2.3" into gingerbread
Merge commit '
e869024635a4e78c9fc3b3a696623e7cf9d999e0' into gingerbread-plus-aosp
* commit '
e869024635a4e78c9fc3b3a696623e7cf9d999e0':
Move GB SDK components to 2.3
Xavier Ducrohet [Thu, 14 Oct 2010 00:30:07 +0000 (17:30 -0700)]
Merge "Move GB SDK components to 2.3" into gingerbread
Xavier Ducrohet [Wed, 13 Oct 2010 22:36:48 +0000 (15:36 -0700)]
Move GB SDK components to 2.3
Change-Id: I1bcd6063d6702f397909d5212b9d0ccb1869f33b
Xavier Ducrohet [Wed, 13 Oct 2010 22:34:37 +0000 (15:34 -0700)]
Dummy java file in native-only apps is not needed anymore.
The tools r8 ant script can handle not having any Java file
at all.
Change-Id: Id14a4a434deb188a5aa1580378fcd1a6445b6e83
Xavier Ducrohet [Wed, 13 Oct 2010 21:22:51 +0000 (14:22 -0700)]
am
9e914e4a: Reorder the samples packaging + readme.
Merge commit '
9e914e4aa2075a38d76048261808a9a3a3036eb5' into gingerbread-plus-aosp
* commit '
9e914e4aa2075a38d76048261808a9a3a3036eb5':
Reorder the samples packaging + readme.
Xavier Ducrohet [Wed, 13 Oct 2010 20:38:45 +0000 (13:38 -0700)]
Reorder the samples packaging + readme.
Change-Id: Ic4d91b214ec9ceb6303bd99e0a0580fbf3401177
Ben Komalo [Wed, 13 Oct 2010 16:44:04 +0000 (09:44 -0700)]
am
feb2b3d9: Change date storage in DB to be a ms timestamp integral value. Add a basic CursorAdapter to add more flexibility to views in list. Create custom listview item that is pretty much the same, except with a relative time string.
Merge commit '
feb2b3d9b02d7fd008bea09d14f175d848a62226' into gingerbread-plus-aosp
* commit '
feb2b3d9b02d7fd008bea09d14f175d848a62226':
Change date storage in DB to be a ms timestamp integral value.
Ben Komalo [Wed, 13 Oct 2010 03:51:06 +0000 (20:51 -0700)]
Change date storage in DB to be a ms timestamp integral value.
Add a basic CursorAdapter to add more flexibility to views in list.
Create custom listview item that is pretty much the same, except
with a relative time string.
Change-Id: I9a1f956832f550b9a8192ea3967e732725dd6ba2
Nick Pelly [Wed, 13 Oct 2010 02:48:38 +0000 (19:48 -0700)]
Nick Pelly [Wed, 13 Oct 2010 02:45:24 +0000 (19:45 -0700)]
Fix build.
Change-Id: I8e950c585ee9d5c97657ac17b00296423b1a8faa
Nick Pelly [Wed, 13 Oct 2010 02:04:21 +0000 (19:04 -0700)]
am
1d5707b5: Update Tag app for API changes.
Merge commit '
1d5707b5a864f5f154bc2de98f7c2027b8390387' into gingerbread-plus-aosp
* commit '
1d5707b5a864f5f154bc2de98f7c2027b8390387':
Update Tag app for API changes.
Nick Pelly [Tue, 12 Oct 2010 22:41:10 +0000 (15:41 -0700)]
Update Tag app for API changes.
Change-Id: Idecfee21ee58f7a19d5dcbae39c231b8e8d96095
Signed-off-by: Nick Pelly <npelly@google.com>
Ben Komalo [Wed, 13 Oct 2010 01:37:12 +0000 (18:37 -0700)]
am
5fed2354: Merge "Clean up some resources: - remove duplicated desk clocks since they were really the same icon. - shrink down the tab indicator icons to a suitable size - remove title bar from activity" into gingerbread
Merge commit '
5fed2354d2ffb374ea84641eed0fe287fb26c3ce' into gingerbread-plus-aosp
* commit '
5fed2354d2ffb374ea84641eed0fe287fb26c3ce':
Clean up some resources:
Ben Komalo [Wed, 13 Oct 2010 01:37:11 +0000 (18:37 -0700)]
am
6b3b5d22: Ignore vi backup files.
Merge commit '
6b3b5d22a377413a05ec274accd28ac0998fc420' into gingerbread-plus-aosp
* commit '
6b3b5d22a377413a05ec274accd28ac0998fc420':
Ignore vi backup files.
Ben Komalo [Wed, 13 Oct 2010 01:34:50 +0000 (18:34 -0700)]
Merge "Clean up some resources: - remove duplicated desk clocks since they were really the same icon. - shrink down the tab indicator icons to a suitable size - remove title bar from activity" into gingerbread
Ben Komalo [Wed, 13 Oct 2010 01:27:14 +0000 (18:27 -0700)]
Ignore vi backup files.
Change-Id: Ibeb80d1fee84be1cf33321eec0284a0306513646
Ben Komalo [Wed, 13 Oct 2010 01:25:09 +0000 (18:25 -0700)]
Clean up some resources:
- remove duplicated desk clocks since they were really the same icon.
- shrink down the tab indicator icons to a suitable size
- remove title bar from activity
Change-Id: I39ed7efb0e493a7ac037d6c06fa25eeb53d2332e
Nick Kralevich [Wed, 13 Oct 2010 01:17:09 +0000 (18:17 -0700)]
am
70b63111: add SmartPoster support.
Merge commit '
70b631111f606bac7daeac1af65aa1884007eaa0' into gingerbread-plus-aosp
* commit '
70b631111f606bac7daeac1af65aa1884007eaa0':
add SmartPoster support.
Nick Kralevich [Tue, 12 Oct 2010 21:43:47 +0000 (14:43 -0700)]
add SmartPoster support.
Fix off by 1 in URI handling.
Change-Id: I2007ca20c5411dd3a19aa96ea023652ed293cdc5
Ben Komalo [Wed, 13 Oct 2010 00:16:24 +0000 (17:16 -0700)]
am
5b2f2912: Nuke author tags and update Manifest that I accidentally left out of the previous CL.
Merge commit '
5b2f2912bcf4c1a9da9e8120d2788e31b484a848' into gingerbread-plus-aosp
* commit '
5b2f2912bcf4c1a9da9e8120d2788e31b484a848':
Nuke author tags and update Manifest that I
Ben Komalo [Wed, 13 Oct 2010 00:00:43 +0000 (17:00 -0700)]
Nuke author tags and update Manifest that I
accidentally left out of the previous CL.
Change-Id: I0e7eb27b6e79cf5df62f901ed68225eed986fca2
Ben Komalo [Wed, 13 Oct 2010 00:00:57 +0000 (17:00 -0700)]
am
14ca79d2: Merge "Minor JavaDoc additions and some long line fixes." into gingerbread
Merge commit '
14ca79d2a9f305abadcf98d4b3e579a4b79d78ab' into gingerbread-plus-aosp
* commit '
14ca79d2a9f305abadcf98d4b3e579a4b79d78ab':
Minor JavaDoc additions and some long line fixes.
Ben Komalo [Tue, 12 Oct 2010 23:58:58 +0000 (16:58 -0700)]
Merge "Minor JavaDoc additions and some long line fixes." into gingerbread