Merge commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d' into kraken
* commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d':
Add a new intent category used for activities running in carmode.
Merge commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4' into froyo-plus-aosp
* commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4':
Add a new intent category used for activities running in carmode.
Merge commit '90bd943364af8af8e3409f3fffe409f724a4210b' into kraken
* commit '90bd943364af8af8e3409f3fffe409f724a4210b':
Dont start wifi if in airplane mode
Merge commit '9c50996b175a1ee4b0069cba5163310c0189ac36' into froyo-plus-aosp
* commit '9c50996b175a1ee4b0069cba5163310c0189ac36':
Dont start wifi if in airplane mode
Now that wifi start is asynchronous
at the time of bring up, make sure
Wifi is not started if in airplane
mode.
Bug: 2567652
Change-Id: I947b7c8480029973bcbf028f6143aabbc88c9793
Merge commit 'f0e62b7a50e3f72a6e7bad510a2d605656b297ad' into kraken
* commit 'f0e62b7a50e3f72a6e7bad510a2d605656b297ad':
Support another kind of iso mpeg4 file.
Merge commit '29039deea99a5529d92f7add3f9077ab247d3acd' into froyo-plus-aosp
* commit '29039deea99a5529d92f7add3f9077ab247d3acd':
Support another kind of iso mpeg4 file.
Merge commit '3667b9b471a6585d22106cbfe4a04111ca86643c' into kraken
* commit '3667b9b471a6585d22106cbfe4a04111ca86643c':
revert the stripping of System Group:
Merge commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e' into froyo-plus-aosp
* commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e':
Make desk mode work again.
Merge commit '30ed25c252e9eb9923d71676e8f703bb775b7cdf' into froyo-plus-aosp
* commit '30ed25c252e9eb9923d71676e8f703bb775b7cdf':
revert the stripping of System Group:
Merge commit 'f5071884809219edb420a4f7c4a0eef9523d7bca' into kraken
* commit 'f5071884809219edb420a4f7c4a0eef9523d7bca':
Add test annotations to frameworks common tests.
Merge commit 'c1548e3819ab4662e6b5f5455f95258b37dc7192' into froyo-plus-aosp
* commit 'c1548e3819ab4662e6b5f5455f95258b37dc7192':
Add test annotations to frameworks common tests.
Allow the user to start scrolling back into content immediately
after dragging past the end of content.
Remove some dead code.
Change-Id: Ife8f60499ac58179ba1e2500ca8745916392a4bc
Merge commit 'f34d9e20c7f4c5537beb4287c79b24ab351bcda4' into kraken
* commit 'f34d9e20c7f4c5537beb4287c79b24ab351bcda4':
Instead of holding an ApplicationContext, JWebCoreJavaBridge
Merge commit '61c3a13e5f9d20c621f49598a0082063404c5f7e' into froyo-plus-aosp
* commit '61c3a13e5f9d20c621f49598a0082063404c5f7e':
Instead of holding an ApplicationContext, JWebCoreJavaBridge
Merge commit '28525488fb5769fb119b01db17dc0ed305f0e7b0' into kraken
* commit '28525488fb5769fb119b01db17dc0ed305f0e7b0':
Fix bug 2565463 Ensure an object cannot appear twice in the
Merge commit '6c8770df939782d767fdf2cdb68c4a289015a5e6' into kraken
* commit '6c8770df939782d767fdf2cdb68c4a289015a5e6':
Use local lock for most MediaMetadataRetriever methods. Bug 2560834.
Merge commit '9ab05fff41e983c9b3175096c320aefced81276b' into froyo-plus-aosp
* commit '9ab05fff41e983c9b3175096c320aefced81276b':
Fix bug 2565463 Ensure an object cannot appear twice in the
Merge commit 'd9c16c37ea28933973f32cb434f770226266b675' into froyo-plus-aosp
* commit 'd9c16c37ea28933973f32cb434f770226266b675':
Use local lock for most MediaMetadataRetriever methods. Bug 2560834.
Merge commit '15be35f6c9a88f453ba3a6be8d93fed8537ad77e' into kraken
* commit '15be35f6c9a88f453ba3a6be8d93fed8537ad77e':
Fix 2538826: Allow aspect of LockPatternView to be customized.
Merge commit 'bf1259b8a6a44d7a4eab5131cd33dac0fbcb50b6' into froyo-plus-aosp
* commit 'bf1259b8a6a44d7a4eab5131cd33dac0fbcb50b6':
Fix 2538826: Allow aspect of LockPatternView to be customized.
This fixes a problem where the pattern unlock area shrank on
mdpi devices.
This change is required since some devices (mdpi) don't have
enough vertical room to show a square LockPatternView and shrink
the area to match the minimum of width and height. To fix the
problem and minimize changes to existing platforms, the parameter
is configurable and has a default in values/donottranslate that
emulates the old behavior. New behavior for mdpi devices is
specified in values-port-mdpi/donottranslate, which is the
only place we currently see the problem.
Tested:
mdpi device in both orientations
hdpi device in both orientations
hdpi device in both orientations with keyboard open/closed
Change-Id: I3b9a5ef1d9b5e70f7b1823c9f48a3938f52cc7a4
Move all tests for android.* classes from tests/AndroidTests and
tests/CoreTests into framework/base/<core|graphics>/tests.
Consolidate all tests for java.* classes to tests/CoreTests.
Eventually hopefully these will be moved to dalvik/ somewhere.
Remove tests/AndroidTests entirely.
Change-Id: I86584d086ab7bd045bb38a10b699907805298a95
