53814 Commits

Author SHA1 Message Date
Andreas Huber
e67e99a9fb Merge "Log video dimensions and crop rectangle." 2011-06-27 11:14:12 -07:00
Andreas Huber
f7ee6692a5 Merge "Update paths to test content used to run the omx_tests." 2011-06-27 11:14:05 -07:00
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
Chia-chi Yeh
b2b201395a KeyStore: fix test-keystore
Change-Id: I1dcbd5c3cc7569c397d2480cda76288a9e28cd5c
2011-06-27 10:38:10 -07:00
Narayan Kamath
bd2492e14e Expose the currently used engine to bundled apps.
This is required to fix a couple of niggles and annoyances
in the Settings app.

Change-Id: I0ad0c41744282b552e844ba9a2157cea74c64234
2011-06-27 18:35:47 +01:00
James Dong
654af6c57d Merge "Reduce the number of output buffers and force output buffers in display order for SoftAVC decoder" 2011-06-27 10:34:13 -07:00
Robert Ly
491a6de28d docs: fixing new superscript for rs
Change-Id: I0563842a3a43972b131a2ec30ed8357b8136fc6d
2011-06-27 10:33:01 -07:00
Andreas Huber
cdfa6141d2 Fix the new color converter to respect the destination crop rect.
Also fixes the SoftwareRenderer to request blitting the correct crop rectangles.

Change-Id: I38706cf9b42d96c6d5b35a9380f006ea4fbbf1ea
2011-06-27 09:26:09 -07:00
Andreas Huber
f167f503c9 Log video dimensions and crop rectangle.
Change-Id: Ia56b09df4f6e9a14c4dcc499a6637fc39f8e3bb5
2011-06-27 09:26:09 -07:00
Andreas Huber
1ef4c197a6 Update paths to test content used to run the omx_tests.
Change-Id: I23201ac1541df032426cb05b9dc872b28882f992
2011-06-27 09:26:09 -07:00
Anirudh Dewani
cf33a02bef am 3ba39ef2: am 1f82dc08: Merge "Typo in spinner tutorial." into honeycomb-mr2
* commit '3ba39ef20fdbe4512d3c3ad6ad7c833b14318391':
  Typo in spinner tutorial.
2011-06-27 04:33:59 -07:00
Hung-ying Tyan
233718c3c5 Start keepalive process for the caller of a SIP call
so that the callee can send signals (on-hold or bye) back to the caller.
Without the keepalive, the NAT port for the caller will be timed out during the
call. And the signals will be dropped by the NAT device.

Change-Id: I21848d73469045b2ed9e7281556ab184c594c362
2011-06-27 19:33:24 +08:00
Wu-cheng Li
a084c841aa Merge "Add framework support for camcorder zoom." 2011-06-27 02:29:21 -07:00
repo sync
1aceda35cc Support Invite w/ Replaces request.
bug:3326870
Change-Id: Idbfbe7e3cc6ba83874d42bfb7d149866f454e70a
2011-06-27 16:20:28 +08: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
Anirudh Dewani
3ba39ef20f am 1f82dc08: Merge "Typo in spinner tutorial." into honeycomb-mr2
* commit '1f82dc08f1616a83d8d1c43fa9ac16d0d60dd537':
  Typo in spinner tutorial.
2011-06-26 23:06:04 -07:00
Anirudh Dewani
1f82dc08f1 Merge "Typo in spinner tutorial." into honeycomb-mr2 2011-06-26 23:02:56 -07:00
Svetoslav Ganov
a0156177cd Added scroll and text selection change accessibility events.
1. Added scrolling accessibility event to provicde feedback
   when a view is scrolled.

Note: We need scroll events for ICS since even though we have
      touch exploration the user does not know when something
      is scrollable and not feedback is provided while scrolling.

bug:4902097

2. Added a text selection change event to provide feedback
   for selection changes including cursor movement.

Note: We need the text selection change events for ICS since
      even though the IME supports navigation in text fields
      the user receives no feedback for the current selection/
      cursor position.

bug:4586186

3. Added a scrollable property to both AccessibilityEvent and
   AccessibilityNodeInfo. The info has to describe the source
   in terms of all properties that make sense for accessibility
   purposes and the event has this property (kinda duplicated)
   since clients will aways want to know if the source is
   scrollable to provided clue to the user and we want to avoid
   pulling the info of the source for every accessibility event.

Change-Id: I232d6825da78e6a12d52125f51320217e6fadb11
2011-06-26 21:35:22 -07:00
Chia-chi Yeh
14f14863c5 KeyStore: allow system user to get secrets from keystore.
Change-Id: I9cb41344c17fb33e6614a45d46368a9c43e3dce7
2011-06-26 18:24:19 -07:00
Bart Sears
fc9f9e4db5 Update DroidSansEthiopic to ver 1.03
1.03 changed the embedded name table and PostScript name to be
DroidSansEthiopic (it was DroidEthiopic) since we may eventually
add a DroidSerifEthiopic.

Change-Id: I8b0ba085bb7d2c33a52e786cd64122ef53825f5d
2011-06-26 16:26:57 -07:00
Brian Carlstrom
c18e7e7315 Merge "Replace KeyChainActivity placeholder UI with more polished dialog (1 of 5)" 2011-06-26 15:30:37 -07:00
Jamie Gennis
436b50f0dc Merge "SurfaceTexture: detach from Dalvik when necessary." 2011-06-26 12:23:12 -07:00
James Dong
2db9a95bc5 Reduce the number of output buffers and force output buffers in display order for SoftAVC decoder
Change-Id: I9ec6d8205e7a56e42d5b5799a6c2e31076d24b81
2011-06-26 07:42:39 -07:00
Brian Carlstrom
67c30dfe8e Replace KeyChainActivity placeholder UI with more polished dialog (1 of 5)
frameworks/base

    Extended KeyChain.chooserPrivateKeyAlias to allow caller to supply
    preferred choice to be selected in chooser. This allows Email
    settings to highlight the current choice when allowing user to
    change settings.
	keystore/java/android/security/KeyChain.java
	api/current.txt

    Implemented KeyChain functionality to pass host and port
    information to KeyChainActivity for display.
	keystore/java/android/security/KeyChain.java

    KeyChain now sends a PendingIntent as part of the Intent it sends
    to the KeyChainActivity which can be used to identify the caller
    in reliable way.
	keystore/java/android/security/KeyChain.java

    Moved .pfx/.p12/.cer/.crt constants to Credentials for reuse.
    Added Credentials.install variant with no value for use from KeyChainActivity
	keystore/java/android/security/Credentials.java

packages/apps/CertInstaller
    Source of extension constants now in Credentials
	src/com/android/certinstaller/CertFile.java

packages/apps/Browser
    Have browser supply host and port information to KeyChain.choosePrivateKeyAlias
    Tracking KeyChain.choosePrivateKeyAlias API change
	src/com/android/browser/Tab.java

packages/apps/Email
    Tracking KeyChain.choosePrivateKeyAlias API change
	src/com/android/email/view/CertificateSelector.java

packages/apps/KeyChain

    KeyChain now depends on bouncycastle X509Name for formatting
    X500Principals, since the 4 X500Principal formatting options could
    not format emailAddress attributes in a human readable way and its
    the most important attribute to display for client certificates in
    most cases.
	Android.mk

    Changing the UI to a dialog, make the activity style transparent.
	AndroidManifest.xml
	res/values/styles.xml

    Layout for chooser dialog
	res/layout/cert_chooser.xml

    Layout for list items in chooser
	res/layout/cert_item.xml

    New resources for dialog including comments for translators.
	res/values/strings.xml

    New dialog based KeyChainActivity. Now also shows requesting app
    and requesting server. Now can preselect a specified alias. New
    link directly to CertInstaller.

	src/com/android/keychain/KeyChainActivity.java

    Fix KeyChainTestActivity to work with TestKeyStore changes that
    were causing network activity on the UI to look up the name of
    localhost. Also track KeyChain.choosePrivateKeyAlias API change.

	tests/src/com/android/keychain/tests/KeyChainTestActivity.java

Change-Id: I07128fba8750f9a6bcb9c6be5da04df992403d69
2011-06-25 16:48:25 -07:00
Irfan Sheriff
dde052f4ba Merge "WifiWatchdogService - disable bad connections" 2011-06-25 11:20:54 -07:00
Jeff Sharkey
f670be372b Merge "Finish any enter animation when jumping to state." 2011-06-24 23:12:38 -07: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
8ed2acd838 Merge "Introduce MarginLayoutParams marginStart and margingEnd" 2011-06-24 19:00:30 -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
f7afae5cc8 Merge "Update GLTextureView sample to do something real." 2011-06-24 18:52:47 -07:00
Romain Guy
d0d0705994 Update GLTextureView sample to do something real.
Change-Id: I55a62434ae0b602522221689626f6b4155bd0d91
2011-06-24 18:51:28 -07:00
Jim Miller
f782ded942 Merge "LockScreen layout, button style, and owner info fixes - enable OwnerInfo to appear in status1 if dedicated view not present. - force all status lines to be singleline and marquee. - fix justification in landscape layouts. - use buttonBarStyle for buttons on all LockScreens. - reduce the size of the clock to fit in landscape. - no longer show "Draw a pattern to unlock" help message in LockPatternView." 2011-06-24 18:44:08 -07:00
Andrew Sapperstein
8ab3dc7a3e Fixing various broken javadoc comments in framework.
Change-Id: I48a6b3c268e8ebf3aa2ff3a1de7ff5fa6f8f6de7
2011-06-24 18:29:41 -07:00
Romain Guy
44f8d6bd15 Merge "Don't set texture parameters on every frame." 2011-06-24 17:54:25 -07:00
Romain Guy
4a5a71518a Don't set texture parameters on every frame.
Change-Id: Iec368405ad6a4ccfd569a0b3b4d681871a770396
2011-06-24 17:53:53 -07:00
Jim Miller
7377cd0ab4 LockScreen layout, button style, and owner info fixes
- enable OwnerInfo to appear in status1 if dedicated view not present.
- force all status lines to be singleline and marquee.
- fix justification in landscape layouts.
- use buttonBarStyle for buttons on all LockScreens.
- reduce the size of the clock to fit in landscape.
- no longer show "Draw a pattern to unlock" help message in LockPatternView.

Change-Id: I1ff51550e2180f9d912c8f710ad5e2fd2424d373
2011-06-24 17:45:34 -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
Scott Main
01ecdcc756 am b9d7873c: am a602972c: am 1acd2a7f: Merge "docs: add Lenevo driver info" into honeycomb-mr2
* commit 'b9d7873cecdc6052ed4004293ead2071db7fb24c':
  docs: add Lenevo driver info
2011-06-24 17:15:53 -07:00
Jeff Sharkey
a0ac98bd5c Finish any enter animation when jumping to state.
When jumpDrawablesToCurrentState(), finish any alpha animation in
progress.  Fixes bug where drawable with enter fade would remain
transparent until next state change.

Change-Id: Ia087f935566a8d78e0efdcb0a1a2f791db05c70e
2011-06-24 17:08:12 -07:00
Tsu Chiang Chuang
b40ec927bb Merge "adding notification stress tests." 2011-06-24 16:55:36 -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
Robert Greenwalt
554475f09c Merge "resolved conflicts for merge of 40717996 to master" 2011-06-24 16:39:08 -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
Tsu Chiang Chuang
a760e55783 adding notification stress tests.
Change-Id: Ideaae33843685fcbec4c4f38bf9c2ced97c9bf86
2011-06-24 16:19:37 -07:00
Robert Greenwalt
86994c1fc1 resolved conflicts for merge of 40717996 to master
Change-Id: Ie5c0f1f20c313d6c568b3b06f778f75223914ada
2011-06-24 16:10:06 -07:00
Isaac Levy
bc7dfb58bf WifiWatchdogService - disable bad connections
Complete rewrite of WifiWatchdogService.java.  Checking for connectivity and managing wifi upon failure detection.

Change-Id: Ifcb8b5d7e0112cbc2f2282d76fdc93ea15527a44
2011-06-24 15:48:10 -07:00
Dianne Hackborn
7cec14235d Merge "Small cleanup of am/pm commands." 2011-06-24 15:22:22 -07:00