Merge commit 'cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed'
* commit 'cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed':
fixed parsing issue in BluetoothService so that it parses the UUID property correctly
Merge commit 'f23682f128151def4d83d3e2422aea36e0a00061' into gingerbread-plus-aosp
* commit 'f23682f128151def4d83d3e2422aea36e0a00061':
fixed parsing issue in BluetoothService so that it parses the UUID property correctly
This column will be added to the images, audio_meta, video and audio_playlist
tables to cross reference to the MTP objects table.
Renamed MTP_OBJECT_HANDLE (which is used only by the media scanner) to
MEDIA_SCANNER_NEW_OBJECT_ID to avoid confusion.
Change-Id: I8093485dc0438f408a505e82ffddd0710c7a512c
Signed-off-by: Mike Lockwood <lockwood@android.com>
This change adds a new DrawLinearGradientProgram class to enable the drawing
of linear gradients. Two new vertex and fragment shaders are introduced,
based on DrawTextureProgram's shaders.
Change-Id: I885afc076bb6cef8cd3962ae21a086fa6a03bf96
- suppress the "hidden" column from the Calendar API
- add generic "sync5" column which will contain the "hidden" calendar state from the server
Change-Id: Ib2048e9f0fc59f4f544bc6f1787af82fde3984d5
The LinearGradient class keeps a copy of the various parameters that
define the gradient. The copies are native arrays to avoid copying
Java arrays on every draw call. The gradient code path is implemented
until OpenGLRenderer::drawRect() (see TODO.) The actual gradient
implementation will be added in a latter change.
Change-Id: I9300d250ef5e2e9c2e097c3116ee71dfc9d752d8
Merge commit 'd652751de782bac7e37916ed5786fcfa637a2be3'
* commit 'd652751de782bac7e37916ed5786fcfa637a2be3':
Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
Merge commit '04b953132edb5482f0aa6d992f89e7016961528c'
* commit '04b953132edb5482f0aa6d992f89e7016961528c':
Re-use existing Surface objects when reading them from parcels.
This is a common race that happens during application shutdown where the window
may be removed before the input event is finished. The input dispatcher
already recovers from this condition gracefully so there are no benefits to
throwing an exception on the client side.
Bug: 2834068
Change-Id: I53dcc3230464d7f528ac8a1cc9f01b5bb642f428
Merge commit 'b6761e73ce6b255cfe96bfa1fa6ac611abcfc067' into gingerbread-plus-aosp
* commit 'b6761e73ce6b255cfe96bfa1fa6ac611abcfc067':
Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
Merge commit 'c8c79a654d4ae8e3a883854e19cc2df757f72d82' into gingerbread-plus-aosp
* commit 'c8c79a654d4ae8e3a883854e19cc2df757f72d82':
Re-use existing Surface objects when reading them from parcels.
Merge commit '28fe43be5c364a8f7f248a5ac05cf832a83737c2' into gingerbread
* commit '28fe43be5c364a8f7f248a5ac05cf832a83737c2':
Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
This change also modifies the way the clip is stored. The clip is now
always stored in screen-space coordinates.
Change-Id: I96375784d82dfe975bc6477a159e6866e7052487
Merge commit '5adfe6c56369b48e10493c0bb9e9b64ac553a19f'
* commit '5adfe6c56369b48e10493c0bb9e9b64ac553a19f':
Fix the problem that color drawable cache key conflicts another drawable one.
