Commit Graph

38903 Commits

Author SHA1 Message Date
Dianne Hackborn
ef769f6e48 Some improvements to ListFragment.
- Take care of hiding/showing list automatically for normal behavior.
- Make list_content public for others to use.

Change-Id: Iecb7b70775d390d4e28e5c0dd6ba7278581b2734
2010-07-12 17:45:51 -07:00
Dirk Dougherty
798dc2f518 am 6ba9e6fb: am 5a93032d: doc change: resolved conflicts for merge of 3c691a8d to gingerbread
Merge commit '6ba9e6fbef64da3dacb66e2833ce847e94694d7e'

* commit '6ba9e6fbef64da3dacb66e2833ce847e94694d7e':
  Doc change: add notes for ndk r4b.
2010-07-12 17:45:12 -07:00
Dirk Dougherty
6ba9e6fbef am 5a93032d: doc change: resolved conflicts for merge of 3c691a8d to gingerbread
Merge commit '5a93032dcbe54223e03102d497d7e04370491737' into gingerbread-plus-aosp

* commit '5a93032dcbe54223e03102d497d7e04370491737':
  Doc change: add notes for ndk r4b.
2010-07-12 17:42:33 -07:00
Dirk Dougherty
5a93032dcb doc change: resolved conflicts for merge of 3c691a8d to gingerbread
Conflicts:
	docs/html/sdk/android-2.2.jd

Change-Id: I58f9503db8692df15dba1277a46e4c6eb338b438
2010-07-12 17:30:05 -07:00
Dianne Hackborn
24117ce3ae Fix issue #2834005: Android Settings.Secure bypass
Change-Id: Ic4f14e2ff5c2b4f623405d30389863a9e3e82572
2010-07-12 17:21:50 -07:00
Kenny Root
8335619363 Merge "Change Javadoc to get around brokenness" 2010-07-12 17:13:48 -07:00
Dirk Dougherty
3c691a8d7f Doc change: add notes for ndk r4b.
Change-Id: Idf4e4d2ac2ed9c30b3afe258546861084f3f20aa
2010-07-12 15:51:01 -07:00
Alex Sakhartchouk
80a4c2cd34 Work on synchronizing a3d created files and java layer.
Adding culling to ProgramRaster

Change-Id: I58ccc82d37edc9539289d5eba44ea0e720874af5
2010-07-12 15:50:32 -07:00
The Android Open Source Project
2a6560bcb8 am 7b1a2079: merge from open-source master
Merge commit '7b1a2079227cd93d1d92088fed0df2351705cbe4'

* commit '7b1a2079227cd93d1d92088fed0df2351705cbe4':
  Fixed a Documentation Error in the AsyncTask Contstructor
2010-07-12 15:40:34 -07:00
The Android Open Source Project
7832efe7da am f079a659: merge from open-source master
Merge commit 'f079a659774473324b5739652c014229189a10ff'

* commit 'f079a659774473324b5739652c014229189a10ff':
  Fix hang when error in SIM card communication
2010-07-12 15:36:24 -07:00
The Android Open Source Project
7b1a207922 merge from open-source master
Change-Id: I48def3afdbc7ac72ea624d8ad350c4722262690e
2010-07-12 15:35:31 -07:00
Andrew Stadler
df27c0c262 Skip hostname verification when using insecure factory
If the factory was obtained by calling getInsecure(), calls to
createSocket() should skip hostname verification (along with all of the
other skipped safety checks.)

This change slightly relaxes the too-strict checking that was introduced
in change 7fc93c36ae.

Bug: 2834174
Change-Id: Iab7ef861ad0ca727f82ee8cdb78b89b9e835740d
2010-07-12 15:31:40 -07:00
The Android Open Source Project
b812925aee am b65d2256: merge from open-source master
Merge commit 'b65d225633d14326d1ba2af862861e92d7ea45bc'

* commit 'b65d225633d14326d1ba2af862861e92d7ea45bc':
  Reduced Warnings by adding Type Arguments and removing unused imports
2010-07-12 15:30:04 -07:00
The Android Open Source Project
f079a65977 merge from open-source master
Change-Id: I3af7e5270229f9fc6c57c9449052025af2a9bdca
2010-07-12 15:28:22 -07:00
The Android Open Source Project
b65d225633 merge from open-source master
Change-Id: I992e2a407b1d8f7f29cb7153d4c2e3945e60b57a
2010-07-12 15:26:21 -07:00
The Android Open Source Project
2f42aa54b4 am 6fb70b5a: merge from open-source master
Merge commit '6fb70b5a9f41f198ee4bc1ed3efeca6f8ccdc5d9'

* commit '6fb70b5a9f41f198ee4bc1ed3efeca6f8ccdc5d9':
  Documentation Bug (Issue 9557)
2010-07-12 15:24:45 -07:00
The Android Open Source Project
6fb70b5a9f merge from open-source master
Change-Id: Ib01b5c62c229817b6620692a8ae0211230813899
2010-07-12 15:21:50 -07:00
Robert Ly
8ef63e8bf0 am f9a71640: am b1008010: am ef13d028: docchange: fixed typo "Pacskage" to "Package"
Merge commit 'f9a71640b8ffa1dd1c727f7dd5f33e710dc31c49'

* commit 'f9a71640b8ffa1dd1c727f7dd5f33e710dc31c49':
  docchange: fixed typo "Pacskage" to "Package"
2010-07-12 15:14:32 -07:00
Robert Ly
f9a71640b8 am b1008010: am ef13d028: docchange: fixed typo "Pacskage" to "Package"
Merge commit 'b10080106909fd860ed33ac46de9f2f084e358d6' into gingerbread-plus-aosp

* commit 'b10080106909fd860ed33ac46de9f2f084e358d6':
  docchange: fixed typo "Pacskage" to "Package"
2010-07-12 15:11:25 -07:00
Robert Ly
b100801069 am ef13d028: docchange: fixed typo "Pacskage" to "Package"
Merge commit 'ef13d028217ac9766735f627dedc4fc7f48a6f1f' into gingerbread

* commit 'ef13d028217ac9766735f627dedc4fc7f48a6f1f':
  docchange: fixed typo "Pacskage" to "Package"
2010-07-12 15:07:40 -07:00
Guang Zhu
abcdecc017 dependent change for "parse instrumentation result bundles" in sdk
Change-Id: Ie3708d30620a703909829c32f5599816cc52b3f6
2010-07-12 15:00:36 -07:00
Robert Ly
ef13d02821 docchange: fixed typo "Pacskage" to "Package"
Change-Id: I6004dc7743dcd74315cbfc2cccc306ff8724e569
2010-07-12 14:55:59 -07:00
Romain Guy
260e102162 Optimize shader binding changes.
This change also cleans up the internal API a little bit by using mat4
everywhere instead of float[16] (for the ortho matrix for instance.)

Change-Id: I35924c7dc17bad17f30307118d5ed437c2ed37e0
2010-07-12 14:43:40 -07:00
Alex Yakavenka
35dbaf2c62 Cat: Move Stk imlpementation into Cat folder
Change-Id: I18e9e2cd11570b7ca3692fa08543fd5f1db2d1bd
2010-07-12 14:35:03 -07:00
Alex Yakavenka
4f1244e0de Ccat: Initial CCAT implementation
Launch Stk service for Cdma phone.

Change-Id: I1d0e00a3a31af59239b1355babb37f05cb7e5e07
2010-07-12 14:27:46 -07:00
Kenny Root
622b3dc4a9 Change Javadoc to get around brokenness
Apparently the Javadoc we're using can't handle generic method
arguments, so remove the argument specification to let the compiler
match the right one since we're not overloading that method anyway.

Change-Id: Ie1a1a28c6e3c5fe5d2d434ecc66519e514bc692c
2010-07-12 14:20:14 -07:00
Romain Guy
d12315ae7e Merge "Remove math from the vertex shader." 2010-07-12 14:17:16 -07:00
Doug Felt
f7cb1f75fd Support bidi/shaping for getTextPath
Move layout-related code into separate class since it's needed by both
canvas and paint.

Change-Id: Iba89a1d94d7cca650255ffa3cbc952b988a51b54
2010-07-12 13:50:08 -07:00
David Brown
77ad5e6411 am 523959f5: am d1af902c: Merge "Deprecate some status bar icons that now come from the phone app (and shouldn\'t have been public in the first place.)" into gingerbread
Merge commit '523959f50e56d8c888f39e19855ffdc8d0c2b6fc'

* commit '523959f50e56d8c888f39e19855ffdc8d0c2b6fc':
  Deprecate some status bar icons that now come from the phone app (and
2010-07-12 13:35:49 -07:00
Andy McFadden
824c510752 Allow "am" to initiate heap dumps.
This was mostly cloned from the "am profile" implementation.  It's
intended to replace the old "kill -10" approach used by "runhat".

We could really use a native heap dump, so I pass a "managed"
flag through that indicates whether we want to dump the native or
managed heap.  We don't currently have a native heap dump-to-file
function, so it currently just logs a warning.

(android.ddm.DdmHandleNativeHeap.getLeakInfo is a good start -- it
copies /proc/maps and then calls get_malloc_leak_info to get some
goodies.  Needs some formatting to make it human-readable.  I didn't
want to cram all that into this change.)

It would be useful if "am" didn't exit until the heap dump operation
completed, but I'm not sure how to do that.

Bug 2759474.

Change-Id: I46bc98067738d8c72ac0fc10002ca67bb4929271
2010-07-12 13:35:14 -07:00
David Brown
523959f50e am d1af902c: Merge "Deprecate some status bar icons that now come from the phone app (and shouldn\'t have been public in the first place.)" into gingerbread
Merge commit 'd1af902c21b4911b964c82ced3d80fcf9ab41540' into gingerbread-plus-aosp

* commit 'd1af902c21b4911b964c82ced3d80fcf9ab41540':
  Deprecate some status bar icons that now come from the phone app (and
2010-07-12 13:32:54 -07:00
David Brown
d1af902c21 Merge "Deprecate some status bar icons that now come from the phone app (and shouldn't have been public in the first place.)" into gingerbread 2010-07-12 13:30:58 -07:00
Jason Sams
93bab39af5 gl perf test cleanup.
Change-Id: Ic486774e25421bd2f412f0ba2bbac4660e3982b8
2010-07-12 11:59:34 -07:00
Patrick Dubroy
5958091dd9 Merge "Convert the minWidth and minHeight to device units when calling getInstalledProviders" 2010-07-12 11:40:58 -07:00
Romain Guy
2594066787 Merge "Fixed a Documentation Error in the AsyncTask Contstructor" 2010-07-12 11:35:31 -07:00
Joe Onorato
808182dc87 checkpoint tablet status bar
Change-Id: Ia9089cce370ead4e685dffbca722fa8404a8f443
2010-07-12 14:29:15 -04:00
Kenny Root
f27c6c1001 am ceb8465e: am 87bb1857: Merge changes I2337051b,I19b426cb into gingerbread
Merge commit 'ceb8465e974ba5fa971ffe1b5b74e94a1bd53f97'

* commit 'ceb8465e974ba5fa971ffe1b5b74e94a1bd53f97':
  Tweak ObbFile class
  Allow things that can install packages to set Obb paths
2010-07-12 11:22:45 -07:00
Kenny Root
ceb8465e97 am 87bb1857: Merge changes I2337051b,I19b426cb into gingerbread
Merge commit '87bb18579a5eea2e24af78af8c0f54f5455ce8fd' into gingerbread-plus-aosp

* commit '87bb18579a5eea2e24af78af8c0f54f5455ce8fd':
  Tweak ObbFile class
  Allow things that can install packages to set Obb paths
2010-07-12 11:20:04 -07:00
Kenny Root
87bb18579a Merge changes I2337051b,I19b426cb into gingerbread
* changes:
  Tweak ObbFile class
  Allow things that can install packages to set Obb paths
2010-07-12 11:18:34 -07:00
Jean-Baptiste Queru
014568bf45 Merge "Fix hang when error in SIM card communication" 2010-07-12 11:14:56 -07:00
Christian Mehlmauer
b91a4c4f23 Fixed a Documentation Error in the AsyncTask Contstructor
Change-Id: Ic5fb9c613b9e358f1ea81996ee705831a77368db
2010-07-12 20:02:25 +02:00
Mike Lockwood
d815f79766 Integrate host to device file transfer with the media provider.
MTP file transfers happen in two stages.  The SendObjectInfo command sends
some information about the file and reserves an ObjectHandle for the new file.
The file transfer is then performed using the SendObject command.

To support this in the media provider, MtpDatabase.beginSendObject receives
the information from SendObjectInfo and creates an row for it in the MTP objects
table for the new file.  After the file transfer has completed, then
MtpDatabase.endSendObject is called.  In endSendObject, we run the media scanner
on the new file, which will add a row to the images, audio, video
or audio playlist table.

To avoid the media scanner creating a second row for the file in the MTP objects
table, we pass the ObjectHandle created in beginSendObject to the media scanner,
which then passes it to the media provider via the content values when it
performs its insert.

Change-Id: I1ebcc63d6bd4404b0d3a93c703a9d3c097381d3a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-12 14:01:22 -04:00
Jean-Baptiste Queru
f0565ce75a Merge "Reduced Warnings by adding Type Arguments and removing unused imports" 2010-07-12 10:54:11 -07:00
Jean-Baptiste Queru
ac95a25409 Merge "Documentation Bug (Issue 9557)" 2010-07-12 10:43:17 -07:00
Tadashi G. Takaoka
19046b0185 Merge "Fix that setInputMethod throw exception with wrong method id" 2010-07-12 10:41:08 -07:00
Maksymilian Osowski
7ee78150f7 Merge "Added dialogs to the DirListActivity." 2010-07-12 10:40:15 -07:00
Patrick Dubroy
5d1409191e Convert the minWidth and minHeight to device units when calling getInstalledProviders 2010-07-12 10:29:30 -07:00
Steve Block
cefd8d9588 Merge "Update DumpRenderTree to look in platform/android for Android-specific results" 2010-07-12 10:01:50 -07:00
Tadashi G. Takaoka
d88390f522 Fix that setInputMethod throw exception with wrong method id
Change-Id: I8dd9549bbdcba6fb590225f64c82cc9f498435ea
2010-07-12 10:01:37 -07:00
Steve Block
a88837573e Update DumpRenderTree to look in platform/android for Android-specific results
Change-Id: I32044fc8e22d419762e275cd69b0c785a7f4c8a5
2010-07-12 18:00:34 +01:00