Commit Graph

18516 Commits

Author SHA1 Message Date
Andy McFadden
3ad2be893b Merge "Reduce definition of monthly rep test" 2011-06-27 11:07:40 -07:00
Dianne Hackborn
fb61fea7ee Merge "Turn on HW accel by default for apps that target ICS." 2011-06-27 10:40:41 -07:00
Wu-cheng Li
42419ce28a Add framework support for camcorder zoom.
The purpose of ICameraRecordingProxy and ICameraRecordingProxyListener is to
allow applications using the camera during recording.

Camera service allows only one client at a time. Since camcorder application
needs to own the camera to do things like zoom, the media recorder cannot
access the camera directly during recording. So ICameraRecordingProxy is a proxy
of ICamera, which allows the media recorder to start/stop the recording and
release recording frames. ICameraRecordingProxyListener is an interface that
allows the recorder to receive video frames during recording.

ICameraRecordingProxy
  startRecording()
  stopRecording()
  releaseRecordingFrame()

ICameraRecordingProxyListener
  dataCallbackTimestamp()

The camcorder app opens the camera and starts the preview. The app passes
ICamera and ICameraRecordingProxy to the media recorder by
MediaRecorder::setCamera(). The recorder uses ICamera to setup the camera in
MediaRecorder::start(). After setup, the recorder disconnects from camera
service. The recorder calls ICameraRecordingProxy::startRecording() and
passes a ICameraRecordingProxyListener to the app. The app connects back to
camera service and starts the recording. The app owns the camera and can do
things like zoom. The media recorder receives the video frames from the
listener and releases them by ICameraRecordingProxy::releaseRecordingFrame.
The recorder calls ICameraRecordingProxy::stopRecording() to stop the
recording.

The call sequences are as follows:
1. The app: Camera.unlock().
2. The app: MediaRecorder.setCamera().
3. Start recording
   (1) The app: MediaRecorder.start().
   (2) The recorder: ICamera.unlock() and ICamera.disconnect().
   (3) The recorder: ICameraRecordingProxy.startRecording().
   (4) The app: ICamera.reconnect().
   (5) The app: ICamera.startRecording().
4. During recording
   (1) The recorder: receive frames from ICameraRecordingProxyListener.dataCallbackTimestamp()
   (2) The recorder: release frames by ICameraRecordingProxy.releaseRecordingFrame().
5. Stop recording
   (1) The app: MediaRecorder.stop()
   (2) The recorder: ICameraRecordingProxy.stopRecording().
   (3) The app: ICamera.stopRecording().

bug:2644213

Change-Id: I15269397defc25cbbcae16abc071c8349c123122
2011-06-27 15:44:57 +08:00
Adam Powell
681873fcc9 Merge "Fix bug 4903822 - vertical gravity bugs in action bar custom views" 2011-06-24 19:17:38 -07:00
Fabrice Di Meglio
b76023afd1 Introduce MarginLayoutParams marginStart and margingEnd
- update BiDiTest app for adding more unit tests concerning margin

Change-Id: Ia6a7e0a1948a2c375e8f3cc87d120a85351a8c27
2011-06-24 18:55:24 -07:00
Romain Guy
4c60c541de Merge "Properly tear down TextureView" 2011-06-24 17:21:26 -07:00
Romain Guy
80429c4585 Properly tear down TextureView
Change-Id: Ic23cd9257889d0abe8cc3fc1d04a66d0505e383e
2011-06-24 17:20:32 -07:00
Adam Powell
6556c074ee Fix bug 4903822 - vertical gravity bugs in action bar custom views
Change-Id: I20a319bf8fd5b5acf823a2651639f94d6efac5e4
2011-06-24 17:17:58 -07:00
Andy McFadden
c820145eca Reduce definition of monthly rep test
The repeatsMonthlyOnDayCount() function was returning true for events
like FREQ=MONTHLY;BYDAY=TU which actually appear weekly.  This is not
the desired behavior of the function.

Bug 4522027

Change-Id: I03ef68b429828097c8bad7fcd374e7c9eb4c7b03
2011-06-24 16:53:55 -07:00
Dianne Hackborn
2d6833bab3 Turn on HW accel by default for apps that target ICS.
Change-Id: I010e11e03b2dfd0d1db8c47f74c25a28586fd79c
2011-06-24 16:25:59 -07:00
Romain Guy
c1ba416af5 Merge "Reduce the number of UI events required to update a SurfaceTexture." 2011-06-24 14:56:20 -07:00
Romain Guy
58f4edb770 Reduce the number of UI events required to update a SurfaceTexture.
Change-Id: I9330c9646654fff57dcd6817c86e587a6490a9ad
2011-06-24 14:55:55 -07:00
Romain Guy
c897fbfaf9 Merge "Code cleanup" 2011-06-24 13:21:30 -07:00
Romain Guy
02ccac69fd Code cleanup
Change-Id: I64c346004e0adf9a776d0315534d4fe445f0c0ca
2011-06-24 13:20:23 -07:00
Fabrice Di Meglio
a54a600bc4 Merge "Fix bug #4813026 resolved direction of view doesn't change after layout direction changes" 2011-06-24 12:21:28 -07:00
John Reck
f4db8d566c Merge "Don't resend WEBKIT_DRAW if paused" 2011-06-24 11:36:10 -07:00
Jaikumar Ganesh
c9286ebbf4 Merge "Implement APIs for Bluetooth Health profile." 2011-06-24 11:34:35 -07:00
Jaikumar Ganesh
2ea1e85dcb Implement APIs for Bluetooth Health profile.
This first patch implements all the APIs.
The APIs wil be made public soon. The data specification
API will be submited in another patchset.
Change-Id: I2462683b7e07380e2c42474b0036b34d03b4bed1
2011-06-24 11:31:43 -07:00
John Reck
1c1e6df04a Don't resend WEBKIT_DRAW if paused
Bug: 4606210
 If a WEBKIT_DRAW message came in after the WebView was paused,
 it would fail to draw causing it to re-send the WEBKIT_DRAW message
 which would lead to an infinite loop until the WebView is resumed.
 Fix this by not re-sending the WEBKIT_DRAW message if webview is paused.

Change-Id: I3dd946e4e948cf3fd6af07ba6f7fdac2f967a631
2011-06-24 11:07:09 -07:00
Amith Yamasani
b0b1b11b96 Merge "SearchView improvements per design." 2011-06-24 10:58:38 -07:00
Jaikumar Ganesh
e0ac113b47 Merge "Fix excessive locking synchronization leading to deadlocks." 2011-06-24 09:28:02 -07:00
Grace Kloba
5c5050d902 Make TextureView to use async SurfaceTexture.
With this, there is no synchronous destroy SurfaceTexture requirement any more.

Revert the previous change which only applies to the sync SurfaceTexture.

Change-Id: Id4790d38a27f2982d0c8ad471bc1107683d27ffc
2011-06-23 22:32:04 -07:00
Svetoslav Ganov
f95d7f5467 Merge "Case insensitive for real" 2011-06-23 19:21:49 -07:00
Guang Zhu
3af0b4e125 Case insensitive for real
previous code was comparing to the unconverted CharSequence, so
it's never going to find a match if the string is mixed case

Change-Id: Ifd537d9781b7da1a2328f01b6f2f3229ca7d950b
2011-06-23 19:14:01 -07:00
Jaikumar Ganesh
5312af0c95 Fix excessive locking synchronization leading to deadlocks.
We should never have to look on the entire instance. There
are many places in the code where it there and we need to fix it.
This is a start. In this particular case what we are protecting
is the properties map of the remote device and thus we just need to lock
on it. Ofcourse, it would be better to have a state machine but this
is good for now.

Deadlock: When a new device was found it will call addProperties which will hold
a lock. addProperties calls into BluetoothService. Now Settings app makes a call
into BluetoothService which will call into this file and we have a deadlock.

Change-Id: Ieb69d5ace222bf5d1e6677af151241153303099f
2011-06-23 17:37:07 -07:00
Amith Yamasani
246529891e SearchView improvements per design.
- X is visible only if there is text, or we need a way to close a
search field that is iconified by default.
- Search dialog (legacy) has a back button to the left.
- Hitting X on a non-focused search view will bring it into focus
and show the keyboard if necessary.

Change-Id: I5a30bb08adcf84639a922a9e13be1d1562f714e6
2011-06-23 17:35:32 -07:00
Fred Quintana
fe35597064 Merge "Make the AbstractAccountAuthenticator return an error to the AccountManagerService if it detects a RuntimeException." 2011-06-23 17:33:53 -07:00
Fred Quintana
5d1a0c3933 Make the AbstractAccountAuthenticator return an error to the AccountManagerService
if it detects a RuntimeException.

Bug: 4726899
Change-Id: I5c478464cd0d426722257b2c5c75f964cd839ea6
2011-06-23 17:03:44 -07:00
Adam Powell
95c0f924b2 Merge "Fix bug 4771354 - Phone landscape action bar subtitle slightly cut off on the bottom" 2011-06-23 17:00:00 -07:00
Adam Powell
c8b0b005cb Fix bug 4771354 - Phone landscape action bar subtitle slightly cut off
on the bottom

Let action bar title sizes adapt for restricted space in landscape.

Fix home spacing for tablets to eliminate redundant layout.

Change-Id: If38a43d87ca1aebf96b5d7adfdb1cf36c41ec07e
2011-06-23 16:56:07 -07:00
Jesse Wilson
52da3a4328 Merge "Warn about the lack of access controls for SD card HTTP caches." 2011-06-23 16:04:00 -07:00
RoboErik
48e34174cc Merge "api comment fixes" 2011-06-23 16:00:00 -07:00
Jesse Wilson
98e8b19c7b Warn about the lack of access controls for SD card HTTP caches.
Change-Id: I54adc2f9b57964e15a0fc26b719729e6087b1bda
http://b/4772280
2011-06-23 15:59:32 -07:00
RoboErik
e00d58998c api comment fixes
Change-Id: I0fe70ab54c78ba18ae7d759bbfa692c5235008ef
2011-06-23 15:16:55 -07:00
Dianne Hackborn
58b8684177 Merge "Fix issue #4770360: older app compatibility mode is really tiny on ICS phones" 2011-06-23 12:13:06 -07:00
Dianne Hackborn
2b31d53161 Fix issue #4770360: older app compatibility mode is really tiny on ICS phones
We were applying the density compat mode scaling multiple times to
display metrics, causing bad values.

Change-Id: Iafafd9a5e94b9d774cd2715bf968e91602a1bd82
2011-06-23 12:00:54 -07:00
Philip Milne
a1f7b10f72 Handle baseline aligned rows in which some components define baseline and some don't.
Also:

. Make all of the methods in Alignment package private.
. Inlucde Tor's test case

Change-Id: If78a6a3b653723d9e12d6b162fd0c86b11a82dff
2011-06-23 11:41:57 -07:00
Irfan Sheriff
756f25fc61 am 1cc0fa41: am db45e0bd: am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2
* commit '1cc0fa416f195732cc7c04cebfaabe7f3fe994c7':
  Release wakelock after use
2011-06-23 08:17:01 -07:00
Grace Kloba
cf559377b7 Add onSurfaceTextureUpdated to the TextureView listener.
The app needs a way to throttle the producer side. Expose this to enable it.

Change-Id: I04b6a3fc444117a9fc2449fb87c3c834247c8ef1
2011-06-22 23:05:40 -07:00
Jeff Sharkey
ea5f51909b Merge "Enable bandwidth module from stats service." 2011-06-22 22:21:31 -07:00
Jeff Sharkey
0a9ee1272b Enable bandwidth module from stats service.
During systemReady(), tell netd to enable bandwidth tracking module,
which is used to provide detailed stats and controls.

Change-Id: Iecfd8b17a3b90f5a817d731fbe1c71777681ed6e
2011-06-22 21:44:12 -07:00
Adam Powell
fbca76965b Fix bug 4887033 - android.app.cts.AlertDialog_BuilderTest#testDisableCancelable
Change-Id: I659201124c4c6730046be55a918c64ca57a9f4db
2011-06-22 21:29:19 -07:00
Adam Powell
d9b0ee029f Merge "Tweak action bar metrics." 2011-06-22 21:14:42 -07:00
Romain Guy
8b4512ef20 Merge "Prevent possible NPE in TextureView" 2011-06-22 21:02:31 -07:00
Romain Guy
1ec3a58bcd Prevent possible NPE in TextureView
Change-Id: I539813d614c7eb1f68dad6b605cbad5b5144c5e9
2011-06-22 21:01:58 -07:00
Romain Guy
c2e0a1f1cd Merge "Add the ability to specify the opacity of a TextureView" 2011-06-22 20:59:46 -07:00
Romain Guy
a9489274d6 Add the ability to specify the opacity of a TextureView
TextureView assumes its content is opaque by default.

Change-Id: Iba873423566a5b67c388081838bd910dceba32ba
2011-06-22 20:58:11 -07:00
Adam Powell
0d5d1b7e8c Tweak action bar metrics.
Free up some more pixels in the action bar and better define how icons
within it resize.

Change-Id: I0768180e595ee7b23190a26607e8989fa1bac38f
2011-06-22 20:41:44 -07:00
Nick Pelly
b8a8c7a279 resolved conflicts for merge of 6ce70394 to master
Change-Id: I7a4a08409c0133a1738b03b476f2b388c7aec5bf
2011-06-22 20:32:36 -07:00
Jim Miller
71c77aa822 Merge "Update LockScreen layouts to latest UX spec." 2011-06-22 18:10:02 -07:00