drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,937 Commits 1 Branch 0 Tags
Commit Graph

9851 Commits

Author SHA1 Message Date
Adam Powell
ec66a3a9e0 Fix docs for MenuItem#setShowAsAction 
Change-Id: Id68273dde9c0ce904bca7b40aa2e9558880c55c2
 2010-07-19 15:51:17 -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
Romain Guy
7fac2e1833 Add plumbing to support gradients in OpenGL renderer. 
The LinearGradient class keeps a copy of the various parameters that
define the gradient. The copies are native arrays to avoid copying
Java arrays on every draw call. The gradient code path is implemented
until OpenGLRenderer::drawRect() (see TODO.) The actual gradient
implementation will be added in a latter change.

Change-Id: I9300d250ef5e2e9c2e097c3116ee71dfc9d752d8
 2010-07-16 17:10:13 -07:00
Jean-Baptiste Queru
cc0aad38f0 Fix build. 
Switch to using public APIs instead of private ones.

Change-Id: Ia3468d94b3dadeb6a000ce419ee08f7e7ba5dc67
 2010-07-16 15:18:56 -07:00
Romain Guy
9a89b0e1b9 Merge "Improve clip support (add intersect, union and replace.)" 2010-07-16 14:13:48 -07:00
Romain Guy
079ba2c85b Improve clip support (add intersect, union and replace.) 
This change also modifies the way the clip is stored. The clip is now
always stored in screen-space coordinates.

Change-Id: I96375784d82dfe975bc6477a159e6866e7052487
 2010-07-16 14:12:24 -07:00
Chet Haase
9bc829cc15 Fixing view property invalidation issues 
Change-Id: I51d2c03cabacfc1a7c05073977e7c22d32de7cb3
 2010-07-16 14:08:05 -07:00
The Android Open Source Project
bf4564f03d am 5adfe6c5: merge from open-source master 
Merge commit '5adfe6c56369b48e10493c0bb9e9b64ac553a19f'

* commit '5adfe6c56369b48e10493c0bb9e9b64ac553a19f':
  Fix the problem that color drawable cache key conflicts another drawable one.
 2010-07-16 14:06:06 -07:00
The Android Open Source Project
a508668309 am c9ecd445: merge from open-source master 
Merge commit 'c9ecd445b86552265b4adb90e5df2fbe5f71cb8e'

* commit 'c9ecd445b86552265b4adb90e5df2fbe5f71cb8e':
  Added method getPreferredHttpHost
 2010-07-16 14:01:43 -07:00
The Android Open Source Project
5adfe6c563 merge from open-source master 
Change-Id: Iacd42b06fa01fa6dfd18b81f07ce4b6da922dfff
 2010-07-16 14:01:37 -07:00
The Android Open Source Project
c9ecd445b8 merge from open-source master 
Change-Id: I6bdeeff30be1fdb0901aec9bcdd67176c29eaf7b
 2010-07-16 13:58:43 -07:00
The Android Open Source Project
506e6e0882 am 3a94ab02: merge from open-source master 
Merge commit '3a94ab026f0434624f233e99b1a0aadb9152a09a'

* commit '3a94ab026f0434624f233e99b1a0aadb9152a09a':
  Allow ListPreference summary to use entry
 2010-07-16 13:56:16 -07:00
The Android Open Source Project
62dfcf38b5 am 3b97e5a6: merge from open-source master 
Merge commit '3b97e5a6270f40111117c4d3f1e964154ddea0fe'

* commit '3b97e5a6270f40111117c4d3f1e964154ddea0fe':
  Make HTTP Header class handle multiple cache-control fields.
 2010-07-16 13:52:45 -07:00
The Android Open Source Project
3a94ab026f merge from open-source master 
Change-Id: Ib00a02e90d5c2c0b4cc1919258b858930967198b
 2010-07-16 13:50:12 -07:00
The Android Open Source Project
3b97e5a627 merge from open-source master 
Change-Id: Ic91d205e7fd6a71320d9a4498643d384397dfb00
 2010-07-16 13:48:39 -07:00
Adam Powell
250fd97123 Merge "Overflow menu for action bars." 2010-07-16 11:52:55 -07:00
Dmitri Plotnikov
11811612e8 Merge "Resolving a field naming conflict caused by the table join." 2010-07-16 11:21:00 -07:00
Dmitri Plotnikov
86fe839284 Resolving a field naming conflict caused by the table join. 
Change-Id: I6f3293fb9aceebea7df9677eb1e6ebc199383e99
 2010-07-16 11:19:46 -07:00
Dmitri Plotnikov
6b477fe452 Merge "Hiding new API" 2010-07-16 10:46:40 -07:00
Dmitri Plotnikov
e270c51ea4 Hiding new API 
Change-Id: Ie6a108442416fdb27229ff274b631e6f4a6c2370
 2010-07-16 10:46:00 -07:00
Dmitri Plotnikov
393e4801d8 Merge "Adding more feature declarations to Directory API." 2010-07-16 10:45:18 -07:00
Dmitri Plotnikov
30b7be333f Adding more feature declarations to Directory API. 
Change-Id: Iabec8c4dcbd69212285a6eb9be9db7ebb1b712ed
 2010-07-16 10:43:40 -07:00
Adam Powell
8028dd32a4 Overflow menu for action bars. 
The overflow menu replaces the normal options menu panel for
activities with an action bar. It always appears as the rightmost
action button and is displayed as a dropdown menu. The menu key
summons and dismisses the overflow menu instead of the options panel
where applicable.

Change-Id: I0b4fa7e36f35ab12e2f0c1d12bec79ccab8cc4b1
 2010-07-16 10:22:31 -07:00
Jeff Brown
eb857f12d6 resolved conflicts for merge of f7adbe10 to master 
Change-Id: I898a5e53b180adaee2337c0c0b9896c799d056e7
 2010-07-16 10:06:33 -07:00
Kenny Root
94919a170f am f97b21b5: am bd623daf: Undo IMediaContainerService changes 
Merge commit 'f97b21b54e2e35fdfcc8614dedd8692d5a535a5e'

* commit 'f97b21b54e2e35fdfcc8614dedd8692d5a535a5e':
  Undo IMediaContainerService changes
 2010-07-16 09:12:36 -07:00