Commit Graph

1264 Commits

Author SHA1 Message Date
Android (Google) Code Review
5752912e4b am 36e862a6: Merge change 2318 into donut
Merge commit '36e862a699aa2a23df1543665f39b5b0c96885fb'

* commit '36e862a699aa2a23df1543665f39b5b0c96885fb':
  Fixed vertical text position in search suggestion items.
2009-05-22 11:26:01 -07:00
Romain Guy
56852c7e40 am 380cd96e: Fix the build
Merge commit '380cd96e5d7018cbf43295c9f2f2a33897affd63'

* commit '380cd96e5d7018cbf43295c9f2f2a33897affd63':
  Fix the build
2009-05-22 11:25:56 -07:00
Romain Guy
2cdae55cd3 am c0292b04: Fix the build
Merge commit 'c0292b04407d93a11ee1412ed52cc5b04642a6f1'

* commit 'c0292b04407d93a11ee1412ed52cc5b04642a6f1':
  Fix the build
2009-05-22 11:25:52 -07:00
The Android Open Source Project
e7be66e5e5 merge f41c640d8424fbd90cb1751173ede1c9f5e848b4 w/minor conflict 2009-05-22 11:24:36 -07:00
Android (Google) Code Review
610de0974e Merge change 2336 into donut
* changes:
  dumpstate: Add to AID_SDCARD_RW group to fix saving bugreports to the SD card.
2009-05-22 10:40:48 -07:00
The Android Open Source Project
0931989f0b Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-05-22 10:37:42 -07:00
Android (Google) Code Review
b6beb22a5f Merge change 2229
* changes:
  Add carrier/mcc factors to wifi-channel decision.
2009-05-22 09:33:09 -07:00
Android (Google) Code Review
454a625588 Merge change 2230 into donut
* changes:
  runtime: Add CAP_SYS_NICE to the system server capabilities list so it can (eventually) move arbitrary threads into different cgroups
2009-05-22 08:47:54 -07:00
Android (Google) Code Review
e79c26d2c6 Merge change 2318 into donut
* changes:
  Fixed vertical text position in search suggestion items.
2009-05-22 08:45:11 -07:00
The Android Open Source Project
5d351f5756 merge 84ce47e64f9aa5600b6b3e205f8c6930a8095c7d w/minor conflicts 2009-05-22 07:48:37 -07:00
Mathias Agopian
310f8da0c3 merge master to master_gl 2009-05-22 02:16:08 -07:00
Android (Google) Code Review
840964f714 Merge change 2305 into donut
* changes:
  Add a new API to ListView: setGestures(int). This allows developers to enable gestures to jump inside the list or filter it. This change also introduces a new XML attribute to control this API. It also adds the ability to theme the GestureOverlayView from the gestures library. Finally, this adds a new VERSION header to the binary format used to store the letters for the recognizer.
2009-05-22 02:02:57 -07:00
Android (Google) Code Review
fa33ce45da Merge change 2299 into donut
* changes:
  fix build breakage
2009-05-21 21:12:59 -07:00
Android (Google) Code Review
bdbf6b094d am 69a6c3eb: Merge change 2292 into donut
Merge commit '69a6c3ebd46a8de0e896747757f364322c12608d'

* commit '69a6c3ebd46a8de0e896747757f364322c12608d':
  split boot animation out of SurfaceFlinger
2009-05-21 19:36:53 -07:00
Android (Google) Code Review
1131392281 Merge change 2292 into donut
* changes:
  split boot animation out of SurfaceFlinger
2009-05-21 19:33:59 -07:00
Mathias Agopian
a1ecca920e split boot animation out of SurfaceFlinger
Conflicts:

	data/etc/platform.xml
2009-05-21 19:21:59 -07:00
Android (Google) Code Review
3cf34f1345 am cfcc0df2: Merge change 2285 into donut
Merge commit 'cfcc0df2658d0ce7dc753511bb44ab8ae7a636f7'

* commit 'cfcc0df2658d0ce7dc753511bb44ab8ae7a636f7':
  Move the Gestures API to the framework in android.gesture.
2009-05-21 18:18:21 -07:00
Android (Google) Code Review
156f418aa8 Merge change 2285 into donut
* changes:
  Move the Gestures API to the framework in android.gesture.
2009-05-21 18:16:51 -07:00
Dianne Hackborn
65f13d82fa am c4d5d026: Add new window manager type for a hacking second-level media surface.
Merge commit 'c4d5d02667af6989a3121072871f6a4b1e68b594'

* commit 'c4d5d02667af6989a3121072871f6a4b1e68b594':
  Add new window manager type for a hacking second-level media surface.
2009-05-21 17:54:44 -07:00
Android (Google) Code Review
9c954caf4f Merge change 2260
* changes:
  change 2115 wasn't merged properly into master. this fixes that.
2009-05-21 16:32:55 -07:00
Mathias Agopian
a47f02afb1 change 2115 wasn't merged properly into master. this fixes that.
Merge change 2115 into donut

* changes:
  bring the native_handle stuff back from master_gl

Conflicts:

	libs/binder/Parcel.cpp
2009-05-21 16:29:38 -07:00
Android (Google) Code Review
9cbc6a7542 am 384bfa27: Merge change 2227 into donut
Merge commit '384bfa270cdcb5dc3bc9ec396b783e25eb2d9b4d'

* commit '384bfa270cdcb5dc3bc9ec396b783e25eb2d9b4d':
  Add header declaring the interface for TTS engines to implement.
2009-05-21 16:18:48 -07:00
Yang Li
b2c71b710a am ac6a4b8e: Renamed setGestureType in GestureLibrary
Merge commit 'ac6a4b8eab8311a02e1988c1dbd1c85f867b6bc4'

* commit 'ac6a4b8eab8311a02e1988c1dbd1c85f867b6bc4':
  Renamed setGestureType in GestureLibrary
2009-05-21 16:18:46 -07:00
Android (Google) Code Review
1bdc51faa8 Merge change 2227 into donut
* changes:
  Add header declaring the interface for TTS engines to implement.
2009-05-21 16:13:52 -07:00
San Mehat
a00a0851c3 runtime: Add CAP_SYS_NICE to the system server capabilities list so it
can (eventually) move arbitrary threads into different cgroups

Signed-off-by: San Mehat <san@google.com>
2009-05-21 15:34:56 -07:00
Jean-Michel Trivi
c7104572aa Add header declaring the interface for TTS engines to implement. 2009-05-21 15:32:11 -07:00
Romain Guy
c5ec3f268f am b6d99b7d: Modify how GestureLibrary stores its data. The XML format is now replaced by a more efficient binary format which should speed up saving/loading. The format is very similar to the one used by the letters recognizer. The format is documented in GestureLibrary.java.
Merge commit 'b6d99b7d17fd1bb1326a70744bd01be5d1586487'

* commit 'b6d99b7d17fd1bb1326a70744bd01be5d1586487':
  Modify how GestureLibrary stores its data. The XML format is now replaced by a more efficient binary format which should speed up saving/loading. The format is very similar to the one used by the letters recognizer. The format is documented in GestureLibrary.java.
2009-05-21 15:30:01 -07:00
Android (Google) Code Review
63c0a75285 am aeed1816: Merge change 2219 into donut
Merge commit 'aeed1816b7bbf8948c1daed48db6fe7567f338af'

* commit 'aeed1816b7bbf8948c1daed48db6fe7567f338af':
  Updated LetterRecognizer & related gesture recognition code
2009-05-21 15:06:24 -07:00
Android (Google) Code Review
e673f167c3 Merge change 2219 into donut
* changes:
  Updated LetterRecognizer & related gesture recognition code - added personalization for letter recognizer
2009-05-21 15:03:57 -07:00
Android (Google) Code Review
7fa1f3c6b3 am 0dc9a4bb: Merge change 2218 into donut
Merge commit '0dc9a4bbbd1b1224b837d5df62639985fae08f57'

* commit '0dc9a4bbbd1b1224b837d5df62639985fae08f57':
  Fixed SD card access permission issue in manifest
2009-05-21 14:49:35 -07:00
Android (Google) Code Review
30236665ea Merge change 2218 into donut
* changes:
  Fixed SD card access permission issue in manifest
2009-05-21 14:48:03 -07:00
Android (Google) Code Review
dda8feeb3e Merge change 2215
* changes:
  Fixed SD card access permission issue in manifest
2009-05-21 14:28:27 -07:00
Android (Google) Code Review
01616cc2d4 am d1874747: Merge change 2202 into donut
Merge commit 'd1874747c281e3277980fe7318f9007643a25f60'

* commit 'd1874747c281e3277980fe7318f9007643a25f60':
  Fixes external http://code.google.com/p/android/issues/detail?id=2732. ExpandableListView is wrongly assuming that the saved state if of the correct type. A similar bug fix was made in TextView.onRestoreInstanceState() a while ago. This fix simply ensures that the state received is of the right type.
2009-05-21 13:16:00 -07:00
Android (Google) Code Review
d78ab096db Merge change 2202 into donut
* changes:
  Fixes external http://code.google.com/p/android/issues/detail?id=2732. ExpandableListView is wrongly assuming that the saved state if of the correct type. A similar bug fix was made in TextView.onRestoreInstanceState() a while ago. This fix simply ensures that the state received is of the right type.
2009-05-21 13:14:12 -07:00
Dave Sparks
a498449e2b am f84d654c: am 4d8adefd: AI 149136: Restore RECORD_AUDIO permission check to MediaRecorder. When we moved the media recorder to the media server process, we lost the permission check that was done at the process boundary in the AudioRecord binder interface because the AudioRecord object is created in the same process. This change adds a permission check in the MediaRecorderClient:setAudioSource() method. BUG=1868334
Merge commit 'f84d654cf9cf7ce3694ebb6913d78edd868d49fb'

* commit 'f84d654cf9cf7ce3694ebb6913d78edd868d49fb':
  AI 149136: Restore RECORD_AUDIO permission check to MediaRecorder.
2009-05-21 11:59:40 -07:00
Dave Sparks
46e2597e88 am 4d8adefd: AI 149136: Restore RECORD_AUDIO permission check to MediaRecorder. When we moved the media recorder to the media server process, we lost the permission check that was done at the process boundary in the AudioRecord binder interface because the AudioRecord object is created in the same process. This change adds a permission check in the MediaRecorderClient:setAudioSource() method. BUG=1868334
Merge commit '4d8adefd35efdea849611b8b02d61f9517e47760' into donut

* commit '4d8adefd35efdea849611b8b02d61f9517e47760':
  AI 149136: Restore RECORD_AUDIO permission check to MediaRecorder.
2009-05-21 11:57:52 -07:00
Android (Google) Code Review
4cff1d8ca4 am 6dd1bb71: Merge change 2170 into donut
Merge commit '6dd1bb71dbafbacd87e46b736888cb1371ddd53a'

* commit '6dd1bb71dbafbacd87e46b736888cb1371ddd53a':
  Trigger the LocationManager whenever the SearchDialog is shown
2009-05-21 10:46:06 -07:00
Android (Google) Code Review
9653c3b047 Merge change 2170 into donut
* changes:
  Trigger the LocationManager whenever the SearchDialog is shown (and stop when the SearchDialog is stopped). This way we get a network-based location quickly so that by the time any location- based suggestion provider wants to do suggestions, it's likely to have a good fresh location.
2009-05-21 10:44:44 -07:00
Dave Sparks
83a857f5d0 am 7283fb18: Merge commit \'7b7225c8fdbead25235c74811b30ff4ee690dc58\' into manual_merge
Merge commit '7283fb18022674daee4dcdc3a218190791f8cd0e'

* commit '7283fb18022674daee4dcdc3a218190791f8cd0e':
  AI 149133: Enable the camera permission check.
2009-05-21 10:27:18 -07:00
Dave Sparks
7118052e31 Merge commit '7b7225c8fdbead25235c74811b30ff4ee690dc58' into manual_merge
Conflicts:
	camera/libcameraservice/CameraService.cpp
2009-05-21 10:17:23 -07:00
Android (Google) Code Review
1e6ecc52c0 Merge change 1940
* changes:
  handle OTR messages by storing them in an in-memory table; remove groupchat message urls since we can get to messages by thread ids.
2009-05-21 10:08:09 -07:00
Android (Google) Code Review
07b5273adf am 8c690ea9: Merge change 2182 into donut
Merge commit '8c690ea9976d644db3c96eddbbbd2d50eac56913'

* commit '8c690ea9976d644db3c96eddbbbd2d50eac56913':
  location: Replace ILocationCollector interface with new ILocationProvider method
2009-05-21 09:42:38 -07:00
Android (Google) Code Review
cfae00675e am db79edc5: Merge change 2168 into donut
Merge commit 'db79edc5dc39e103356cad8781148a8794520bc5'

* commit 'db79edc5dc39e103356cad8781148a8794520bc5':
  Fix permission hole in camera service. Some debugging code was added
2009-05-21 09:42:24 -07:00
Android (Google) Code Review
2385ce2aa4 am 3343af5f: Merge change 1863 into donut
Merge commit '3343af5fdb10ace9e593d042fedcd9b42e322a95'

* commit '3343af5fdb10ace9e593d042fedcd9b42e322a95':
  Center the progress message for GoogleWebContentHelper (bug #1548858).
2009-05-21 09:42:17 -07:00
Dave Sparks
fec880df27 AI 149133: Enable the camera permission check.
Some debugging code was added to camera service. Later it was #ifdef'd
  out, but this change also removed the camera permission check. This
  change puts the permission check back in.
  BUG=1869264

Automated import of CL 149133
2009-05-21 09:18:18 -07:00
Android (Google) Code Review
1c4b60c2f2 Merge change 2182 into donut
* changes:
  location: Replace ILocationCollector interface with new ILocationProvider method
2009-05-21 08:52:25 -07:00
Android (Google) Code Review
f3b2684ecf Merge change 2168 into donut
* changes:
  Fix permission hole in camera service. Some debugging code was added to CameraService::onTransact() method during development. Later on the entire onTransact() method was #ifdef'd out, which inadvertently omitted the permissions check code. This change restores the code.
2009-05-21 07:55:39 -07:00
Android (Google) Code Review
b95c594a4e Merge change 1863 into donut
* changes:
  Center the progress message for GoogleWebContentHelper (bug #1548858).
2009-05-21 04:43:31 -07:00
Android (Google) Code Review
a0a0cd6779 am f9c7d9a7: Merge change 2147 into donut
Merge commit 'f9c7d9a75b2355d8ad8282d9b4cf817c77ea8b10'

* commit 'f9c7d9a75b2355d8ad8282d9b4cf817c77ea8b10':
  Add support to SuggestionsAdapter to query the 'working' status
2009-05-20 22:44:21 -07:00
Android (Google) Code Review
60069f642c am c1c82509: Merge change 2163 into donut
Merge commit 'c1c82509fb78403a969040cf057a66cbe3bfa538'

* commit 'c1c82509fb78403a969040cf057a66cbe3bfa538':
  Fix permission hole for RECORD_AUDIO created when we moved the MediaRecorder
2009-05-20 22:44:17 -07:00