Merge commit '527c02838bed1188b9211752b4cf2fc0c03e8202'
* commit '527c02838bed1188b9211752b4cf2fc0c03e8202':
Work on issue #2991868: A toast pops up informing users...
Changed the new split motion events behavior to match the enshrined
behavior. A return value of false from a target's dispatchTouchEvent
will not prevent the target from receiving further events in the
gesture unless it is the initial ACTION_DOWN event.
Change-Id: Ied8d531dfec7009a4124ed670b1700753c3f9caa
The implementation is simple but tricky. Leave explanations to my
future self so that I don't invent a time machine to come back to
now and slap my self.
This change also simplifies the way the GL blending function is
chosen when compositing a layer. It reuses existing OpenGLRenderer
APIs and is easier to understand.
Change-Id: I1b9cf8c5d51e09836d85b8cf157a1c284aa65c59
Merge commit 'a0eb56ac59751ab7fb060980e14edcacca439635' into gingerbread-plus-aosp
* commit 'a0eb56ac59751ab7fb060980e14edcacca439635':
Work on issue #2991868: A toast pops up informing users...
+ add DATA_CONNECTION_LOST to SipErrorCode
+ convert it to Connection.DisconnectCause.LOST_SIGNAL in SipPhone
http://b/issue?id=2992548
Change-Id: Ie8983c1b81077b21f46304cf60b8e61df1ffd241
...that Market took over the screen after signing into a Google account
Don't warn the user about a new activity coming up on an activity that
is finishing.
Change-Id: I573073139d42a485473d0c8a7df450c1a23c35c3
1. Moved all code related to compiled-sql statement cache to SQLiteCache.java
Removed all caching related code from everywhere else.
2. Moved all code related to compiling a sql statement and caching it to
SQLiteCompiledSql.java. There was some code in SQLiteProgram.java
releated to this. moved it out.
3. Added state to SQLiteCompiledSql. This is to help in debugging.
Change-Id: I63ab0c9c4419e964eb9796d284dd389985763d83
Make the documentation match the current behavior since change ID
Ibdeff170bd386d723f774136b18e0ad59d9cdabb.
Will add @deprecated tags back in in a separate CL. This is just to get
things in the same state as master, following the build breakage mishap.
Change-Id: I47c53700892473061093002c32ad8f095b5813d1
Do not merge to master; an equivalent CL has already been committed there.
This fixes a problem where applications could ask the location
manager to do very heavy-weight things (like... say... update
location every minute), which would get accounted against the
system instead of the application because ultimately it is the
system making the heavy calls (wake locks, etc).
To solve this, we introduce a new class WorkSource representing
the source of some work. Wake locks and Wifi locks allow you
to set the source to use (but only if you are system code and thus
can get the permission to do so), which is what will be reported
to the battery stats until the actual caller.
For the initial implementation, the location manager keeps track
of all clients requesting periodic updates, and tells its providers
about them as a WorkSource param when setting their min update time.
The network location provider uses this to set the source on the
wake and wifi locks it acquires, when doing work because of the
update period.
This should also be used elsewhere, such as in the GPS provider,
but this is a good start.
Change-Id: I2b6ffafad9e90ecf15d7c502e2db675fd52ae3cf
- Time lapse is automatically enabled in setProfile() if a time lapse
profile is selected. Also audio setup is skipped for time lapse.
- Added setCaptureRate() to set the frame capture rate, which may be
different from the video playback rate.
- Getting rid of enableTimeLapse() since setProfile() and
setFrameCaptureDelay() do its job now.
Change-Id: Ifd9f89cea0d05ffbefc22eac4ea5d34147cc1fbe
Merge commit 'cc5494c9996f809e36539b24e8b6b67683383d29' into gingerbread-plus-aosp
* commit 'cc5494c9996f809e36539b24e8b6b67683383d29':
Out Of Band API for Secure Simple Pairing.
Just a quick fix. Will properly re-add @deprecated and update-api next, and
then get API approval.
Change-Id: Idf57a33dc97bc2619cf48509f74d9e0de935124b
