Commit Graph

4989 Commits

Author SHA1 Message Date
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
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
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
Brett Chabot
f591b70a19 am 2b03173b: am 5b599c31: Merge "Add utility for toggling settings from the cmd line." into gingerbread
Merge commit '2b03173b27c7cd9daaa4f06c1f56a45b754eb5fc'

* commit '2b03173b27c7cd9daaa4f06c1f56a45b754eb5fc':
  Add utility for toggling settings from the cmd line.
2010-10-15 14:02:16 -07:00
Xavier Ducrohet
50617c8ff4 am dd3b6a80: am 99b80ab4: Merge "GB SDK: don\'t use HV2.bat when generating tools." into gingerbread
Merge commit 'dd3b6a80340514c5b594a7f9ccf8f54ba50d94cb'

* commit 'dd3b6a80340514c5b594a7f9ccf8f54ba50d94cb':
  GB SDK: don't use HV2.bat when generating tools.
2010-10-15 14:02:11 -07:00
Gilles Debunne
ddc34941ac am 88be7a52: am 03751547: Assets moved to hdpi directory, mdpi version created
Merge commit '88be7a527d5fdf5ccab00e8c0826c6e06ab844ed'

* commit '88be7a527d5fdf5ccab00e8c0826c6e06ab844ed':
  Assets moved to hdpi directory, mdpi version created
2010-10-15 14:02:07 -07:00
Xavier Ducrohet
e206603bc0 am 445c0bb8: (-s ours) am e8690246: Merge "Move GB SDK components to 2.3" into gingerbread
Merge commit '445c0bb83aa7d794ca52874e51aafc2e4d6dff29'

* commit '445c0bb83aa7d794ca52874e51aafc2e4d6dff29':
  Move GB SDK components to 2.3
2010-10-15 13:39:17 -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
Nick Kralevich
c36f835d59 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.
2010-10-15 09:21:55 -07:00
Nick Kralevich
8149e89466 Create a ParsedNdefMessage class with supporting implementations.
Change-Id: I13a199ad01a726a30e8851a675386c34f2dfa605
2010-10-15 08:48:58 -07:00
Kenny Root
10540d6528 resolved conflicts for merge of 6c99a051 to master
Change-Id: I0bae8e92609253924f0c7adbc59f8c45394f341a
2010-10-15 00:14:56 -07:00
Ben Komalo
1e28d189ca am 5bd2e0db: 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 '5bd2e0dbe64c9f3b64edc84900b60691d834cabb'

* commit '5bd2e0dbe64c9f3b64edc84900b60691d834cabb':
  Change date storage in DB to be a ms timestamp integral value.
2010-10-15 00:05:07 -07:00
Jeff Brown
b0b841029a Use framework-supplied keycode symbols.
KeyEvent now offers an (@hidden) method to map keycodes to symbolic names
in a way that is compatible with what Monkey was already doing itself.
Now we shouldn't need to change monkey each time we add new keycodes.

Bug: 2912307
Change-Id: I9cd729b17c3f19505a4d3afcce465dad0c64cce0
2010-10-14 23:02:59 -07:00
Nick Pelly
cd9626ae10 am c0121fe8: am a3dc45ac: Fix build.
Merge commit 'c0121fe881699012b056911c309556769dbae495'

* commit 'c0121fe881699012b056911c309556769dbae495':
  Fix build.
2010-10-14 21:19:58 -07:00
Nick Pelly
117b0f5978 am 0a3eafe6: am 1d5707b5: Update Tag app for API changes.
Merge commit '0a3eafe699082f289e03892f234a6a4c45f178c5'

* commit '0a3eafe699082f289e03892f234a6a4c45f178c5':
  Update Tag app for API changes.
2010-10-14 19:30:03 -07:00
Nick Kralevich
4a026a1d98 am ab67f493: Merge "Have getObjects() return ParsedNdefRecords" into gingerbread
Merge commit 'ab67f493dc44c1dfd6c795abcf61dfec2f233014' into gingerbread-plus-aosp

* commit 'ab67f493dc44c1dfd6c795abcf61dfec2f233014':
  Have getObjects() return ParsedNdefRecords
2010-10-14 16:00:55 -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
Ben Komalo
ce3e391546 am f6193585: 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 'f6193585e35c1d7ba770bcdb009892ead8aa5d8c'

* commit 'f6193585e35c1d7ba770bcdb009892ead8aa5d8c':
  Clean up some resources:
2010-10-14 15:43:58 -07:00