The Android Automerger
4f4529984c
Merge branch 'gingerbread' into gingerbread-release
2010-10-20 07:29:30 -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
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
The Android Automerger
0d541be479
Merge branch 'gingerbread' into gingerbread-release
2010-10-13 07:03:19 -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
a3dc45ac9f
Fix build.
...
Change-Id: I8e950c585ee9d5c97657ac17b00296423b1a8faa
2010-10-12 19:45:24 -07:00
Nick Pelly
1d5707b5a8
Update Tag app for API changes.
...
Change-Id: Idecfee21ee58f7a19d5dcbae39c231b8e8d96095
Signed-off-by: Nick Pelly <npelly@google.com >
2010-10-12 19:00:14 -07:00
Ben Komalo
5fed2354d2
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
2010-10-12 18:34:50 -07:00
Ben Komalo
6b3b5d22a3
Ignore vi backup files.
...
Change-Id: Ibeb80d1fee84be1cf33321eec0284a0306513646
2010-10-12 18:27:14 -07:00
Ben Komalo
558defa492
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
Change-Id: I39ed7efb0e493a7ac037d6c06fa25eeb53d2332e
2010-10-12 18:26:41 -07:00
Nick Kralevich
70b631111f
add SmartPoster support.
...
Fix off by 1 in URI handling.
Change-Id: I2007ca20c5411dd3a19aa96ea023652ed293cdc5
2010-10-12 17:26:50 -07:00
Ben Komalo
5b2f2912bc
Nuke author tags and update Manifest that I
...
accidentally left out of the previous CL.
Change-Id: I0e7eb27b6e79cf5df62f901ed68225eed986fca2
2010-10-12 17:05:33 -07:00
Ben Komalo
14ca79d2a9
Merge "Minor JavaDoc additions and some long line fixes." into gingerbread
2010-10-12 16:58:58 -07:00
Ben Komalo
bd74a29eb5
Minor JavaDoc additions and some long line fixes.
...
Change-Id: Ia416b8b7536eb6c4aec4a41dea45de5669f37155
2010-10-12 16:35:43 -07:00
Nick Kralevich
5e26d64d09
disable proguard. This makes unittests run.
...
Change-Id: I566bbb83027f55ceb93927cbbb9d4113a1b73c38
2010-10-12 15:16:54 -07:00
Anatol Pomazau
22ba58cfb8
Merge "Add a util function that converts Text ndef record to text." into gingerbread
2010-10-12 14:36:09 -07:00
Anatol Pomazau
103f9c2257
Add a util function that converts Text ndef record to text.
...
Add a unit test for it.
Change-Id: I5ce2020669150e3768a19354e951b6a54cc550d4
2010-10-12 14:33:58 -07:00
Nick Kralevich
e0890ff4bc
Explain the bytes associated with the NFC type 4 tag.
...
Change-Id: Ibe12a8cb94032f52e02ef28a423203483b1e096f
2010-10-12 13:23:34 -07:00
Nick Kralevich
62bb2dccdd
change the tab selector icons
...
Change-Id: Ia12adb2e72d6b8d444fd179970ed4b27a9fa3976
2010-10-12 11:12:59 -07:00
Nick Kralevich
21995b1888
Add initial support for saved vs non-saved tags.
...
Get rid of the third "MyTag" column. This isn't currently
being used.
Change-Id: Id35074d939e1373f0998e5502eb9cfc9c86ecca5
2010-10-12 11:06:22 -07:00
Nick Kralevich
dbb9a2fd92
Merge "cleanup unused classes, show date in tag list." into gingerbread
2010-10-12 11:01:05 -07:00
David 'Digit' Turner
2e9b39e457
Merge "ndk: Add missing OpenSLES headers and libraries." into gingerbread
2010-10-12 10:31:53 -07:00
David 'Digit' Turner
51bcfb7110
ndk: Add missing OpenSLES headers and libraries.
...
Change-Id: I5444f8701a2b8ad8e99fffc6906bad1bf101530f
2010-10-12 18:29:00 +02:00