Merge commit '779d1778b6147ee1b57428af234d1498a26f031e'
* commit '779d1778b6147ee1b57428af234d1498a26f031e':
Include debugger connection status in error entry
Merge commit '1bdba9fa3178d00a03dcbc3ede1818f7bff07e61'
* commit '1bdba9fa3178d00a03dcbc3ede1818f7bff07e61':
GPS: Fix another race condition in GPS HAL initialization
Merge commit 'a23964f9a1df7fb2f18e350fb4215933674f9991'
* commit 'a23964f9a1df7fb2f18e350fb4215933674f9991':
bug:3082865 don't use IN to construct sql to delete downloads
Merge commit 'ca1db5ae68971779fd8af83c908128849f470ae0'
* commit 'ca1db5ae68971779fd8af83c908128849f470ae0':
Fallback to SharedPreferences$Editor.commit() when no apply() exists.
Merge commit 'ceb3aae348d4b17e6282fe7706fc22b699ee9a1d'
* commit 'ceb3aae348d4b17e6282fe7706fc22b699ee9a1d':
Avoid pre-processing images when they won't be used
Merge commit '41aabeb51305d19747687f246080f44fc2a74435'
* commit '41aabeb51305d19747687f246080f44fc2a74435':
Added more robust tracking and cancelation of events.
Fixes file transfer from device to host with libmtp.
Change-Id: Ifb304c1f106e94b2710ee5c11816b83cf5f25478
Signed-off-by: Mike Lockwood <lockwood@google.com>
* Added preliminary ButtonGroup support for buttons that display as a unit.
* Fixed a bug with MenuBuilder that caused old-style icon menus to fail.
* Added support for explicitly setting line height in text.
Change-Id: I1ba65f09dd9e1bc833d247ebe72052a21e3f99f0
Merge commit '390aceaf530b40702e0b30bd51b5eef793c0ac5a'
* commit '390aceaf530b40702e0b30bd51b5eef793c0ac5a':
DO NOT MERGE Set the cap at alpha to 80% of the total available.
Merge commit '748b413e94c73b760c63a03126df2c4712a1ae05'
* commit '748b413e94c73b760c63a03126df2c4712a1ae05':
GPS: Do not call sGpsInterface->init() multiple times
Merge commit '833db40866ebf27be33aa387d08a2cb0b9a4246d'
* commit '833db40866ebf27be33aa387d08a2cb0b9a4246d':
Do not release the wifi lock if the screen is off.
Merge commit '4c2c62fe08c736273dd9fb5910dedc7ecdc5f4b3'
* commit '4c2c62fe08c736273dd9fb5910dedc7ecdc5f4b3':
add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
Merge commit '37c8ad779fb171470af2757b5750c1b5f2d1f368'
* commit '37c8ad779fb171470af2757b5750c1b5f2d1f368':
DO NOT MERGE Limit the height of the pull glow.
Merge commit '59d5d966665dfebb1b03c4b1eba9eff3d9c797ce'
* commit '59d5d966665dfebb1b03c4b1eba9eff3d9c797ce':
docs: a few style adjustments to admin doc
There is a hard-coded limit to the frame rate of animations; this commit increases that rate by changing the inter-frame delay from 30 ms to 10 ms (although the actual delay will be determined by the maximum refresh rate of the system and the system load). For example, the effective maximum on current devices is 55 fps, or a delay of about 16 ms.
Change-Id: Id96a41cef36851e2d9508a98934f4b25595251ea