LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,990 Commits 2 Branches 0 Tags
0fe8f49d7b46b623d5f85e1524c2050e22dc3095
Commit Graph

295 Commits

Author SHA1 Message Date
Nick Kralevich
686c76d382 am 045e0767: am 4a74a386: get rid of sql finalizer error messages. 
Merge commit '045e0767be2acb552ce2b6f0c44a0bfa2333ed97'

* commit '045e0767be2acb552ce2b6f0c44a0bfa2333ed97':
  get rid of sql finalizer error messages.
 2010-10-12 16:39:27 -07:00
Nick Kralevich
b26b52bda7 am 3cd15309: am 55fe78df: bytes should be a blob. 
Merge commit '3cd1530903979d818a57f28e003fb15cc51f33e2'

* commit '3cd1530903979d818a57f28e003fb15cc51f33e2':
  bytes should be a blob.
 2010-10-12 16:39:15 -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
23e7a4db41 am 5e26d64d: disable proguard. This makes unittests run. 
Merge commit '5e26d64d0907e403baf3c487191a4c5ffb48f74c' into gingerbread-plus-aosp

* commit '5e26d64d0907e403baf3c487191a4c5ffb48f74c':
  disable proguard.  This makes unittests run.
 2010-10-12 15:23:11 -07:00
Nick Kralevich
5e26d64d09 disable proguard. This makes unittests run. 
Change-Id: I566bbb83027f55ceb93927cbbb9d4113a1b73c38
 2010-10-12 15:16:54 -07:00
Anatol Pomazau
4b96eff41c am 22ba58cf: Merge "Add a util function that converts Text ndef record to text." into gingerbread 
Merge commit '22ba58cfb88e1394b34dc40b83f3dbf5229b2fb1' into gingerbread-plus-aosp

* commit '22ba58cfb88e1394b34dc40b83f3dbf5229b2fb1':
  Add a util function that converts Text ndef record to text.
 2010-10-12 14:38:44 -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
9c1791134f am e0890ff4: Explain the bytes associated with the NFC type 4 tag. 
Merge commit 'e0890ff4bc95c63104a00df66f69b0ccd7ed15d7' into gingerbread-plus-aosp

* commit 'e0890ff4bc95c63104a00df66f69b0ccd7ed15d7':
  Explain the bytes associated with the NFC type 4 tag.
 2010-10-12 14:02:31 -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
67007a4aeb am 62bb2dcc: change the tab selector icons 
Merge commit '62bb2dccdd9dcf223908c728e24460e8248a9e7a' into gingerbread-plus-aosp

* commit '62bb2dccdd9dcf223908c728e24460e8248a9e7a':
  change the tab selector icons
 2010-10-12 11:33:33 -07:00
Nick Kralevich
68c3b4fca6 am 21995b18: Add initial support for saved vs non-saved tags. 
Merge commit '21995b188899d9576ef8c5d26f0cc9e373804204' into gingerbread-plus-aosp

* commit '21995b188899d9576ef8c5d26f0cc9e373804204':
  Add initial support for saved vs non-saved tags.
 2010-10-12 11:23:49 -07:00
Nick Kralevich
abe92c127e am dbb9a2fd: Merge "cleanup unused classes, show date in tag list." into gingerbread 
Merge commit 'dbb9a2fd92cf5f5adedb6b748ddd75e621c023ee' into gingerbread-plus-aosp

* commit 'dbb9a2fd92cf5f5adedb6b748ddd75e621c023ee':
  cleanup unused classes, show date in tag list.
 2010-10-12 11:23:27 -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
8b2b6a1730 cleanup unused classes, show date in tag list. 
Change-Id: Ie9b1eee3606d7d1cfaff73723ff40c7570a6b1c9
 2010-10-11 17:28:21 -07:00
Nick Kralevich
045e0767be am 4a74a386: get rid of sql finalizer error messages. 
Merge commit '4a74a386066d2eb86b64ffdf09391def0451e4be' into gingerbread-plus-aosp

* commit '4a74a386066d2eb86b64ffdf09391def0451e4be':
  get rid of sql finalizer error messages.
 2010-10-11 17:26:33 -07:00
Nick Kralevich
3cd1530903 am 55fe78df: bytes should be a blob. 
Merge commit '55fe78df445c72e2eebf1e07a704432b8b2c2f58' into gingerbread-plus-aosp

* commit '55fe78df445c72e2eebf1e07a704432b8b2c2f58':
  bytes should be a blob.
 2010-10-11 17:25:55 -07:00
Brett Chabot
a2e81242e0 Add utility for toggling settings from the cmd line. 
Change-Id: I4dc7052c22fac3edf66e2d7db0c8d7039be4f196
 2010-10-11 16:25:03 -07:00
Nick Kralevich
4a74a38606 get rid of sql finalizer error messages. 
Change-Id: I5613734b78f861237b435079742528b9623c97de
 2010-10-11 16:10:04 -07:00
Nick Kralevich
55fe78df44 bytes should be a blob. 
Change-Id: I8bbf6aab8ec67d60cb6ac47cd273aec8814d2d6a
 2010-10-11 15:22:58 -07:00
Anatol Pomazau
0bb3e5ef33 am a3088c43: am 9f62c24a: Show \'Save tag\' dialog even if the screen is turned off 
Merge commit 'a3088c433ed5deb775d390f2b22df40dc0194950'

* commit 'a3088c433ed5deb775d390f2b22df40dc0194950':
  Show 'Save tag' dialog even if the screen is turned off
 2010-10-07 15:15:26 -07:00
Nick Kralevich
f5320adb18 am 1ce3c1d4: am ce6bbfae: More data for testing. 
Merge commit '1ce3c1d4f75985edf490719bed33f583d74c4410'

* commit '1ce3c1d4f75985edf490719bed33f583d74c4410':
  More data for testing.
 2010-10-07 12:23:23 -07:00
Anatol Pomazau
8fa797a472 am 78823862: am 64076440: Dismiss "Save" dialog on activity stop 
Merge commit '78823862e69b65e999b221053076cafc099133e0'

* commit '78823862e69b65e999b221053076cafc099133e0':
  Dismiss "Save" dialog on activity stop
 2010-10-07 12:23:06 -07:00
Nick Kralevich
2bb58e9f26 am ad7ed966: am 97d3699c: Have TagBroadcastReceiver start the SaveTag activity. 
Merge commit 'ad7ed9662874ca57e9a17d334f973fada634654f'

* commit 'ad7ed9662874ca57e9a17d334f973fada634654f':
  Have TagBroadcastReceiver start the SaveTag activity.
 2010-10-07 12:22:24 -07:00
Nick Kralevich
63eda94346 am 68220d58: am afad3fa1: new icon. 
Merge commit '68220d5838c2039d6b1279587e4a2a45496c6f3a'

* commit '68220d5838c2039d6b1279587e4a2a45496c6f3a':
  new icon.
 2010-10-07 12:19:53 -07:00
Nick Kralevich
f3d2517c05 am 4d5a6a6d: am 08ad0fde: Merge "new SaveTag activity, additional utilities" into gingerbread 
Merge commit '4d5a6a6de3d86007d68a590d3893489cd740d179'

* commit '4d5a6a6de3d86007d68a590d3893489cd740d179':
  new SaveTag activity, additional utilities
 2010-10-07 09:27:43 -07:00
Anatol Pomazau
a3088c433e am 9f62c24a: 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
 2010-10-05 17:50:43 -07:00
Anatol Pomazau
9f62c24a68 Show 'Save tag' dialog even if the screen is turned off 
Change-Id: I7d8b2fa74525e81db1743bf3e4283778192fc047
 2010-10-05 17:43:18 -07:00
Nick Kralevich
1ce3c1d4f7 am ce6bbfae: More data for testing. 
Merge commit 'ce6bbfae018b5629fd86c77b81fc4d8c655fa275' into gingerbread-plus-aosp

* commit 'ce6bbfae018b5629fd86c77b81fc4d8c655fa275':
  More data for testing.
 2010-10-05 16:48:56 -07:00
Anatol Pomazau
78823862e6 am 64076440: Dismiss "Save" dialog on activity stop 
Merge commit '640764400347b35baa20089961560291b36e5840' into gingerbread-plus-aosp

* commit '640764400347b35baa20089961560291b36e5840':
  Dismiss "Save" dialog on activity stop
 2010-10-05 16:44:04 -07:00
Nick Kralevich
ce6bbfae01 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
 2010-10-05 16:42:51 -07:00
Anatol Pomazau
6407644003 Dismiss "Save" dialog on activity stop 
Change-Id: I0e63b679c9677e50f7b5b6a20c9eb840f983aa18
 2010-10-05 16:35:45 -07:00
Nick Kralevich
ad7ed96628 am 97d3699c: Have TagBroadcastReceiver start the SaveTag activity. 
Merge commit '97d3699cd92e2c15623935d723f1b85ec673b73a' into gingerbread-plus-aosp

* commit '97d3699cd92e2c15623935d723f1b85ec673b73a':
  Have TagBroadcastReceiver start the SaveTag activity.
 2010-10-05 15:44:33 -07:00
Nick Kralevich
97d3699cd9 Have TagBroadcastReceiver start the SaveTag activity. 
Change-Id: I6dc8757ca7eec87efe622b0b2688dd29c5883185
 2010-10-05 15:28:45 -07:00
Robert Greenwalt
5b72ed24c3 Merge "Add testing features to devtools" 2010-10-05 15:23:36 -07:00
Nick Kralevich
68220d5838 am afad3fa1: new icon. 
Merge commit 'afad3fa14a102e1d38bbdcfc7d6dc70243f23ce7' into gingerbread-plus-aosp

* commit 'afad3fa14a102e1d38bbdcfc7d6dc70243f23ce7':
  new icon.
 2010-10-05 13:13:51 -07:00
Nick Kralevich
afad3fa14a new icon. 
Change-Id: I17751bbd0dc9d900002ef68ee51a4ddaf1600281
 2010-10-05 12:44:50 -07:00
Nick Kralevich
4d5a6a6de3 am 08ad0fde: Merge "new SaveTag activity, additional utilities" into gingerbread 
Merge commit '08ad0fde5ee365133b9ac1406767f2778b0c93ea' into gingerbread-plus-aosp

* commit '08ad0fde5ee365133b9ac1406767f2778b0c93ea':
  new SaveTag activity, additional utilities
 2010-10-05 12:29:59 -07:00
Robert Greenwalt
40f7d44cac Add testing features to devtools 
Fixed manifest with missing permission.
Added some connectivity api-tweakers

Change-Id: I10007938e28e8c0f550ae78a7cd6df4a817a8800
 2010-10-05 12:12:18 -07:00
Nick Kralevich
41681e0be1 new SaveTag activity, additional utilities 
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
 2010-10-04 09:34:39 -07:00
Nick Kralevich
6f6a7107ac am 12f3e97c: am e97e78a0: Make unittests work, new TagBroadcastReceiver 
Merge commit '12f3e97c7a011cab7b13caeff308da380a62f6b8'

* commit '12f3e97c7a011cab7b13caeff308da380a62f6b8':
  Make unittests work, new TagBroadcastReceiver
 2010-10-01 17:08:23 -07:00
Nick Kralevich
12f3e97c7a am e97e78a0: Make unittests work, new TagBroadcastReceiver 
Merge commit 'e97e78a0600e08b0e84edee96aea81145c0df44c' into gingerbread-plus-aosp

* commit 'e97e78a0600e08b0e84edee96aea81145c0df44c':
  Make unittests work, new TagBroadcastReceiver
 2010-10-01 16:16:30 -07:00
Nick Kralevich
e97e78a060 Make unittests work, new TagBroadcastReceiver 
Change-Id: I5a3a1938a7fb91c8114447d24427f2c263bda5a3
 2010-10-01 16:09:03 -07:00
Nick Kralevich
07505f0214 am 00a7816b: am 11e191b1: Merge "update required permissions." into gingerbread 
Merge commit '00a7816b2231a0b8154060100671db33f33dc777'

* commit '00a7816b2231a0b8154060100671db33f33dc777':
  update required permissions.
 2010-10-01 10:52:14 -07:00
Nick Kralevich
00a7816b22 am 11e191b1: Merge "update required permissions." into gingerbread 
Merge commit '11e191b197c97fe1512f6b630bac9a642eb2ffdb' into gingerbread-plus-aosp

* commit '11e191b197c97fe1512f6b630bac9a642eb2ffdb':
  update required permissions.
 2010-10-01 10:48:35 -07:00
Nick Kralevich
4d68d883a5 update required permissions. 
Change-Id: I49fb855c62aa1a11c8cbf7645aa4dbe2fa18faf3
 2010-10-01 09:34:19 -07:00
Jeff Brown
cc633e4965 resolved conflicts for merge of 4110368b to gingerbread-plus-aosp 
Change-Id: I23f83b1272ba6aef5a4fbadf5e450c1e0b4dd82b
 2010-09-30 16:39:16 -07:00
Nick Kralevich
6a10d397f3 am c70ceb23: initial checkin. Needs lots of love. 
Merge commit 'c70ceb2363a444680aa17c8dcefbf8075e83cc91' into gingerbread-plus-aosp

* commit 'c70ceb2363a444680aa17c8dcefbf8075e83cc91':
  initial checkin.  Needs lots of love.
 2010-09-30 15:21:49 -07:00
Nick Kralevich
c70ceb2363 initial checkin. Needs lots of love. 
Change-Id: I126e355af94915d60d7a97bc3bee84e0a2ad61d4
 2010-09-30 15:16:58 -07:00