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

26733 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitri Plotnikov
4565d52bdd Fixing NPE in CursorLoader 
Change-Id: I8d005473166f43dd018ac304ff9ec606e90483a3
 2010-07-15 18:24:07 -07:00
Robert Greenwalt
0761cea3bf Merge "Fix Emulator boot." 2010-07-15 16:01:25 -07:00
Jaikumar Ganesh
28a8467e51 Merge "Handle Input and network signal changes for HID and tethering." 2010-07-15 16:00:02 -07:00
Jaikumar Ganesh
56d2613965 Handle Input and network signal changes for HID and tethering. 
Change-Id: I7f0c2884bb766189b41093bdcd6241f4540a31f3
 2010-07-15 15:58:34 -07:00
Robert Greenwalt
0a0ba099ed Fix Emulator boot. 
Catch a NPE that doesn't seem to happen on devices.

Change-Id: I47d599afbed76798d8d312a59e30b89664363e93
 2010-07-15 15:51:48 -07:00
Alex Sakhartchouk
51b7ebc652 Merge "Populate java objects with native data from a3d file. Remove legacy constructor from programraster Make a3d object creation synchronous" 2010-07-15 15:19:07 -07:00
Romain Guy
c96cdc9844 Merge "Add support for BitmapShader." 2010-07-15 14:45:37 -07:00
Romain Guy
d27977d1a9 Add support for BitmapShader. 
This change also fixes an issue with the clip and layers.

Change-Id: I5fd9832098d8cf7ae8eb781ff9bffe7defaea279
 2010-07-15 14:44:42 -07:00
Dianne Hackborn
4911b783aa Fix bug where loader listener would be registered twice. 
Also change LoaderManager to an interface.

Change-Id: Ife6d123e56cc6f63b6fe902afac35b2673761e60
 2010-07-15 14:43:13 -07:00
Alex Sakhartchouk
dfac814c18 Populate java objects with native data from a3d file. 
Remove legacy constructor from programraster
Make a3d object creation synchronous

Change-Id: Ic7d7547cf6eee6f9a7c6e3ee12cd104e80056a7b
 2010-07-15 14:02:54 -07:00
Jim Shuma
506821b406 Merge "Making Program*.Builder classes' setters return 'this'" 2010-07-15 13:43:52 -07:00
Jim Shuma
288c8711a6 Making Program*.Builder classes' setters return 'this' 
This is for better correspondence with the Builder pattern.
See also: Effective Java, 2nd edition.

Change-Id: Iecccd42be49dea2ed8e4b8cc38ce96379cf3c11c
 2010-07-15 13:42:02 -07:00
Robert Greenwalt
e80c492546 Merge "Don't cast CONNECTING msgs to CONNECTED." 2010-07-15 13:35:14 -07:00
Dave Sparks
aaa7a0ce47 Merge "Add some javadoc to AudioRecord, plus updates based on code review comments." 2010-07-15 12:35:52 -07:00
Steve Howard
9db328463a am 203ec9fa: am d6343c26: Merge "Interface support for custom HTTP headers in DL manager" into gingerbread 
Merge commit '203ec9fa6eab21621969f36053d4cd59c23977a9'

* commit '203ec9fa6eab21621969f36053d4cd59c23977a9':
  Interface support for custom HTTP headers in DL manager
 2010-07-15 12:31:29 -07:00
Mike Lockwood
3864d243a9 Merge changes I93364c74,I5ca831b8 
* changes:
  Exclude MTP implementation from simulator build
  Fixes for simulator build on lucid
 2010-07-15 12:31:08 -07:00
Steve Howard
203ec9fa6e am d6343c26: Merge "Interface support for custom HTTP headers in DL manager" into gingerbread 
Merge commit 'd6343c26b8580f61a257a3045bfa124049201116' into gingerbread-plus-aosp

* commit 'd6343c26b8580f61a257a3045bfa124049201116':
  Interface support for custom HTTP headers in DL manager
 2010-07-15 12:28:39 -07:00
Mike Lockwood
ff164a7d6f Exclude MTP implementation from simulator build 
Change-Id: I93364c74c26ba6e2bf6b08f1bd82802b966c8dfb
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-15 15:27:38 -04:00
Steve Howard
d6343c26b8 Merge "Interface support for custom HTTP headers in DL manager" into gingerbread 2010-07-15 12:24:14 -07:00
Mike Lockwood
5a23f8c41e Fixes for simulator build on lucid 
strchr and strrchr now return const char* instead of char*

Change-Id: I5ca831b8951af7e6306eb9d9d6f78ed2ec13d649
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-15 15:02:52 -04:00
Scott Main
82e2b4cb51 am 4fd41688: am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 
Merge commit '4fd416880e53c172bac4a51b2eafea699b58badf'

* commit '4fd416880e53c172bac4a51b2eafea699b58badf':
  docs: lots of additions to the resources docs
 2010-07-15 11:54:15 -07:00
James Dong
892681e56e am b068b47c: am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread 
Merge commit 'b068b47c6d0214256116a0c661740bddf7acc18c'

* commit 'b068b47c6d0214256116a0c661740bddf7acc18c':
  Support user-supplied timescales for authoring
 2010-07-15 11:54:10 -07:00
Joe Onorato
dcd077179c am 92a47ea3: am 562124e8: Merge "Clean up some style in the makefiles." into gingerbread 
Merge commit '92a47ea3a7b82708e46c9d1710355f5e5fdd4f07'

* commit '92a47ea3a7b82708e46c9d1710355f5e5fdd4f07':
  Clean up some style in the makefiles.
 2010-07-15 11:54:00 -07:00
Joe Onorato
0dff8d4afd am a6be4e01: am 3a053db2: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread 
Merge commit 'a6be4e01b23610cbcc27c6f26cfa390beabfa1fe'

* commit 'a6be4e01b23610cbcc27c6f26cfa390beabfa1fe':
  The ICU data is no longer compiled directly into the shared library.
 2010-07-15 11:53:51 -07:00
Robert Greenwalt
74d99aabf2 Don't cast CONNECTING msgs to CONNECTED. 
Fixed some logic in TelephonyRegistry so its notion of the state of our connection is
preserved, but it still sends out proper CONNECTING msg on secondary APNS (ie, bringing
up mms while the default connection was already up - it used to send out two CONNECTING
msgs instead of one CONNECTING and one CONNECTED).

Fixes mms while on mobile data.

bug:2840564
Change-Id: I69159aa0f471396680615ce6b9785620d844968f
 2010-07-15 11:51:51 -07:00
Scott Main
4fd416880e am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 
Merge commit '5352d2378d2f92ebe0657e4caedb4498492fc404' into gingerbread-plus-aosp

* commit '5352d2378d2f92ebe0657e4caedb4498492fc404':
  docs: lots of additions to the resources docs
 2010-07-15 11:23:08 -07:00
Scott Main
5352d2378d am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 
Merge commit '38137d7a27b037611c70a9d900aa53b4c15563bf' into gingerbread

* commit '38137d7a27b037611c70a9d900aa53b4c15563bf':
  docs: lots of additions to the resources docs
 2010-07-15 11:20:32 -07:00
James Dong
b068b47c6d am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread 
Merge commit 'd6a85a21418338a7797bff731fa7a551f62a9e86' into gingerbread-plus-aosp

* commit 'd6a85a21418338a7797bff731fa7a551f62a9e86':
  Support user-supplied timescales for authoring
 2010-07-15 11:18:53 -07:00
Scott Main
38137d7a27 Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 2010-07-15 11:16:32 -07:00
James Dong
d6a85a2141 Merge "Support user-supplied timescales for authoring" into gingerbread 2010-07-15 11:16:08 -07:00
Joe Onorato
92a47ea3a7 am 562124e8: Merge "Clean up some style in the makefiles." into gingerbread 
Merge commit '562124e84d8ae63b614b14ba257680571091ef1f' into gingerbread-plus-aosp

* commit '562124e84d8ae63b614b14ba257680571091ef1f':
  Clean up some style in the makefiles.
 2010-07-15 11:12:57 -07:00
Joe Onorato
a6be4e01b2 am 3a053db2: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread 
Merge commit '3a053db28451858162f3dd84f18fae2f245b07f1' into gingerbread-plus-aosp

* commit '3a053db28451858162f3dd84f18fae2f245b07f1':
  The ICU data is no longer compiled directly into the shared library.
 2010-07-15 11:12:53 -07:00
Joe Onorato
ce38d0c2e5 Merge "checkpoint tablet status bar" 2010-07-15 11:09:04 -07:00
Joe Onorato
562124e84d Merge "Clean up some style in the makefiles." into gingerbread 2010-07-15 11:08:39 -07:00
Joe Onorato
3a053db284 Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread 2010-07-15 11:08:34 -07:00
Chet Haase
c3aa361d65 Add various properties to View to allow it to be moved, scaled, faded, and rotated by property manipulation instead of just Animation operations. 
Change-Id: Iefab11f243c7511f7bba0e32bd399ed716b9131f
 2010-07-15 10:45:43 -07:00
Mike Lockwood
d1131401d1 Merge "Remove our copy of the f_mtp.h kernel header, now that it is in bionic." 2010-07-15 10:41:17 -07:00
Mike Lockwood
9c7fdf521b Remove our copy of the f_mtp.h kernel header, now that it is in bionic. 
Change-Id: I2b5e72bf25b3525ace4b919c6e8b6bd6750f6dfa
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-15 13:37:43 -04:00
Jeff Brown
c0689d0b6c am d1313da5: am eb6e0df1: Don\'t build framework tests for simulator target. 
Merge commit 'd1313da5999e06be16e52527cfba443f66b333a1'

* commit 'd1313da5999e06be16e52527cfba443f66b333a1':
  Don't build framework tests for simulator target.
 2010-07-15 10:24:10 -07:00
Fabrice Di Meglio
25fd875da6 Merge "Fix bug #2793828 (Sync/visible setting on the phone should not affect what's visible on the web.)" 2010-07-15 10:23:31 -07:00
Steve Howard
ea9147df00 Interface support for custom HTTP headers in DL manager 
* constants for new DB table, keys for including headers in a
  DownloadProvider.insert() call, and new URIs for retrieving headers
* support in DownloadManager to pass headers to the provider
 2010-07-15 10:22:50 -07:00
Jeff Brown
d1313da599 am eb6e0df1: Don\'t build framework tests for simulator target. 
Merge commit 'eb6e0df18a6567d38caa039ba0b0e49e2e9b46c3' into gingerbread-plus-aosp

* commit 'eb6e0df18a6567d38caa039ba0b0e49e2e9b46c3':
  Don't build framework tests for simulator target.
 2010-07-15 10:21:18 -07:00
Mike Lockwood
c1aea2f38c Merge "SQLiteDatabase: Add mechanism for registering custom sqlite3 functions" 2010-07-15 08:38:18 -07:00
Andrew Stadler
5ba2e74560 am 521e9aa7: am c98e4311: am 468c82e4: Merge "Skip hostname verification when using insecure factory" into froyo 
Merge commit '521e9aa7523220c3dc48f6abd32fad6b76eea114'

* commit '521e9aa7523220c3dc48f6abd32fad6b76eea114':
  Skip hostname verification when using insecure factory
 2010-07-14 23:16:25 -07:00
Jeff Brown
eb6e0df18a Don't build framework tests for simulator target. 
Change-Id: I70f29c7eb307e4f3ec5702f4eb9d97b4342e2f36
 2010-07-14 22:55:02 -07:00
Andrew Stadler
521e9aa752 am c98e4311: am 468c82e4: Merge "Skip hostname verification when using insecure factory" into froyo 
Merge commit 'c98e431119867dbc4ae3da52d5c374607c0f67b9' into gingerbread-plus-aosp

* commit 'c98e431119867dbc4ae3da52d5c374607c0f67b9':
  Skip hostname verification when using insecure factory
 2010-07-14 22:39:19 -07:00
Andrew Stadler
c98e431119 am 468c82e4: Merge "Skip hostname verification when using insecure factory" into froyo 
Merge commit '468c82e4be0630de04a50d88602cd8c6bc745962' into gingerbread

* commit '468c82e4be0630de04a50d88602cd8c6bc745962':
  Skip hostname verification when using insecure factory
 2010-07-14 22:33:42 -07:00
Andrew Stadler
468c82e4be Merge "Skip hostname verification when using insecure factory" into froyo 2010-07-14 22:26:56 -07:00
Mathias Agopian
53459436ed am c74034b6: am 24651682: added BinderService<> template to help creating native binder services 
Merge commit 'c74034b6bf0940dc80c4d4efa1e677ad0d2dfd6c'

* commit 'c74034b6bf0940dc80c4d4efa1e677ad0d2dfd6c':
  added BinderService<> template to help creating native binder services
 2010-07-14 20:18:50 -07:00
Mathias Agopian
c74034b6bf am 24651682: added BinderService<> template to help creating native binder services 
Merge commit '24651682edaf71e8a826f23a7ea09bc97c8072c4' into gingerbread-plus-aosp

* commit '24651682edaf71e8a826f23a7ea09bc97c8072c4':
  added BinderService<> template to help creating native binder services
 2010-07-14 20:16:27 -07:00