Commit Graph

23808 Commits

Author SHA1 Message Date
Jason Sams
1be97a80fa Merge "Rename ProgramFragmentStore to ProgramStore." 2010-05-13 18:37:17 -07:00
Jason Sams
54db59c359 Rename ProgramFragmentStore to ProgramStore.
Change-Id: Ia8ad9ac856944838ced38a2f1e8f07387050bdfd
2010-05-13 18:35:01 -07:00
Andrew Sapperstein
8d9db8e4c7 Added getNumColumns function to GridView.java.
Change-Id: I1cec19c77d0ee47278d93c6b0a112edae777e4e9
2010-05-13 17:45:50 -07:00
James Dong
76922d2ff8 am 79dfb675: am ffd104a9: Merge "Remove dummy surface in CameraSource" into kraken 2010-05-13 16:43:17 -07:00
James Dong
79dfb67531 am ffd104a9: Merge "Remove dummy surface in CameraSource" into kraken 2010-05-13 16:41:50 -07:00
James Dong
ffd104a903 Merge "Remove dummy surface in CameraSource" into kraken 2010-05-13 16:40:19 -07:00
Suchi Amalapurapu
4952aef1c5 am 8e8bb02f: am 3f5ed04f: am b63ea5f7: am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 2010-05-13 16:09:30 -07:00
Suchi Amalapurapu
8e8bb02f3d am 3f5ed04f: am b63ea5f7: am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 2010-05-13 16:07:50 -07:00
Suchi Amalapurapu
3f5ed04f7f am b63ea5f7: am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo
Merge commit 'b63ea5f784b7862a7ab28e0134f6da47f6275810' into kraken

* commit 'b63ea5f784b7862a7ab28e0134f6da47f6275810':
  Fix 2672155
2010-05-13 16:05:54 -07:00
Suchi Amalapurapu
b63ea5f784 am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo
Merge commit 'c928a11e34678296511d5ea34582292be7368618' into froyo-plus-aosp

* commit 'c928a11e34678296511d5ea34582292be7368618':
  Fix 2672155
2010-05-13 16:04:24 -07:00
Suchi Amalapurapu
c928a11e34 Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 2010-05-13 16:02:20 -07:00
Suchi Amalapurapu
1ace5bc070 Fix 2672155
Check the code path when enabling disabling packages.

Add unit test

Change-Id: I0f0f482a3735234eab3f63ba1f6462574b70144e
2010-05-13 15:48:39 -07:00
Nick Kralevich
f5523645a9 am c5fdcaa2: am cf67d18a: Merge "Get rid of warnings when compiled with -Wformat-security" into kraken 2010-05-13 15:39:02 -07:00
Nick Kralevich
c5fdcaa229 am cf67d18a: Merge "Get rid of warnings when compiled with -Wformat-security" into kraken 2010-05-13 15:37:16 -07:00
Nick Kralevich
cf67d18a1d Merge "Get rid of warnings when compiled with -Wformat-security" into kraken 2010-05-13 15:35:48 -07:00
Nick Kralevich
79290ae976 Get rid of warnings when compiled with -Wformat-security
Change-Id: I5a7ad5be2aaf0fa0d164204d3c1bebf02ec55745
2010-05-13 15:31:00 -07:00
The Android Open Source Project
a4bb641040 am 1331ded8: am e28776bb: am b1110149: merge from open-source master 2010-05-13 14:59:22 -07:00
The Android Open Source Project
1331ded8fe am e28776bb: am b1110149: merge from open-source master 2010-05-13 14:57:20 -07:00
The Android Open Source Project
e28776bbd7 am b1110149: merge from open-source master
Merge commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9' into kraken

* commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9':
  Use integer for loop counter instead of float
  New test in FrameworkTest for the VelocityTracker class
  Preserve '+' in phone numbers imported from SIM.
2010-05-13 14:56:02 -07:00
The Android Open Source Project
b1110149cc merge from open-source master
Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8
2010-05-13 14:50:16 -07:00
Mike Lockwood
468202dd71 am 702b8752: am 5a9cbb29: am a3d5549c: am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic 2010-05-13 14:09:46 -07:00
Mike Lockwood
702b8752a5 am 5a9cbb29: am a3d5549c: am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic 2010-05-13 14:08:05 -07:00
Romain Guy
743e25c914 Merge "Prevent possible leak in AbsListViews." 2010-05-13 14:06:59 -07:00
Mike Lockwood
5a9cbb291f am a3d5549c: am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
Merge commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036' into kraken

* commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036':
  Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
2010-05-13 14:06:25 -07:00
Mike Lockwood
a3d5549c80 am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
Merge commit '098e58da93f304d7d7791f193c6237870b94989d' into froyo-plus-aosp

* commit '098e58da93f304d7d7791f193c6237870b94989d':
  Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
2010-05-13 14:04:30 -07:00
Romain Guy
82afc7b32b Prevent possible leak in AbsListViews.
This change unregisters a list's data observer from the adapter when the list
is detached from the window. The default data observer impl. is a non-static
inner class with a synthesized pointer to the list. Thus if an app keeps
the adapter around the list is also kept around. This can be a problem with
dialogs in particular.

Change-Id: Ia95a995d3f54b9caf1bbcd2c7239a0318511b08c
2010-05-13 14:03:09 -07:00
Jaikumar Ganesh
61c98cd643 Merge "Remove duplicate definition of flag." 2010-05-13 13:54:03 -07:00
Dianne Hackborn
3d44416dc4 Merge "Further work on fragments:" 2010-05-13 13:46:30 -07:00
Jaikumar Ganesh
26888576f7 Remove duplicate definition of flag.
Change-Id: I9bdcdf5f12677162f0b735a277fce8a75fa13d39
2010-05-13 13:41:37 -07:00
Dianne Hackborn
b4bc78b16a Further work on fragments:
- Implement all of the state saving and restoring machinery.  This
  caused some flux in the API.
- Add ability to have fragments that are retained across activity
  instances.
- Fix some bugs.

Change-Id: Ib6b5b0752d7f8d667cfdcd3e76d127cc9b6d901b
2010-05-13 13:36:10 -07:00
Mike Lockwood
098e58da93 Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
This avoids problems if the time is reset while shutting down.

Change-Id: I54c7c787e55648ebf5a68e79056f92fbac0081ae
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-13 16:29:49 -04:00
Mike Lockwood
8d64c9bbce Merge "Exclude mtptest program from simulator builds." 2010-05-13 13:29:28 -07:00
Mike Lockwood
18ff7b4c37 Exclude mtptest program from simulator builds.
Change-Id: Ia9751a06d7607363e8c16b71f6f3c524833395a0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-13 16:28:00 -04:00
Jaikumar Ganesh
a5a51a76b2 Merge "resolved conflicts for merge of 0de3cc9b to master" 2010-05-13 12:43:50 -07:00
Jaikumar Ganesh
fce9609a18 resolved conflicts for merge of 0de3cc9b to master
Change-Id: I9fcf892de6ebe90c6a4be19d02e3a009ddda89aa
2010-05-13 12:42:59 -07:00
Mike Lockwood
56118b5b38 Checkpoint work on MTP and PTP investigation.
This change includes work in progress on a C++ library for both host and device
MTP and PTP support.
Currently the makefile builds two test programs:

mtptest - a command line test program that implements a small subset of device side MTP.
Requires a kernel driver that has not been checked in yet.

ptptest - a host tool to test USB host support for detecting and communicating with
digital cameras over PTP.  Runs on Linux host.

Later this will be reformulated as a native library that will be used in the media process.

Change-Id: I81aab279975b600b59d99013ab97f9adf0b58da7
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-13 15:36:47 -04:00
Jaikumar Ganesh
0de3cc9b5e am 54a8f295: Merge "Add FLAG_RERAIN_PHONE_NUMBER_FORMATTING." into kraken 2010-05-13 12:22:05 -07:00
Jaikumar Ganesh
54a8f29523 Merge "Add FLAG_RERAIN_PHONE_NUMBER_FORMATTING." into kraken 2010-05-13 12:20:06 -07:00
Jason Sams
f6860f1979 Merge "Add missing bindProgramRaster to scriptC_lib." 2010-05-13 12:19:28 -07:00
Kenny Root
b79781af1e Use integer for loop counter instead of float
Change-Id: Iafaccbb3a3a7cbe0d67ed6827906d713c37ce89b
2010-05-13 12:17:15 -07:00
James Dong
e292b3bc9c Remove dummy surface in CameraSource
bug - 2680919

Change-Id: Ia0308cf57fd67058b4dd0e042b3ce97f13df475f
2010-05-13 12:08:29 -07:00
Jean-Baptiste Queru
9ef0f0d9d2 Merge "New test in FrameworkTest for the VelocityTracker class" 2010-05-13 11:39:51 -07:00
Andreas Huber
05a5205b93 am 9df829bf: am fae47fd0: am 28fadef2: am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config. 2010-05-13 11:34:40 -07:00
Andreas Huber
9df829bf58 am fae47fd0: am 28fadef2: am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config. 2010-05-13 11:33:06 -07:00
Andreas Huber
fae47fd008 am 28fadef2: am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
Merge commit '28fadef2ede2d74e9526266e779553bbd1dc66f4' into kraken

* commit '28fadef2ede2d74e9526266e779553bbd1dc66f4':
  Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
2010-05-13 11:18:24 -07:00
Andreas Huber
28fadef2ed am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
Merge commit '3c78a1b58957e31d2991fb6a609abecbb1987b3b' into froyo-plus-aosp

* commit '3c78a1b58957e31d2991fb6a609abecbb1987b3b':
  Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
2010-05-13 11:16:43 -07:00
Adam Powell
bdfb5312c0 Merge "ActionBar added to framework, integrated with Activity and styles. Added onClick attribute support to menus in MenuInflater." 2010-05-13 11:07:58 -07:00
Jean-Baptiste Queru
ecfb185eed Merge "Preserve '+' in phone numbers imported from SIM." 2010-05-13 11:06:28 -07:00
The Android Open Source Project
6df9720b8d am fd5b040a: am 485b800e: am 1a3b3d48: merge from open-source master 2010-05-13 09:57:11 -07:00
The Android Open Source Project
fd5b040ae7 am 485b800e: am 1a3b3d48: merge from open-source master 2010-05-13 09:54:44 -07:00