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
Merge commit 'ebb0b03e170b724e04a0d44bfd1ccb02452f5f57'
* commit 'ebb0b03e170b724e04a0d44bfd1ccb02452f5f57':
Prepare for a new IActivityController method.
Merge commit 'd424b8d9ccb569c4a2f01de248068fd130e3bd82' into gingerbread-plus-aosp
* commit 'd424b8d9ccb569c4a2f01de248068fd130e3bd82':
Prepare for a new IActivityController method.
Merge commit '310187112b211f24c074fd9e34db9dddc59158f3'
* commit '310187112b211f24c074fd9e34db9dddc59158f3':
Add an activity to Dev Tools that shows the Configuration and DisplayMetrics.
Merge commit '7d26cd198266cd48cb0a912585419fbe0cc8ed89' into gingerbread-plus-aosp
* commit '7d26cd198266cd48cb0a912585419fbe0cc8ed89':
Add an activity to Dev Tools that shows the Configuration and DisplayMetrics.
Merge commit '0fd0e932d2c09fad85c36fc555c9388b38cb2956'
* commit '0fd0e932d2c09fad85c36fc555c9388b38cb2956':
Activity/provider used is restricted to the application's Package, but can be spread across other packages as well.
Merge commit '898004c4b2322c8fece08944731eed9fc08a14a5' into gingerbread-plus-aosp
* commit '898004c4b2322c8fece08944731eed9fc08a14a5':
Activity/provider used is restricted to the application's Package, but can be spread across other packages as well.
A better way to construct the activity name should be by getting the substring from the fully qualified classname
itself and not using the PackageInfo.
Credit:Ritu Srivastava
Change-Id: I9ff5a27d828d5d3836bb55101cb947f670ea5941
Merge commit '71027e1b75951c90c22c9979a505381fae843ed3' into froyo-plus-aosp
* commit '71027e1b75951c90c22c9979a505381fae843ed3':
Provision the backup manager in the SDK System image.
Merge commit '71027e1b75951c90c22c9979a505381fae843ed3' into kraken
* commit '71027e1b75951c90c22c9979a505381fae843ed3':
Provision the backup manager in the SDK System image.
Different languages might have different word orders, so add in
positional parameters for strings that have more than one substitution.
Change-Id: Ie9fc74eb0a22471b272e65c6cd521f1518b322d1
