Commit Graph

5020 Commits

Author SHA1 Message Date
Mathias Agopian
2cf5a578c6 am 844b1ed7: am f0c01122: simplify a bit the native-activity sample code 2010-10-26 07:28:47 -07:00
Mathias Agopian
844b1ed7c7 am f0c01122: simplify a bit the native-activity sample code 2010-10-26 07:24:45 -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
50fc9364b6 am 4bd22f94: am a77c1bdd: Work on issue #3126018: No way to specify NativeActivity\'s native method
Merge commit '4bd22f94015a9ea90013a96270dc886f73207793'

* commit '4bd22f94015a9ea90013a96270dc886f73207793':
  Work on issue #3126018: No way to specify NativeActivity's native method
2010-10-25 17:25:14 -07:00
Raphael Moll
da1248a231 am 5c428f4a: am 799754e1: Merge "Tools package was missing proguard.bat"
Merge commit '5c428f4a8d7fcbd8aea588593cafa8193d48b5f7'

* commit '5c428f4a8d7fcbd8aea588593cafa8193d48b5f7':
  Tools package was missing proguard.bat
2010-10-25 17:25:08 -07:00
Dianne Hackborn
4bd22f9401 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
2010-10-25 17:07:35 -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
Raphael Moll
5c428f4a8d am 799754e1: Merge "Tools package was missing proguard.bat"
Merge commit '799754e18b7ce057a9aab8ea243f7dfd1d4edb44' into gingerbread-plus-aosp

* commit '799754e18b7ce057a9aab8ea243f7dfd1d4edb44':
  Tools package was missing proguard.bat
2010-10-25 16:57:55 -07:00
Raphael Moll
799754e18b Merge "Tools package was missing proguard.bat" 2010-10-25 14:43:05 -07:00
Roman Nurik
a10cf9edd8 am affd0f8e: 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 'affd0f8ec31f9bf1f0f2288c5f6ebab9c18673fe'

* commit 'affd0f8ec31f9bf1f0f2288c5f6ebab9c18673fe':
  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.
2010-10-25 14:00:28 -07:00
Roman Nurik
affd0f8ec3 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.
2010-10-25 13:55:34 -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
bfb2c1dbd0 am ccbd8955: (-s ours) 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
Merge commit 'ccbd8955c0ce6c0bef32d531b6d8c607db7fb561'

* commit 'ccbd8955c0ce6c0bef32d531b6d8c607db7fb561':
  Do not merge.
2010-10-25 11:27:22 -07:00
Scott Main
ccbd8955c0 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.
2010-10-25 11:17:09 -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
Joe Malin
f290a6b611 Merge "Samples: Fix bugs in Note Pad sample app." 2010-10-24 11:11:52 -07:00
Raphael Moll
b04a4f947c Tools package was missing proguard.bat
SDK Bug: 3126278

Change-Id: I8bb9c2e2250b0da4303b09cdfe05717cee887c44
2010-10-23 22:11:37 -07:00
Dianne Hackborn
c8f1ba9bb0 am 742b1fbd: am c2d70d2a: Update native headers/library to match current platform. 2010-10-22 12:30:44 -07:00
Dianne Hackborn
742b1fbd8b am c2d70d2a: Update native headers/library to match current platform. 2010-10-22 12:11:19 -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
Yu Shan Emily Lau
05cd1145d4 am 35ccee0b: 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
Merge commit '35ccee0b22501feda0249dfcaaff2a9fdcd363b6'

* commit '35ccee0b22501feda0249dfcaaff2a9fdcd363b6':
  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.
2010-10-21 13:44:36 -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
Scott Main
1878c56740 am 9b07277b: (-s ours) 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. - t
Merge commit '9b07277b925e34e6bced3f4057b3b487b9468468'

* commit '9b07277b925e34e6bced3f4057b3b487b9468468':
  Do not merge.
2010-10-21 10:58:46 -07:00
Dianne Hackborn
a85e26223e am ddb133f4: am 834eb602: Fix bug in native activity demo.
Merge commit 'ddb133f4a9d1e2f75f99c148e8218e43682b40a2'

* commit 'ddb133f4a9d1e2f75f99c148e8218e43682b40a2':
  Fix bug in native activity demo.
2010-10-21 10:49:07 -07:00
Yu Shan Emily Lau
35ccee0b22 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.
2010-10-20 14:06:56 -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
Scott Main
9b07277b92 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.
2010-10-20 13:54:47 -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
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
ddb133f4a9 am 834eb602: Fix bug in native activity demo.
Merge commit '834eb602ebd904ec1cd6b5301106c97e67693b4c' into gingerbread-plus-aosp

* commit '834eb602ebd904ec1cd6b5301106c97e67693b4c':
  Fix bug in native activity demo.
2010-10-19 18:42:23 -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
Jean-Baptiste Queru
88146a5c4f Merge 35ac4e1d from gingerbread-plus-aosp
Change-Id: I3a0c1f0da2329cdff49ff384d3533ba9d6d0182f
2010-10-19 12:26:31 -07:00
Xavier Ducrohet
35ac4e1d36 am 92df1283: Move samples to API 9
Merge commit '92df1283f7a8e186f04a93a1ec34d8f8fa3202ce' into gingerbread-plus-aosp

* commit '92df1283f7a8e186f04a93a1ec34d8f8fa3202ce':
  Move samples to API 9
2010-10-19 10:37:02 -07:00
Xavier Ducrohet
92df1283f7 Move samples to API 9
Change-Id: I918a63197ff62d6b935de5a6eb843516a314a241
2010-10-19 10:32:14 -07:00
Jeff Hamilton
1fecfd93aa am 83e45461: am 15b480d0: Remove the Tag app.
Merge commit '83e45461fd3f6b86823d054663cc3bef5748fd3e'

* commit '83e45461fd3f6b86823d054663cc3bef5748fd3e':
  Remove the Tag app.
2010-10-18 18:11:54 -07:00
Jeff Hamilton
0d8d6a86e1 am e9e97554: am f8580cf6: A bunch of work on the UI.
Merge commit 'e9e97554814733495459e6b441950a342d60f799'

* commit 'e9e97554814733495459e6b441950a342d60f799':
  A bunch of work on the UI.
2010-10-18 16:42:09 -07:00
Nick Pelly
802e17eecd am 79bb3413: am b19cc7ba: Merge "Update permission name for Tag app." into gingerbread
Merge commit '79bb3413318c03e8496d35ee9878e1c6bd6b1dfa'

* commit '79bb3413318c03e8496d35ee9878e1c6bd6b1dfa':
  Update permission name for Tag app.
2010-10-18 16:42:03 -07:00
David Turner
61880124ec am df9f6a80: am f1b34883: Merge "Dummy java file in native-only apps is not needed anymore." into gingerbread
Merge commit 'df9f6a80788c25da9a8fafd2bfc69f4e772f5b5e'

* commit 'df9f6a80788c25da9a8fafd2bfc69f4e772f5b5e':
  Dummy java file in native-only apps is not needed anymore.
2010-10-18 16:40:31 -07:00
Kenny Root
56281044e3 resolved conflicts for merge of 79ee0a9a to master
Change-Id: I110bd412e38358b3d99235bf10fd9d1022aa04e9
2010-10-18 13:56:13 -07:00
Jeff Hamilton
83e45461fd am 15b480d0: Remove the Tag app.
Merge commit '15b480d05245b3e2e23e17afce69081eba36574c' into gingerbread-plus-aosp

* commit '15b480d05245b3e2e23e17afce69081eba36574c':
  Remove the Tag app.
2010-10-18 11:26:33 -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
e9e9755481 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.
2010-10-18 10:26:35 -07:00
Nick Pelly
79bb341331 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.
2010-10-18 10:26:30 -07:00
Xavier Ducrohet
e51e978f34 am 1cefa9fb: (-s ours) am 24277fdb: Merge "Set SDK samples to API 8 + gingerbread." into gingerbread
Merge commit '1cefa9fb2ea5d21f1dd37dc9386ced69f0bddfe6'

* commit '1cefa9fb2ea5d21f1dd37dc9386ced69f0bddfe6':
  Set SDK samples to API 8 + gingerbread.
2010-10-18 10:22:27 -07: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
David Turner
df9f6a8078 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.
2010-10-18 01:49:36 -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