Commit Graph

4508 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Brett Chabot
2cff6ce39f 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."
2010-10-14 14:57:18 -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
1bc37bf5a5 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.
2010-10-14 13:44:50 -07:00
Jeff Hamilton
a46b8b664a 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.
2010-10-14 13:41:35 -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
2b03173b27 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.
2010-10-14 12:03:27 -07:00
Xavier Ducrohet
dd3b6a8034 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.
2010-10-14 12:03:25 -07:00
Gilles Debunne
88be7a527d 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
2010-10-14 12:01:31 -07: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
Xavier Ducrohet
445c0bb83a 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
2010-10-13 17:44:35 -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
6c99a05152 am 9e914e4a: Reorder the samples packaging + readme.
Merge commit '9e914e4aa2075a38d76048261808a9a3a3036eb5' into gingerbread-plus-aosp

* commit '9e914e4aa2075a38d76048261808a9a3a3036eb5':
  Reorder the samples packaging + readme.
2010-10-13 14:22:51 -07:00
Xavier Ducrohet
9e914e4aa2 Reorder the samples packaging + readme.
Change-Id: Ic4d91b214ec9ceb6303bd99e0a0580fbf3401177
2010-10-13 13:38:45 -07:00
Ben Komalo
5bd2e0dbe6 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.
2010-10-13 09:44:04 -07:00
Ben Komalo
feb2b3d9b0 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
2010-10-12 20:53:08 -07:00
Nick Pelly
c0121fe881 am a3dc45ac: Fix build.
Merge commit 'a3dc45ac9f4c7e1bfa8a5084add450ab0712f117' into gingerbread-plus-aosp

* commit 'a3dc45ac9f4c7e1bfa8a5084add450ab0712f117':
  Fix build.
2010-10-12 19:48:38 -07:00
Nick Pelly
a3dc45ac9f Fix build.
Change-Id: I8e950c585ee9d5c97657ac17b00296423b1a8faa
2010-10-12 19:45:24 -07:00
Nick Pelly
0a3eafe699 am 1d5707b5: Update Tag app for API changes.
Merge commit '1d5707b5a864f5f154bc2de98f7c2027b8390387' into gingerbread-plus-aosp

* commit '1d5707b5a864f5f154bc2de98f7c2027b8390387':
  Update Tag app for API changes.
2010-10-12 19:04:21 -07:00