Merge commit 'aa40b834985023642b30fa2e0563c414a994bd3a'
* commit 'aa40b834985023642b30fa2e0563c414a994bd3a':
Add some encoding parameters for the "record" utility
Merge commit 'b1824cfca7dde367197662953b7478a9dbceab27'
* commit 'b1824cfca7dde367197662953b7478a9dbceab27':
fix the build. will revisit this change in a minute
Merge commit '5238c5f9a55ae1fff3548c028003e47ab8ffe09c'
* commit '5238c5f9a55ae1fff3548c028003e47ab8ffe09c':
fix the build. will revisit this change in a minute
Merge commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca' into gingerbread-plus-aosp
* commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca':
Add some encoding parameters for the "record" utility
Merge commit '54901c9e8497b33bab1462245864e9dd119bb64c' into gingerbread-plus-aosp
* commit '54901c9e8497b33bab1462245864e9dd119bb64c':
fix the build. will revisit this change in a minute
Merge commit 'd6a5f2dff9c9db3e154a461127a7cfcea05c1f90'
* commit 'd6a5f2dff9c9db3e154a461127a7cfcea05c1f90':
Revert "Shutdown when capacity is 0% and no charging or when battery is dead"
Merge commit 'd3e803ae28c369996f9acf6036ea99af5561949c' into gingerbread-plus-aosp
* commit 'd3e803ae28c369996f9acf6036ea99af5561949c':
Revert "Shutdown when capacity is 0% and no charging or when battery is dead"
This reverts commit fd04143a47.
This break most automated tests because with this change, if the
device is fully charged, it will simply turn off the screen, regardless
if USB is connected to hsot PC or not; so for our tests, most of them
are always connected to host PC, and fully charged 99% of the time,
as soon as the screen turns off, the front-end test Activity will be
suspended.
Change-Id: I1e6590611af43812f1bac223dd31570d1d90cfc5
Merge commit '18551815e5a45f236f9898ce4abc9b99f5fc6ae4'
* commit '18551815e5a45f236f9898ce4abc9b99f5fc6ae4':
DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Merge commit '77881293ad9a68dfa1c1da4b466f7b2b6465b342' into gingerbread-plus-aosp
* commit '77881293ad9a68dfa1c1da4b466f7b2b6465b342':
DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
VideoSourceDownSampler takes in a real video source. The MediaSource
interface is then implemented by shortcircuiting calls to this real source,
except for the read() function. For read we first call read of the real
source, then downsample the frame to the desired size and return that.
Change-Id: I6e1b377e043e136a70a7b03792eb9165bbe26398
added setAuxiliaryOutputFile to allow setting of an auxiliary output file.
Also added the JNI support.
Change-Id: I8c3335192bd6f7fcbfdfc8552cfd0848f2ad2a5d
- Added setOutputFileAuxiliary to pass the auxiliary file descriptor. The java
interface through JNI will be checked in next.
- renamed setupCameraSource to setupCamera as the function just sets the camera.
- Added setupCameraSource which sets up the camera source. This functionality
was in setupVideoEncoder before.
- setupVideoEncoder now takes in a cameraSource instead of creating it on it
own.
- Refactored startMPEG4Recording() to use setupMPEG4Recording,
setupMPEG4MetaData.
- setupMPEG4Recording() takes in file descriptor, bitrates to setup a mpeg4
writer. This function can be called multiple times to setup multiple
writers.
- Added setupMPEG4MetaData() for setting up the meta data for mpeg4 writer.
startMPEG4Recording() now calls setupMPEG4Recording, setupMPEG4MetaData for
each recording session.
Change-Id: I07f5334a1ff8e12a36f58e94129fcfa6add2208b
Merge commit '1577e629866b2700e31c9467478e05ebffcc69a1'
* commit '1577e629866b2700e31c9467478e05ebffcc69a1':
fixedfft: Only includes cpu-features.h when __arm__ is defined.
Merge commit '6eb5ac9ceeb3ff67d38c7ead54b4247e762f278d' into gingerbread-plus-aosp
* commit '6eb5ac9ceeb3ff67d38c7ead54b4247e762f278d':
Fix doc link in InputDevice.
Merge commit '12006013cc2cd0a076855ed068f5f782b24631c3' into gingerbread-plus-aosp
* commit '12006013cc2cd0a076855ed068f5f782b24631c3':
fixedfft: Only includes cpu-features.h when __arm__ is defined.
Merge commit '0a77ce277c6ed2aa25bbea5f8cd5687c0720cb68' into gingerbread-plus-aosp
* commit '0a77ce277c6ed2aa25bbea5f8cd5687c0720cb68':
New edge effects for scrolling widgets (overscroll)
TODO: Currently disabled for WebView. Assets used for the glow effect
need to be themable/styleable. Overscroll effect should take place
even when the user did not grab the widget within actual content.
Change-Id: I68277d14d37dc5bcdb9254eaddf6e4998b3f2bf4
Finished the input device capability API.
Added a mechanism for calibrating touch devices to obtain more
accurate information about the touch contact area.
Improved pointer location to show new coordinates and capabilities.
Optimized pointer location display and formatting to avoid allocating large
numbers of temporary objects. The GC churn was causing the application to
stutter very badly when more than a couple of fingers were down).
Added more diagnostics.
Change-Id: Ie25380278ed6f16c5b04cd9df848015850383498
Also removes the artifical restriction that only one apply() can be in
flight at once. That was old from when I thought it'd end up being
required, but wasn't.
Change-Id: I3540ea8be6e0760d6a51d218186f71655c2f3f55
