Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,020 Commits 3 Branches 0 Tags
3dd207a6dbd5d9244dc7fe213d5caa3cddaff0db
Commit Graph

9875 Commits

Author SHA1 Message Date
Chet Haase
3dd207a6db Add keyframes to animation framework. 
Change-Id: I5c8c8037aeeedae1ce7a18200986caf57264772f
 2010-07-21 08:00:40 -07:00
Danica Chang
eaeffac5fc Merge "deleted ScoSocket.java and android_bluetooth_ScoSocket.cpp" 2010-07-20 12:47:45 -07:00
Adam Powell
7bb66f3245 Merge "Action bar context mode support for overflow, submenus" 2010-07-20 12:15:08 -07:00
Adam Powell
2c9c9fe806 Action bar context mode support for overflow, submenus 
Change-Id: I951ae179698b08b6aba5b174b3d47f0cf847352e
 2010-07-20 12:08:07 -07:00
Jean-Baptiste Queru
99a518ffab resolved conflicts for merge of ca48433a to master 
Change-Id: I0dd2dee65ff72b7eae20019c6232b66388fe7990
 2010-07-20 10:40:17 -07:00
The Android Open Source Project
ca48433afc merge from open-source master 
Change-Id: I1901177e8a4bd32a707020c581f25f21349ba571
 2010-07-20 10:33:38 -07:00
The Android Open Source Project
bd7599ff0c am fcff6910: merge from open-source master 
Merge commit 'fcff691057fecdedd6d3033da672d1a473c76066'

* commit 'fcff691057fecdedd6d3033da672d1a473c76066':
  typo fixed
 2010-07-20 10:28:35 -07:00
The Android Open Source Project
fcff691057 merge from open-source master 
Change-Id: I2a8ec9d290fc1040ba53b9fe73f92b7f90dfdf16
 2010-07-20 10:25:37 -07:00
Chet Haase
358af100ed Merge "Fix bugs in Sequencer" 2010-07-20 10:07:53 -07:00
Romain Guy
c0ac193b94 Add support for linear gradients. 
Change-Id: Id15329da065045b3f06fdaed615f33cd57608496
 2010-07-19 18:44:05 -07:00
Daniel Lehmann
156add9575 Replace try-catch code by proper type checking. Saves an exception for each blob. 
Change-Id: I208ed0acb754391bd44b52887792563e92b39011
 2010-07-19 18:01:28 -07:00
Chet Haase
010dbaa123 Fix bugs in Sequencer 
Change-Id: I03aebe8d822bef0b9e163ba3280699ca02a6563c
 2010-07-19 17:41:03 -07:00
Winson Chung
121d7d86d2 Merge "Fixing build breakage due to misnamed javadoc variable." 2010-07-19 16:07:33 -07:00
Winson Chung
95362595ed Fixing build breakage due to misnamed javadoc variable. 
Change-Id: I883a53107d2c0fcd4544c85811aeaad3fc4f13c2
 2010-07-19 16:05:50 -07:00
Christian Mehlmauer
798e2d3d0c Replaced /sdcard with Environment.getExternalStorageDirectory() 
Change-Id: Id789f44a8569e307b1b7ab15eb266c9ce7ef2029
 2010-07-19 15:54:40 -07:00
Adam Powell
16ba106de5 Merge "Fix docs for MenuItem#setShowAsAction" 2010-07-19 15:52:02 -07:00
Adam Powell
ec66a3a9e0 Fix docs for MenuItem#setShowAsAction 
Change-Id: Id68273dde9c0ce904bca7b40aa2e9558880c55c2
 2010-07-19 15:51:17 -07:00
Adam Powell
3b1f1bce1c Merge "Fix bug 2852909 - screen density for contextual action bar" 2010-07-19 15:48:53 -07:00
Adam Powell
dcdefbbff2 Fix bug 2852909 - screen density for contextual action bar 
Change-Id: I9e3d8fe4e6f5eb0282cc103a98ed60ca2911c91e
 2010-07-19 15:46:48 -07:00
Madan Ankapura
ae96f634ec typo fixed 
Change-Id: Ie7cff39929ae53ce03409afadcae58548ec22cc8
 2010-07-19 15:43:00 -07:00
Vasu Nori
3766ed3eed am a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread 
Merge commit 'a5fe776a7933b2241858ef83f01b812c7badc231' into gingerbread-plus-aosp

* commit 'a5fe776a7933b2241858ef83f01b812c7badc231':
  fix javadoc error which breaks SDK build in gingerbread
 2010-07-19 15:29:10 -07:00
Mason Tang
19f845804c Added support for full-text search in Calendar 
Change-Id: I716eba966ad072ac62a61f3cfbfe15b623f8ab94
 2010-07-19 15:28:23 -07:00
Vasu Nori
a5fe776a79 Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread 2010-07-19 15:26:39 -07:00
Vasu Nori
345f39a8a3 fix javadoc error which breaks SDK build in gingerbread 
Change-Id: I01b90c71e7088f385a73f51144063a2fbe5d466b
 2010-07-19 15:25:32 -07:00
Winson Chung
456a00c4ae Merge "Initial changes to allow collections in widgets." 2010-07-19 15:02:33 -07:00
Winson Chung
499cb9f516 Initial changes to allow collections in widgets. 
Change-Id: I3cfa899bae88cd252912cecebc12e93c27a3b7c9
 2010-07-19 14:48:31 -07:00
Vasu Nori
6b98ece3e5 Merge "fix javadoc error" 2010-07-19 14:13:57 -07:00
Vasu Nori
fb5bccf229 fix javadoc error 
Change-Id: I387e2807af2ea6299a976e0763e6ad6f264543fe
 2010-07-19 14:11:54 -07:00
Danica Chang
cab94f75aa am cbbd3a1b: am f23682f1: Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread 
Merge commit 'cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed'

* commit 'cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed':
  fixed parsing issue in BluetoothService so that it parses the UUID property correctly
 2010-07-19 13:52:38 -07:00
Danica Chang
cbbd3a1b95 am f23682f1: Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread 
Merge commit 'f23682f128151def4d83d3e2422aea36e0a00061' into gingerbread-plus-aosp

* commit 'f23682f128151def4d83d3e2422aea36e0a00061':
  fixed parsing issue in BluetoothService so that it parses the UUID property correctly
 2010-07-19 13:50:49 -07:00
Danica Chang
f23682f128 Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread 2010-07-19 13:47:50 -07:00
The Android Open Source Project
87497936f5 am 27dfb307: merge from open-source master 
Merge commit '27dfb3070adc90ddfcc398a352de1741f52add03'

* commit '27dfb3070adc90ddfcc398a352de1741f52add03':
  Replaced deprecated calls to setButton and setButton2
 2010-07-19 12:54:10 -07:00
The Android Open Source Project
27dfb3070a merge from open-source master 
Change-Id: Ia37601f1c8e38a81bfc82b90a05bd3dae20dac88
 2010-07-19 12:49:39 -07:00
The Android Open Source Project
18814b4c8a am 9ab60279: merge from open-source master 
Merge commit '9ab60279fdbf0d9e9279ae74cdc1a223d9785ce6'

* commit '9ab60279fdbf0d9e9279ae74cdc1a223d9785ce6':
  Replaced deprecated setButton Methodcalls
 2010-07-19 12:48:47 -07:00
Fabrice Di Meglio
b9b918d6e1 Merge "Fix bug #2846543 Delete HIDDEN column from the "Calendars" table" 2010-07-19 12:30:01 -07:00
The Android Open Source Project
9ab60279fd merge from open-source master 
Change-Id: Iae0a5fadd57d651a614ed1c07afc949fe0637551
 2010-07-19 12:17:53 -07:00
Mike Lockwood
f17896df20 Merge "Add MTP_OBJECT_ID column name to MediaStore.MediaColumns" 2010-07-19 11:31:38 -07:00
Romain Guy
4598804045 Merge "Replaced deprecated calls to setButton and setButton2" 2010-07-19 10:30:16 -07:00
Romain Guy
5671b28092 Merge "Replaced deprecated setButton Methodcalls" 2010-07-19 10:29:59 -07:00
Danica Chang
7a9de8b425 fixed parsing issue in BluetoothService so that it parses the UUID property correctly 
Change-Id: If46fd3ae1a0e6393cd47a8f0dc913cef45e05441
 2010-07-19 10:03:13 -07:00
Mike Lockwood
cbaea35759 Add MTP_OBJECT_ID column name to MediaStore.MediaColumns 
This column will be added to the images, audio_meta, video and audio_playlist
tables to cross reference to the MTP objects table.

Renamed MTP_OBJECT_HANDLE (which is used only by the media scanner) to
MEDIA_SCANNER_NEW_OBJECT_ID to avoid confusion.

Change-Id: I8093485dc0438f408a505e82ffddd0710c7a512c
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-19 09:51:56 -04:00
Leon Clarke
387b6580b8 Cancel test selections when they start if the client hasn't overridden the 
selection behavior.
http://b/issue?id=2847546

Change-Id: I0d8529add54b3dfbf0af239fda1b15edd7bd32e0
 2010-07-19 14:36:28 +01:00
Vasu Nori
df46069627 am bbc2b4e6: am 5b31498b: add video/audio chat-compatibility modes to ContactsContract 
Merge commit 'bbc2b4e69a1788987a8fe959cc0105290b431283'

* commit 'bbc2b4e69a1788987a8fe959cc0105290b431283':
  add video/audio chat-compatibility modes to ContactsContract
 2010-07-17 18:31:28 -07:00
Vasu Nori
bbc2b4e69a am 5b31498b: add video/audio chat-compatibility modes to ContactsContract 
Merge commit '5b31498ba1f9874f395d80152304512fa4c0144d' into gingerbread-plus-aosp

* commit '5b31498ba1f9874f395d80152304512fa4c0144d':
  add video/audio chat-compatibility modes to ContactsContract
 2010-07-17 18:25:20 -07:00
Vasu Nori
5b31498ba1 add video/audio chat-compatibility modes to ContactsContract 
Change-Id: Ic0b04017ad4216f1a1c5f07fa9d27e6970ded931
 2010-07-17 18:16:31 -07:00
Romain Guy
33e72aef05 Make View transforms work again. 
Change-Id: I42aa8b5a55d7584ed242e1cb1f7123a6354edbc8
 2010-07-17 14:26:44 -07:00
Adam Powell
b5de9f3baf Fix bug 2845609 - Touch event dispatching problem. 
Maintain the state of the CANCEL_NEXT_UP_EVENT flag properly.

Change-Id: I5ca22409bf8557c486d02806811b10550c5576eb
 2010-07-17 01:51:25 -07:00
Fabrice Di Meglio
0980de8976 Fix bug #2846543 Delete HIDDEN column from the "Calendars" table 
- suppress the "hidden" column from the Calendar API
- add generic "sync5" column which will contain the "hidden" calendar state from the server

Change-Id: Ib2048e9f0fc59f4f544bc6f1787af82fde3984d5
 2010-07-16 20:22:28 -07:00
Chet Haase
5700c95f40 Merge "Fixing view property invalidation issues" 2010-07-16 17:39:44 -07:00
Romain Guy
ea2604d966 Merge "Add plumbing to support gradients in OpenGL renderer." 2010-07-16 17:13:26 -07:00