Commit Graph

5407 Commits

Author SHA1 Message Date
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
Joe Malin
94ce3f2088 Cherry pick from master: Sample app and test package for a Service 2010-10-21 14:20:11 -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
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
79ee0a9a05 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.
2010-10-16 16:55:15 -07:00
Bill Napier
f043be8674 am 1e41661b: am 66d61ef9: Merge "Add in MonkeyRunner to the Windows SDK."
Merge commit '1e41661b6077552ed71e902f0e628ea6e48aba06'

* commit '1e41661b6077552ed71e902f0e628ea6e48aba06':
  Add in MonkeyRunner to the Windows SDK.
2010-10-16 09:43:36 -07:00
Nick Kralevich
c80e1327ab am c36f835d: am 8149e894: Create a ParsedNdefMessage class with supporting implementations.
Merge commit 'c36f835d598b2b8c653dcbcfa7f157e760737d01'

* commit 'c36f835d598b2b8c653dcbcfa7f157e760737d01':
  Create a ParsedNdefMessage class with supporting implementations.
2010-10-16 09:14:10 -07:00
Nick Kralevich
61263332ff am 4a026a1d: am ab67f493: Merge "Have getObjects() return ParsedNdefRecords" into gingerbread
Merge commit '4a026a1d98d5297e4e32f5c95888772d1da09d14'

* commit '4a026a1d98d5297e4e32f5c95888772d1da09d14':
  Have getObjects() return ParsedNdefRecords
2010-10-16 08:58:00 -07:00
Brett Chabot
cb1046b238 am 2cff6ce3: am 4f3dcc85: Revert "Add utility for toggling settings from the cmd line."
Merge commit '2cff6ce39f74ef26a44233fe618b062a783c5f76'

* commit '2cff6ce39f74ef26a44233fe618b062a783c5f76':
  Revert "Add utility for toggling settings from the cmd line."
2010-10-16 08:51:27 -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
1cefa9fb2e 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.
2010-10-15 18:22:48 -07:00
Nick Kralevich
d1d55e4c6b am 1bc37bf5: am 85122d26: add some new mock ndef messages for testing.
Merge commit '1bc37bf5a5038c85d631750e8ab30457cefa312f'

* commit '1bc37bf5a5038c85d631750e8ab30457cefa312f':
  add some new mock ndef messages for testing.
2010-10-15 16:48:41 -07:00
Jeff Hamilton
98b58077d3 am a46b8b66: am 4f6f93d5: Merge "Checkpoint work on the Tag app." into gingerbread
Merge commit 'a46b8b664ade966e0a0cd3b5e26b184297e2744c'

* commit 'a46b8b664ade966e0a0cd3b5e26b184297e2744c':
  Checkpoint work on the Tag app.
2010-10-15 16:48:30 -07:00
Jeff Brown
ac98134ea0 Merge "Use framework-supplied keycode symbols." 2010-10-15 16:02:26 -07:00
Bill Napier
1e41661b60 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.
2010-10-15 15:58:17 -07:00
Bill Napier
66d61ef95f Merge "Add in MonkeyRunner to the Windows SDK." 2010-10-15 15:35:11 -07:00