LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,259 Commits 2 Branches 0 Tags
b24e80eedd09584898af85ce14e67675f330bf96
Commit Graph

4259 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
b24e80eedd Merge branch 'gingerbread' into gingerbread-release 2010-10-06 07:44:57 -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
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
97d3699cd9 Have TagBroadcastReceiver start the SaveTag activity. 
Change-Id: I6dc8757ca7eec87efe622b0b2688dd29c5883185
 2010-10-05 15:28:45 -07:00
Nick Kralevich
afad3fa14a new icon. 
Change-Id: I17751bbd0dc9d900002ef68ee51a4ddaf1600281
 2010-10-05 12:44:50 -07:00
Nick Kralevich
08ad0fde5e Merge "new SaveTag activity, additional utilities" into gingerbread 2010-10-05 12:22:20 -07:00
The Android Automerger
069675bdae Merge branch 'gingerbread' into gingerbread-release 2010-10-05 07:12:57 -07:00
Dianne Hackborn
8bcb38f3d4 Merge "New API demo showing different screen orientation options." into gingerbread 2010-10-04 14:53:33 -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
The Android Automerger
17728b2dba Merge branch 'gingerbread' into gingerbread-release 2010-10-04 07:13:13 -07:00
Dianne Hackborn
bf895af17d New API demo showing different screen orientation options. 
Change-Id: I75b206f86ee87b50cccc5e23140d55bd566781cd
 2010-10-02 16:56:56 -07:00
Nick Kralevich
e97e78a060 Make unittests work, new TagBroadcastReceiver 
Change-Id: I5a3a1938a7fb91c8114447d24427f2c263bda5a3
 2010-10-01 16:09:03 -07:00
Brad Fitzpatrick
9c1a73ba8a Update Monkey to new StrictMode API. 
Change-Id: I0f2e90496c4dece8ee3766170d8a1fe2d22a7ff4
 2010-10-01 10:48:01 -07:00
Nick Kralevich
11e191b197 Merge "update required permissions." into gingerbread 2010-10-01 09:44:27 -07:00
Ying Wang
45550faad0 Merge "Don't send non-existent system keys." into gingerbread 2010-10-01 09:42:13 -07:00
Nick Kralevich
4d68d883a5 update required permissions. 
Change-Id: I49fb855c62aa1a11c8cbf7645aa4dbe2fa18faf3
 2010-10-01 09:34:19 -07:00
The Android Automerger
c32bdd1b09 Merge branch 'gingerbread' into gingerbread-release 2010-10-01 07:16:47 -07:00
Jeff Brown
4110368b93 Merge "Improve touch paint sample to use geometrical touch width." into gingerbread 2010-09-30 15:58:59 -07:00
Jeff Brown
fc1ee06369 Improve touch paint sample to use geometrical touch width. 
Added multitouch support.
Fixed the trackball based drawing.

Change-Id: I15d9c5c4ac26a83f476f98c1f2ef3a5841e2ffbd
 2010-09-30 15:32:28 -07:00
Nick Kralevich
c70ceb2363 initial checkin. Needs lots of love. 
Change-Id: I126e355af94915d60d7a97bc3bee84e0a2ad61d4
 2010-09-30 15:16:58 -07:00
Xavier Ducrohet
76afc004df Integrate sdk.atree changes from master. DO NOT MERGE 
- Move adb to the platform-tools.
- Update the windows build for it.
- Split the tools component from sdk.atre into sdk/build/tools.atree

Change-Id: I75608f12d6e1d8bc0f470e3ca26c7e550cfdcbd6
 2010-09-30 11:33:21 -07:00
The Android Automerger
ecb7b3b2b6 Merge branch 'gingerbread' into gingerbread-release 2010-09-30 07:10:54 -07:00
Kenny Root
12c86756b9 Merge "Add OBB usage example" into gingerbread 2010-09-29 17:19:14 -07:00
Kenny Root
b9e80e74e2 Add OBB usage example 
Change-Id: I7da5ac0009cb32829e7c6470c0a60ebff2988905
 2010-09-29 16:18:08 -07:00
Ying Wang
5ee69f6f2c Don't send non-existent system keys. 
Send only if the system key physically exists.

Change-Id: I8fa102db679c55e5bfba1c9a68ecf2bc196021cd
 2010-09-29 13:23:56 -07:00
Eric Fischer
f4578730bf Genericize strings with SD card references. 
Change-Id: Ife7f7178b7ba11650bb81a6afc61e70e4b8a7b4f
 2010-09-29 10:56:20 -07:00
The Android Automerger
516bb386c0 Merge branch 'gingerbread' into gingerbread-release 2010-09-27 07:36:41 -07:00
Jean-Baptiste Queru
7159b406ef reconcile froyo-release into gingerbread 
Change-Id: I0cd475594cd7697ee681bfc7eb76d61bec236417
 2010-09-26 17:28:54 -07:00
The Android Automerger
9cd53761ec Merge branch 'gingerbread' into gingerbread-release 2010-09-26 12:36:26 -07:00
David 'Digit' Turner
be57246603 Merge "Update prebuilt library test." into gingerbread 2010-09-24 01:12:54 -07:00
Dianne Hackborn
d424b8d9cc Prepare for a new IActivityController method. 
Change-Id: I30823fe0c06aef35a2773760ec938e7979cd1037
 2010-09-23 14:51:56 -07:00
David 'Digit' Turner
1f0003f57d Merge "Unify NDK platform headers." into gingerbread 2010-09-23 07:35:51 -07:00
David 'Digit' Turner
7012117d4a Unify NDK platform headers. 
This commit removes duplication of system headers per platform, i.e. remove
copies of common headers like <stdlib.h> from arch-arm/usr/include and arch-x86/usr/include
and move them to a common include directory. More specifically:

- common headers:        android-N/arch-A/usr/include --> android-N/include
- arch-specific headers: android-N/arch-A/usr-include --> android-N/arch-A/include
- arch-specific libs:    android-N/arch-A/usr/lib     --> android-N/arch-A/lib

Change-Id: Ifdba5038d108901931f3e3a7c14ebe6270d2d276

NOTE: This also contains careful separation of API-level-specific headers.
      For example, platforms/android-5/include/pthread.h contains new function
      declarations that are not available when using platforms/android-3/include/pthread.h

NOTE: The NDK's build-platforms.sh script has been updated to understand the new
      layout. This change in develeopment/ndk does not change the layout of
      platform files under $NDK/platforms after build-platforms.sh is called.
 2010-09-22 18:04:36 +02:00
The Android Automerger
e6fa367ebc Merge branch 'gingerbread' into gingerbread-release 2010-09-22 07:12:08 -07:00
David 'Digit' Turner
2068cc393b Update prebuilt library test. 
This is to reflect the simplification in prebuilt support.
1/ LOCAL_SRC_FILES is relative to LOCAL_PATH, like with other module types
2/ no need for LOCAL_PREBUILTS

Change-Id: If7302fe355cb25a446e31c20015098db75c00c02
 2010-09-22 15:11:57 +02:00
Brett Chabot
14282f9796 Merge "Change hosttestlib to use ddm-prebuilt." into gingerbread 2010-09-21 14:28:26 -07:00
Andy Stadler
9b2d35f0a8 DO NOT MERGE Classpath cleanup in libcore 
* libcore/security no longer exists
* many other dirs under libcore had no java code

Change-Id: I1fcfda6ce769e0d9fbd4893c46bbded586c78251
 2010-09-21 14:07:22 -07:00
Brett Chabot
fb0b7c06a7 Change hosttestlib to use ddm-prebuilt. 
Change-Id: I9124f34e6ba5559afc9a4bf9b5c70690385db11a
 2010-09-21 11:44:23 -07:00
The Android Automerger
7f6880bdd3 Merge branch 'gingerbread' into gingerbread-release 2010-09-17 17:28:08 -07:00
Andy Stadler
97903767d3 Cleanups for eclipse classpath DO NOT MERGE 
Change-Id: Ic4ab8299eb2e17f01346887d22620c0f23399328
 2010-09-17 15:59:20 -07:00
The Android Automerger
f972446f56 Merge branch 'gingerbread' into gingerbread-release 2010-09-15 07:11:34 -07:00
Jeff Brown
2405e67fad Merge "Update NDK headers and samples to sync up with looper API changes." into gingerbread 2010-09-14 15:27:41 -07:00
The Android Automerger
2963322578 Merge branch 'gingerbread' into gingerbread-release 2010-09-14 08:24:50 -07:00
Jeff Brown
9f44e97108 Update NDK headers and samples to sync up with looper API changes. 
Change-Id: I7082603bf280888be90dc4df687521aaae9b1d02
 2010-09-14 02:02:15 -07:00
Megha Joshi
3471dafa11 am 42d3a4ae: Adding CrossCompatibility sample app. 
Merge commit '42d3a4ae1431fb3f02ac212000e8cdfb6f21e226' into gingerbread

* commit '42d3a4ae1431fb3f02ac212000e8cdfb6f21e226':
  Adding CrossCompatibility sample app.
 2010-09-13 17:38:43 -07:00
Megha Joshi
42d3a4ae14 Adding CrossCompatibility sample app. 
Change-Id: I565584ea53212f61a9fbbb44e50da59f4ba06fff
 2010-09-13 17:00:10 -07:00
The Android Automerger
a71a46d821 Merge branch 'gingerbread' into gingerbread-release 2010-09-13 07:49:08 -07:00
Trevor Johns
12d3ad89e4 am e55fc016: Merge "Use remote_api for shell access on developer.android.com." into froyo 
Merge commit 'e55fc016a6e40edd456c0d240d06689d84a7127b' into gingerbread

* commit 'e55fc016a6e40edd456c0d240d06689d84a7127b':
  Use remote_api for shell access on developer.android.com.
 2010-09-10 12:33:57 -07:00
Trevor Johns
e55fc016a6 Merge "Use remote_api for shell access on developer.android.com." into froyo 2010-09-10 12:23:09 -07:00