Rob Tsuk
4678dcc552
Add a way to override Xfermode DO NOT MERGE
...
Add a non-public API to Canvas/GLES20Canvas to provide a way to draw
the touch ripple animation without using a save layer.
Change-Id: I6e2095adffe515194f669fb75bb67abf813bd518
2014-11-12 12:25:24 -08:00
Eric Laurent
edd4a227e5
Merge "audiosystem JNI: check env pointer before use." into lmp-mr1-dev
2014-11-12 20:19:52 +00:00
Sandeep Siddhartha
850ec91e88
Merge "Don't unload the sound model on stopRecognition" into lmp-mr1-dev
2014-11-12 20:12:39 +00:00
Fyodor Kupolov
d01ff6d4c3
Added synchronization to handlePackagesChanged method
...
Method handlePackagesChanged modifies the policy data without holding the
lock. It also calls methods which expect a lock to be held -
validatePasswordOwnerLocked, syncDeviceCapabilitiesLocked, saveSettingsLocked.
Bug: 18262633
Change-Id: Ia4bdc6edc66bccf8a4288e048171ff20858ae2f6
2014-11-12 11:27:21 -08:00
Dan Albert
ff1d8a6635
Move frameworks/base over to libc++.
...
Bug: 15193147
Change-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e
2014-11-12 11:22:20 -08:00
Eric Laurent
449c588710
audiosystem JNI: check env pointer before use.
...
Bug: 18332935.
Change-Id: I1ec820f0282833e13444ec05d50da3ce70d19d8d
2014-11-12 11:07:48 -08:00
Ruben Brunk
68ced89949
Merge "Frameworks/base: Right transform in DngCreator" into lmp-mr1-dev
2014-11-12 18:46:47 +00:00
Adam Powell
05f35127e3
Optimize setting padding and backgrounds for views
...
Don't reset the entire chain of child views whenever we set our own
padding or background; clear our own bidi resolution bits only. This
prevents doing a lot of extra recursive work when changing properties
of a parent view that cannot affect children.
Bug 18159214
Change-Id: I94300402785c79c3199e768ad7b6d7027d8d5d5f
2014-11-12 10:26:32 -08:00
Alan Viverette
f9afb46bf7
Fix default attributes in ScaleDrawable
...
Reverts default scales to correct value of -1, uses existing state
values when updating from typed array.
BUG: 18351309
Change-Id: I45d21fe017a7bea10e3cbda50f6db65d053aa2ec
2014-11-12 10:24:40 -08:00
Wale Ogunwale
2755644d32
Merge "Fix build breakage from missing close brace." into lmp-mr1-dev
2014-11-12 18:22:12 +00:00
Nick Kralevich
d71152fc8d
am 6e5b14c4: Merge "Drop unused String."
...
automerge: 56dd295
* commit '56dd295b69a78017baf44491cb27fcaaf8101f1c':
Drop unused String.
2014-11-12 18:15:31 +00:00
Nick Kralevich
56dd295b69
am 6e5b14c4: Merge "Drop unused String."
...
* commit '6e5b14c411f7ebdae610c1074e7d4d2d5d2a9550':
Drop unused String.
2014-11-12 18:14:23 +00:00
smain@google.com
0c217f9b8b
am e9e96e7f: am 7d0d2f6c: am c6bd0155: am 8d88f19b: am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs
...
automerge: be0737c
* commit 'be0737cdff2758a1dad4d65a070a9deb16913452':
fix code type and mention api level 21 exception for bindService()
2014-11-12 18:12:37 +00:00
Renato Mangini
42ec09fb2f
am 68fde80a: am 2a3ce185: am ca011519: am a53b8bad: am 4b7b68d8: Add "notification" category for samples.
...
automerge: d76afdb
* commit 'd76afdb5e7978b5d57214bd83cacc754e23bfe60':
Add "notification" category for samples.
2014-11-12 18:11:24 +00:00
smain@google.com
be0737cdff
am e9e96e7f: am 7d0d2f6c: am c6bd0155: am 8d88f19b: am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs
...
* commit 'e9e96e7f0e372459372b31b138124d0760ed2689':
fix code type and mention api level 21 exception for bindService()
2014-11-12 18:09:54 +00:00
Renato Mangini
d76afdb5e7
am 68fde80a: am 2a3ce185: am ca011519: am a53b8bad: am 4b7b68d8: Add "notification" category for samples.
...
* commit '68fde80a475cdfe4534378a8fdd97d2ac53c24a6':
Add "notification" category for samples.
2014-11-12 18:09:48 +00:00
Nick Kralevich
6e5b14c411
Merge "Drop unused String."
2014-11-12 18:05:16 +00:00
smain@google.com
e9e96e7f0e
am 7d0d2f6c: am c6bd0155: am 8d88f19b: am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs
...
* commit '7d0d2f6c95aa01d6aa43217dec2e183403e7c514':
fix code type and mention api level 21 exception for bindService()
2014-11-12 18:04:11 +00:00
Renato Mangini
68fde80a47
am 2a3ce185: am ca011519: am a53b8bad: am 4b7b68d8: Add "notification" category for samples.
...
* commit '2a3ce1853cb5aba8dc1bb9cb9479ec962f8b1e86':
Add "notification" category for samples.
2014-11-12 18:04:05 +00:00
Mike Lockwood
083450a4dc
am 4951482c: Merge "Skip receiver if failed linkToDeath to ILocationListener"
...
automerge: ebc3d88
* commit 'ebc3d88380c6aa08ccae28c97d3b6374c20882e2':
Skip receiver if failed linkToDeath to ILocationListener
2014-11-12 18:01:22 +00:00
Mike Lockwood
ebc3d88380
am 4951482c: Merge "Skip receiver if failed linkToDeath to ILocationListener"
...
* commit '4951482c4de1780a9103189aa4eff93b2e91c804':
Skip receiver if failed linkToDeath to ILocationListener
2014-11-12 18:00:09 +00:00
Sandeep Siddhartha
45c00b5877
Don't unload the sound model on stopRecognition
...
This helps us in majority of the scenarios where the sound model doesn't
change across start/stop calls.
Bug: 17954633
Change-Id: Ibff817bb69bc69d2bb3a2603460fed596688b892
2014-11-12 09:57:27 -08:00
smain@google.com
7d0d2f6c95
am c6bd0155: am 8d88f19b: am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs
...
* commit 'c6bd0155a76842e39ea0bb75eca33e6e3804437c':
fix code type and mention api level 21 exception for bindService()
2014-11-12 17:56:26 +00:00
Renato Mangini
2a3ce1853c
am ca011519: am a53b8bad: am 4b7b68d8: Add "notification" category for samples.
...
* commit 'ca011519b61e2ae57dfe760547d7d073f7ec42f3':
Add "notification" category for samples.
2014-11-12 17:56:20 +00:00
smain@google.com
c6bd0155a7
am 8d88f19b: am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs
...
* commit '8d88f19bfe8ec0afb27593c0dea9b547d8c80b48':
fix code type and mention api level 21 exception for bindService()
2014-11-12 17:52:06 +00:00
Renato Mangini
ca011519b6
am a53b8bad: am 4b7b68d8: Add "notification" category for samples.
...
* commit 'a53b8badb994c3825140f68eba94888b3274c0b5':
Add "notification" category for samples.
2014-11-12 17:52:02 +00:00
Mike Lockwood
4951482c4d
Merge "Skip receiver if failed linkToDeath to ILocationListener"
2014-11-12 17:50:20 +00:00
Wale Ogunwale
1dfab89aff
Fix build breakage from missing close brace.
...
Change-Id: Ib0e58844b8b208d255ff8d9409d0e7c53f27378f
2014-11-12 09:46:10 -08:00
smain@google.com
8d88f19bfe
am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs
...
* commit 'f9c4f6b56e1392a411e2996a2bf372873ebf14da':
fix code type and mention api level 21 exception for bindService()
2014-11-12 17:44:52 +00:00
Andreas Gampe
586c36780e
am b93f8d02: Merge "Frameworks/base: Wall Werror in common_time"
...
automerge: 7be350d
* commit '7be350d2cf4415ee08f628ffe1b06f5f17a71411':
Frameworks/base: Wall Werror in common_time
2014-11-12 17:44:49 +00:00
Renato Mangini
a53b8badb9
am 4b7b68d8: Add "notification" category for samples.
...
* commit '4b7b68d824ee8bf184f6bfb05f75c74c129a9f8e':
Add "notification" category for samples.
2014-11-12 17:44:48 +00:00
Andreas Gampe
7be350d2cf
am b93f8d02: Merge "Frameworks/base: Wall Werror in common_time"
...
* commit 'b93f8d02f886d078b268fe5fd61a95f6911c2644':
Frameworks/base: Wall Werror in common_time
2014-11-12 17:42:50 +00:00
Alan Viverette
ca462ded8a
am c164b97f: am 4fc2ea84: Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev
...
automerge: 0dea93c
* commit '0dea93c0ca1d4ec03fa641d19a25f1267165eecd':
Ensure time picker dialog fits on small screens
2014-11-12 17:41:49 +00:00
smain@google.com
f9c4f6b56e
Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs
2014-11-12 17:41:36 +00:00
Alan Viverette
0dea93c0ca
am c164b97f: am 4fc2ea84: Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev
...
* commit 'c164b97f465813e8ef7b52378d48b5af80abb4fa':
Ensure time picker dialog fits on small screens
2014-11-12 17:40:23 +00:00
Shishir Agrawal
5c1a63c223
Add new API to set voicemail number.
...
The API is protected by system or carrier privilege.
Bug: 17393589
Change-Id: I33f4a00b30e0f5d72e5d53553a187d974872eab6
2014-11-12 09:38:18 -08:00
smain@google.com
9adc33a658
fix code type and mention api level 21 exception for bindService()
...
Change-Id: I45460a1559960a32818e9cc88b1241b26f2f1f7d
2014-11-12 09:38:00 -08:00
Alan Viverette
c164b97f46
am 4fc2ea84: Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev
...
* commit '4fc2ea8402b62001b225bf4e1a335c4cbf3b65ea':
Ensure time picker dialog fits on small screens
2014-11-12 17:35:58 +00:00
Andreas Gampe
b93f8d02f8
Merge "Frameworks/base: Wall Werror in common_time"
2014-11-12 17:35:15 +00:00
Andreas Gampe
4fc2fd3ce5
Merge "resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp"
2014-11-12 17:34:38 +00:00
Alan Viverette
4fc2ea8402
Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev
2014-11-12 17:32:31 +00:00
Alan Viverette
d9f3fdf45b
Ensure time picker dialog fits on small screens
...
Also fixes dialog padding in landscape mode and a bug in the
ColorStateList method used to apply a selected color.
BUG: 18251582
Change-Id: Id5b8c7893ec42fd4d5f4a7520e6ac170839d3143
2014-11-12 09:31:22 -08:00
Selim Cinek
1dc406505c
Increases the falsing threshold when for the keyguard affordances
...
The minimum amount has been increased by 20dp and in addition the
Motion is cancelled whenever a POINTER_DOWN occurs, which should
help a lot with falsing.
Bug: 18298401
Change-Id: I04b1f30fd2555c08209224f4e84c610ecd7a33f1
2014-11-12 18:24:58 +01:00
Geoff Mendal
e9157de21b
am 832f0770: (-s ours) am cfefab71: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
automerge: 9ccf502 -s ours
* commit '9ccf502c80311ac9621645307e126341ffa80eb2':
Import translations. DO NOT MERGE
Fixed constant window switching on lock screen with Swype KB.
2014-11-12 17:23:48 +00:00
Wale Ogunwale
c3672cd3f7
Cancel or drop key events if activity is stopped.
...
After an activity instance state is saved due to onStop()/onPause(),
there is a small window where it can still get key events like the
back button since we still allow the ActivityThread to handle
pending messages (like memory trim request) before informing the
activity manager that we are done. If the activity is stopped,
we will now drop non-terminal input events and set the cancel
flag on terminal events.
Bug: 18151331
Change-Id: I370d7c871530eea4b16fa42428d0248f1a87abb6
2014-11-12 09:23:22 -08:00
Geoff Mendal
199f8de027
am b3f447e9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
automerge: 6a3e6d1 -s ours
* commit '6a3e6d13107c01c4a98eb7e333bad1348277498a':
Import translations. DO NOT MERGE
2014-11-12 17:22:48 +00:00
Geoff Mendal
9ccf502c80
am 832f0770: (-s ours) am cfefab71: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '832f0770c79369a76fe72ea210fb7a1fcbd958ff':
Import translations. DO NOT MERGE
Fixed constant window switching on lock screen with Swype KB.
2014-11-12 17:20:56 +00:00
Geoff Mendal
6a3e6d1310
am b3f447e9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit 'b3f447e9ca9fd3ed62dec3bdcc049de330f5e053':
Import translations. DO NOT MERGE
2014-11-12 17:20:50 +00:00
Geoff Mendal
832f0770c7
am cfefab71: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'cfefab71b1db5500fa3c294a816a3ccb0990242c':
Import translations. DO NOT MERGE
Fixed constant window switching on lock screen with Swype KB.
2014-11-12 17:15:48 +00:00
Geoff Mendal
d5f3ab7b16
Merge "Import translations. DO NOT MERGE"
2014-11-12 17:08:06 +00:00