Commit Graph

4348 Commits

Author SHA1 Message Date
The Android Automerger
a7e04ad16c Merge branch 'gingerbread' into gingerbread-release 2010-10-26 17:11:27 -07:00
Mathias Agopian
5a2fb6ce28 Merge "Greatly simplify sample code by using EGL_NATIVE_VISUAL_ID." into gingerbread 2010-10-26 12:18:49 -07:00
Jack Palevich
902b355dfc Merge "Remove unused Grid object from LabelMaker.java class." into gingerbread 2010-10-26 10:25:13 -07:00
The Android Automerger
71e1187f35 Merge branch 'gingerbread' into gingerbread-release 2010-10-25 21:21:33 -07:00
Mathias Agopian
793509c983 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
2010-10-25 18:03:55 -07:00
Mathias Agopian
f0c011224a 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
2010-10-25 17:59:06 -07:00
Dianne Hackborn
a77c1bdd4a 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
2010-10-25 17:01:49 -07:00
Jack Palevich
9ca6f2c057 Remove unused Grid object from LabelMaker.java class.
Also remove unnescessary "executable" bits from a documentation file.

Change-Id: I49bf8a6f0dabece62d16956b7e02c9a846bdd69b
2010-10-25 14:03:27 -07:00
Roman Nurik
83c50ca740 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 2010-10-25 13:50:34 -07:00
Scott Main
0c53c5b6f6 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 2010-10-25 11:14:20 -07:00
The Android Automerger
d752061184 Merge branch 'gingerbread' into gingerbread-release 2010-10-22 17:05:50 -07:00
Roman Nurik
72dcdbbd09 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
2010-10-22 11:30:57 -07:00
Dianne Hackborn
c2d70d2a98 Update native headers/library to match current platform.
Change-Id: I40ef2fa924881b9653fcddcd09c14455ac1ef37e
2010-10-21 21:09:47 -07:00
Scott Main
875234d940 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
2010-10-21 12:46:04 -07:00
The Android Automerger
e42b9644da Merge branch 'gingerbread' into gingerbread-release 2010-10-21 07:24:06 -07:00
Yu Shan Emily Lau
9bfa6f90b8 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 2010-10-20 14:04:52 -07:00
The Android Automerger
043168b457 Merge branch 'gingerbread' into gingerbread-release 2010-10-20 12:46:23 -07:00
Scott Main
0702c10125 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.
2010-10-20 10:18:00 -07:00
The Android Automerger
4f4529984c Merge branch 'gingerbread' into gingerbread-release 2010-10-20 07:29:30 -07:00
Yu Shan Emily Lau
e8b416049b 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
2010-10-19 22:04:33 -07:00
Dianne Hackborn
834eb602eb Fix bug in native activity demo.
Can't get surface size until after it is made current.

Change-Id: I34847775bde680d05767b6b4cfa8e547eb56aa6d
2010-10-19 18:36:53 -07:00
Scott Main
05523fb0b4 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
2010-10-19 17:26:05 -07:00
Xavier Ducrohet
92df1283f7 Move samples to API 9
Change-Id: I918a63197ff62d6b935de5a6eb843516a314a241
2010-10-19 10:32:14 -07:00
The Android Automerger
e67c2d3034 Merge branch 'gingerbread' into gingerbread-release 2010-10-18 17:20:21 -07:00
Jeff Hamilton
15b480d052 Remove the Tag app.
It's moving to package/apps/Tag.

Change-Id: I1f800fd718b3a06feeeba8fa1564acd3ca173510
2010-10-18 13:14:21 -05:00
Jeff Hamilton
f8580cf676 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
2010-10-18 12:10:18 -05:00
Nick Pelly
b19cc7baa9 Merge "Update permission name for Tag app." into gingerbread 2010-10-18 10:07:45 -07:00
The Android Automerger
565bdcda37 Merge branch 'gingerbread' into gingerbread-release 2010-10-18 08:27:25 -07:00
David Turner
f1b348834c Merge "Dummy java file in native-only apps is not needed anymore." into gingerbread 2010-10-18 01:39:32 -07:00
Nick Pelly
c013897d23 Update permission name for Tag app.
Change-Id: I161aada35095ebe2395eec2e0900ab5c1272bb2b
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-17 20:06:52 -07:00
Dianne Hackborn
8143be8d03 Update device admin example to wipe SD card.
Change-Id: I224006f284916761578e3d04b208828f80ea3cb6
2010-10-15 18:52:33 -07:00
Xavier Ducrohet
24277fdb61 Merge "Set SDK samples to API 8 + gingerbread." into gingerbread 2010-10-15 11:35:37 -07:00
Raphael
95a7877b9e Set SDK samples to API 8 + gingerbread.
DO NOT MERGE

Change-Id: I1040974ab20426ad1fbdb958a21f10681fb68e69
2010-10-15 11:27:08 -07:00
The Android Automerger
83ab50d658 Merge branch 'gingerbread' into gingerbread-release 2010-10-15 09:06:00 -07:00
Nick Kralevich
8149e89466 Create a ParsedNdefMessage class with supporting implementations.
Change-Id: I13a199ad01a726a30e8851a675386c34f2dfa605
2010-10-15 08:48:58 -07:00
Nick Kralevich
ab67f493dc Merge "Have getObjects() return ParsedNdefRecords" into gingerbread 2010-10-14 15:56:24 -07:00
Nick Kralevich
da3b9b7196 Have getObjects() return ParsedNdefRecords
Change-Id: I7e5f8fdf2ae113f55cc5843f517a8a8b20ab00ee
2010-10-14 15:54:39 -07:00
Brett Chabot
4f3dcc857e Revert "Add utility for toggling settings from the cmd line."
This reverts commit a2e81242e0.
2010-10-14 14:15:33 -07:00
Nick Kralevich
85122d2605 add some new mock ndef messages for testing.
Change-Id: Ib238bc427c7350cec4b6765a171d6f3fa0907151
2010-10-14 13:28:28 -07:00
Jeff Hamilton
4f6f93d594 Merge "Checkpoint work on the Tag app." into gingerbread 2010-10-14 12:57:06 -07:00
Jeff Hamilton
928f3aa353 Checkpoint work on the Tag app.
Change-Id: I375aeabe00528d30ce49e8d3d9f78aaac10b0071
2010-10-14 14:52:19 -05:00
Brett Chabot
5b599c3148 Merge "Add utility for toggling settings from the cmd line." into gingerbread 2010-10-14 11:46:18 -07:00
Xavier Ducrohet
99b80ab479 Merge "GB SDK: don't use HV2.bat when generating tools." into gingerbread 2010-10-14 11:42:03 -07:00
Raphael
cca5d187d5 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
2010-10-14 11:25:01 -07:00
Gilles Debunne
0375154765 Assets moved to hdpi directory, mdpi version created
Change-Id: I960fa28d2596c26e62cb6914c59c5db2def4a03e
2010-10-14 10:11:57 -07:00
The Android Automerger
37a41dba8e Merge branch 'gingerbread' into gingerbread-release 2010-10-13 18:49:54 -07:00
Xavier Ducrohet
e869024635 Merge "Move GB SDK components to 2.3" into gingerbread 2010-10-13 17:30:07 -07:00
Xavier Ducrohet
4ddc85ac9d Move GB SDK components to 2.3
Change-Id: I1bcd6063d6702f397909d5212b9d0ccb1869f33b
2010-10-13 15:36:48 -07:00
Xavier Ducrohet
0574dc4cfd 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
2010-10-13 15:34:37 -07:00
Xavier Ducrohet
9e914e4aa2 Reorder the samples packaging + readme.
Change-Id: Ic4d91b214ec9ceb6303bd99e0a0580fbf3401177
2010-10-13 13:38:45 -07:00