- 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
Merge commit '5b2f2912bcf4c1a9da9e8120d2788e31b484a848' into gingerbread-plus-aosp
* commit '5b2f2912bcf4c1a9da9e8120d2788e31b484a848':
Nuke author tags and update Manifest that I
Merge commit '14ca79d2a9f305abadcf98d4b3e579a4b79d78ab' into gingerbread-plus-aosp
* commit '14ca79d2a9f305abadcf98d4b3e579a4b79d78ab':
Minor JavaDoc additions and some long line fixes.
Merge commit '5e26d64d0907e403baf3c487191a4c5ffb48f74c' into gingerbread-plus-aosp
* commit '5e26d64d0907e403baf3c487191a4c5ffb48f74c':
disable proguard. This makes unittests run.
Merge commit '22ba58cfb88e1394b34dc40b83f3dbf5229b2fb1' into gingerbread-plus-aosp
* commit '22ba58cfb88e1394b34dc40b83f3dbf5229b2fb1':
Add a util function that converts Text ndef record to text.
Merge commit 'e0890ff4bc95c63104a00df66f69b0ccd7ed15d7' into gingerbread-plus-aosp
* commit 'e0890ff4bc95c63104a00df66f69b0ccd7ed15d7':
Explain the bytes associated with the NFC type 4 tag.
Merge commit '21995b188899d9576ef8c5d26f0cc9e373804204' into gingerbread-plus-aosp
* commit '21995b188899d9576ef8c5d26f0cc9e373804204':
Add initial support for saved vs non-saved tags.
Merge commit 'dbb9a2fd92cf5f5adedb6b748ddd75e621c023ee' into gingerbread-plus-aosp
* commit 'dbb9a2fd92cf5f5adedb6b748ddd75e621c023ee':
cleanup unused classes, show date in tag list.
Merge commit '4a74a386066d2eb86b64ffdf09391def0451e4be' into gingerbread-plus-aosp
* commit '4a74a386066d2eb86b64ffdf09391def0451e4be':
get rid of sql finalizer error messages.
Merge commit '55fe78df445c72e2eebf1e07a704432b8b2c2f58' into gingerbread-plus-aosp
* commit '55fe78df445c72e2eebf1e07a704432b8b2c2f58':
bytes should be a blob.
Merge commit 'a3088c433ed5deb775d390f2b22df40dc0194950'
* commit 'a3088c433ed5deb775d390f2b22df40dc0194950':
Show 'Save tag' dialog even if the screen is turned off
Merge commit '9f62c24a68e5408e5792fb185ab2e58d0c507265' into gingerbread-plus-aosp
* commit '9f62c24a68e5408e5792fb185ab2e58d0c507265':
Show 'Save tag' dialog even if the screen is turned off
Merge commit 'ce6bbfae018b5629fd86c77b81fc4d8c655fa275' into gingerbread-plus-aosp
* commit 'ce6bbfae018b5629fd86c77b81fc4d8c655fa275':
More data for testing.
I managed to extract data from a real NFC tag. Make that
data available for unittests / other testing.
Change-Id: I99cd8d6a32dc20fd7e33191f86def71236474d9a
Merge commit '97d3699cd92e2c15623935d723f1b85ec673b73a' into gingerbread-plus-aosp
* commit '97d3699cd92e2c15623935d723f1b85ec673b73a':
Have TagBroadcastReceiver start the SaveTag activity.
The SaveTag activity will receive an intent with the
contents of the NdefRecord, and will be responsible
for commiting that record to the database.
Add NdefUtil, which can convert an NdefRecord
to a URI, and vise-versa.
Change-Id: Icf8682a00774da6e246961d34de5bc5baa7550cb
Merge commit 'e97e78a0600e08b0e84edee96aea81145c0df44c' into gingerbread-plus-aosp
* commit 'e97e78a0600e08b0e84edee96aea81145c0df44c':
Make unittests work, new TagBroadcastReceiver
