Yorke Lee
5782a15f9c
am 903343c2: am 37a32c03: am af99dec4: Merge "Replace Calls.FEATURES_NONE with 0 (1/4)" into lmp-dev
...
* commit '903343c228f611b5634cbc22bf000fbf0129d287':
Replace Calls.FEATURES_NONE with 0 (1/4)
2014-09-08 22:27:01 +00:00
Yorke Lee
b8bf1691cc
am 37a32c03: am af99dec4: Merge "Replace Calls.FEATURES_NONE with 0 (1/4)" into lmp-dev
...
* commit '37a32c038db23533ab1bcc0b14fa48ed61e74a60':
Replace Calls.FEATURES_NONE with 0 (1/4)
2014-09-08 22:03:12 +00:00
Yorke Lee
478f5a6212
Merge "Replace Calls.FEATURES_NONE with 0 (1/4)" into lmp-dev
2014-09-08 21:43:30 +00:00
Kenny Guy
234976566b
am 832413a5: am 61512739: am 4e9c9518: Merge "Renaming of LauncherApps apis" into lmp-dev
...
* commit '832413a5d48600c15870bdb7821371a16ee7f43e':
Renaming of LauncherApps apis
2014-09-08 21:15:54 +00:00
Kenny Guy
bfe9677083
am 61512739: am 4e9c9518: Merge "Renaming of LauncherApps apis" into lmp-dev
...
* commit '6151273901851d5338989085b23a0eff0ac61aa3':
Renaming of LauncherApps apis
2014-09-08 21:00:56 +00:00
Kenny Guy
d9037a48c6
Merge "Renaming of LauncherApps apis" into lmp-dev
2014-09-08 20:47:07 +00:00
Yorke Lee
e3198b719f
Replace Calls.FEATURES_NONE with 0 (1/4)
...
Bug: 17253963
Change-Id: I9e9e56cdf4c9a60ac1e047bef0eba2ba0c8f10fb
2014-09-08 13:33:51 -07:00
Kenny Guy
3f5cb5dca7
am 9c7d3b6d: am 9e9524a4: am 652e64d3: Merge "Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn\'t make sure we will get an ApplicationInfo for the user being requested. So reverting." into l
...
* commit '9c7d3b6dbc64d58a919a6ad8a8b8235218825628':
Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn't make sure we will get an ApplicationInfo for the user being requested. So reverting.
2014-09-08 20:31:33 +00:00
Kenny Guy
ff25ce9b7b
am 9e9524a4: am 652e64d3: Merge "Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn\'t make sure we will get an ApplicationInfo for the user being requested. So reverting." into lmp-dev
...
* commit '9e9524a4fcd6392114b6f024a21d31e78e62422c':
Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn't make sure we will get an ApplicationInfo for the user being requested. So reverting.
2014-09-08 20:21:08 +00:00
Elliott Hughes
a559a68c36
am d2f9559a: Merge "resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp
...
* commit 'd2f9559ad7cff93527a05cb85172a7bb29f4d9b2':
Small documentation fixes across many files.
2014-09-08 20:15:07 +00:00
Jorim Jaggi
57d240c54b
am fbc3e5f1: am b226b3bf: am 5d629572: Merge "Restrict line count for BigTextStyle" into lmp-dev
...
* commit 'fbc3e5f158f5ea720e7b550da2fc202850d50d08':
Restrict line count for BigTextStyle
2014-09-08 20:15:02 +00:00
Elliott Hughes
1eb6a248ac
Merge "resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp
2014-09-08 20:10:04 +00:00
Elliott Hughes
4656e69bf3
resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp
...
Change-Id: I5148eda624e8504f12dbc1288cd4a7a5b7c10850
2014-09-08 13:08:43 -07:00
Jorim Jaggi
58efcc60b9
am b226b3bf: am 5d629572: Merge "Restrict line count for BigTextStyle" into lmp-dev
...
* commit 'b226b3bfdde6bb1b0a6cf4b7bf40bcb5821784d8':
Restrict line count for BigTextStyle
2014-09-08 20:05:18 +00:00
Kenny Guy
48f0b48555
Merge "Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn't make sure we will get an ApplicationInfo for the user being requested. So reverting." into lmp-dev
2014-09-08 20:02:10 +00:00
Jorim Jaggi
f98fbb710b
Merge "Restrict line count for BigTextStyle" into lmp-dev
2014-09-08 19:46:45 +00:00
Svet Ganov
c799d6e437
am 60632d7c: am 48c6c70e: am a00c7eb9: Merge "Clicking on partially coverd views by other views or windows." into lmp-dev
...
* commit '60632d7c75cbacc373edd4762f82baa1c4620237':
Clicking on partially coverd views by other views or windows.
2014-09-08 19:17:25 +00:00
Dharmesh Mokani
7bd7480d27
am 5d115ecb: am f21cd716: am e70ac872: Merge "Remove old methods : AlwaysOnHotwordDetector" into lmp-dev
...
* commit '5d115ecb0f1e6e8ffbda68f7e8cf5057f4d40440':
Remove old methods : AlwaysOnHotwordDetector
2014-09-08 19:17:19 +00:00
Svet Ganov
c956c88093
am 48c6c70e: am a00c7eb9: Merge "Clicking on partially coverd views by other views or windows." into lmp-dev
...
* commit '48c6c70eca05698f94d1b97884e29c2b03ae8f89':
Clicking on partially coverd views by other views or windows.
2014-09-08 19:03:43 +00:00
Dharmesh Mokani
5c84168b93
am f21cd716: am e70ac872: Merge "Remove old methods : AlwaysOnHotwordDetector" into lmp-dev
...
* commit 'f21cd7160ecf482d7f00b301f844355b43bb90e9':
Remove old methods : AlwaysOnHotwordDetector
2014-09-08 19:03:35 +00:00
George Mount
da8ec6f42b
am d5f92cb6: am 055417d3: am f7b281a6: Merge "Use Alpha instead of TransitionAlpha for Activity Transitions." into lmp-dev
...
* commit 'd5f92cb668532757e06258918fa184703f96c809':
Use Alpha instead of TransitionAlpha for Activity Transitions.
2014-09-08 18:59:33 +00:00
Kenny Guy
c2a4060005
Revert "Ensure ApplicationInfo is for correct user for system/android package."
...
Cache in ActivityThread means this still doesn't make sure we will
get an ApplicationInfo for the user being requested. So reverting.
This reverts commit 4a3b8aa08d743b28d53b327597abf03a925641f2.
Bug:17002733
Change-Id: Ie40eb31c4074cea09de3d6a41fe38b14e00eb059
2014-09-08 18:53:56 +00:00
Elliott Hughes
2008cff73b
am ab94a167: Merge "Small documentation fixes across many files."
...
* commit 'ab94a1676e6280f1b6d83e0f8b02849ff62faf4f':
Small documentation fixes across many files.
2014-09-08 18:51:22 +00:00
George Mount
7f03e02dc4
am 055417d3: am f7b281a6: Merge "Use Alpha instead of TransitionAlpha for Activity Transitions." into lmp-dev
...
* commit '055417d3255810a5d940fe5a94b8713906370344':
Use Alpha instead of TransitionAlpha for Activity Transitions.
2014-09-08 18:49:27 +00:00
Svet Ganov
2bb02c799c
Merge "Clicking on partially coverd views by other views or windows." into lmp-dev
2014-09-08 18:45:04 +00:00
Elliott Hughes
ab94a1676e
Merge "Small documentation fixes across many files."
2014-09-08 18:44:14 +00:00
Dharmesh Mokani
2b02f88737
Merge "Remove old methods : AlwaysOnHotwordDetector" into lmp-dev
2014-09-08 18:43:14 +00:00
George Mount
214e7ad175
Merge "Use Alpha instead of TransitionAlpha for Activity Transitions." into lmp-dev
2014-09-08 18:25:03 +00:00
Jeff Sharkey
ec099dad3b
am a1a90815: am fa8211c5: am 2f0ed017: Merge "Delayed ASEC allocation, refine progress handling." into lmp-dev
...
* commit 'a1a9081520ab95dcaf234174143e2ebcd88d71ce':
Delayed ASEC allocation, refine progress handling.
2014-09-08 18:17:59 +00:00
Jeff Sharkey
6098a3acc9
am fa8211c5: am 2f0ed017: Merge "Delayed ASEC allocation, refine progress handling." into lmp-dev
...
* commit 'fa8211c5f7b8939e230f5643cd94a6e8686571b6':
Delayed ASEC allocation, refine progress handling.
2014-09-08 17:00:42 +00:00
Jeff Sharkey
e016605981
Merge "Delayed ASEC allocation, refine progress handling." into lmp-dev
2014-09-08 16:38:42 +00:00
Nicolas Prevot
7068faf4ce
am b329d04e: am de896104: am 09286405: Merge "Marking two flags as final." into lmp-dev
...
* commit 'b329d04ec7ab0818d9deeb644d363151d278a48d':
Marking two flags as final.
2014-09-08 16:33:00 +00:00
Jeff Sharkey
77d218e186
Delayed ASEC allocation, refine progress handling.
...
For restore use-case, session creation needs to complete quickly, so
delay ASEC allocation until session is opened. When preflighting
size checks, only consider external when we have a known size for the
container. Also relax size checks when using MODE_INHERIT_EXISTING
on external, since we don't know how much of existing app will be
copied over.
Consider session as "active" while commit is ongoing, until we're
either finished or pending user interaction.
Always publish first client needle movement away from 0. Use 25% of
internal progress to reflect ASEC allocation.
Avoid CloseGuard messages about leaking PFDs.
Bug: 17405741, 17402982
Change-Id: I6247a1d335d26621549c701c4c4575a8d16ef8c2
2014-09-08 09:31:49 -07:00
Jorim Jaggi
457a10d29c
Restrict line count for BigTextStyle
...
Also fixes paddings for the first line for InboxStyle notifications.
Bug: 17161340
Change-Id: I00a92f256d9ccad7cfbcecb591e84bb0d68ba635
2014-09-08 18:31:03 +02:00
Nicolas Prevot
1d793d1e53
am de896104: am 09286405: Merge "Marking two flags as final." into lmp-dev
...
* commit 'de89610479d59f55de4ef3cbeca62ec27a1c9031':
Marking two flags as final.
2014-09-08 16:23:15 +00:00
Dharmesh Mokani
50c290406a
Remove old methods : AlwaysOnHotwordDetector
...
Bug: 17389896
Change-Id: I47d0ae3ecad0ce8a74ed65a73309faa541b74a06
2014-09-08 09:22:16 -07:00
Nicolas Prevot
97e75e1da9
Merge "Marking two flags as final." into lmp-dev
2014-09-08 16:06:30 +00:00
George Mount
7aeb663cee
am eada4f05: am 2c84e65e: am 850bca01: Merge "Only call setHasTransientState in captureHierarchy." into lmp-dev
...
* commit 'eada4f0565a1d6311bba2112feae90ca80fcca41':
Only call setHasTransientState in captureHierarchy.
2014-09-08 15:21:00 +00:00
George Mount
d6ccafaf3f
am 2c84e65e: am 850bca01: Merge "Only call setHasTransientState in captureHierarchy." into lmp-dev
...
* commit '2c84e65e87d266a7d9b15a9e6719b9f14137fd45':
Only call setHasTransientState in captureHierarchy.
2014-09-08 15:10:54 +00:00
George Mount
a740b2bf9a
Merge "Only call setHasTransientState in captureHierarchy." into lmp-dev
2014-09-08 14:52:34 +00:00
George Mount
cfdfb2262c
am baf19d8c: am 27858e18: am c452d4c9: Merge "Improve Visibility parent value check." into lmp-dev
...
* commit 'baf19d8ceadf195c1ea2cc6201b016a6430db455':
Improve Visibility parent value check.
2014-09-08 14:29:27 +00:00
George Mount
d652526fbe
am 27858e18: am c452d4c9: Merge "Improve Visibility parent value check." into lmp-dev
...
* commit '27858e18146c867e7328ea45f461a4e54ed4b33d':
Improve Visibility parent value check.
2014-09-08 14:18:58 +00:00
George Mount
24e08d0692
Merge "Improve Visibility parent value check." into lmp-dev
2014-09-08 13:59:40 +00:00
Kenny Guy
b7451e4923
am 444c3a9e: am f919288d: am b78a0a11: Merge "Ensure ApplicationInfo is for correct user for system/android package." into lmp-dev
...
* commit '444c3a9eb36e5a2fa9e19c0aed2691503ace43e4':
Ensure ApplicationInfo is for correct user for system/android package.
2014-09-08 13:57:09 +00:00
Kenny Guy
1cc7212086
am f919288d: am b78a0a11: Merge "Ensure ApplicationInfo is for correct user for system/android package." into lmp-dev
...
* commit 'f919288dc7c7fc0d7e1897fe107508b46ce5838c':
Ensure ApplicationInfo is for correct user for system/android package.
2014-09-08 13:46:36 +00:00
Kenny Guy
6a28a8d55c
Merge "Ensure ApplicationInfo is for correct user for system/android package." into lmp-dev
2014-09-08 13:25:02 +00:00
Robin Lee
2c22d1920f
Merge "Revert DevicePolicyManager PrivateKey APIs"
2014-09-08 11:18:24 +00:00
Nicolas Prevot
86a967312a
Marking two flags as final.
...
Marking FLAG_PARENT_CAN_ACCESS_MANAGED and FLAG_MANAGED_CAN_ACCESS_PARENT
as final.
BUG:17387998
Change-Id: I1562b8638e7cce5706df4517493d1732f19ece8f
2014-09-08 12:15:35 +01:00
Przemyslaw Szczepaniak
eb6e3e5ade
am 1e95f1df: am 8d4ecfbf: am 4dc1f927: Merge "API review requests for the TTS package." into lmp-dev
...
* commit '1e95f1df440ef1c8b4fcc11c1b27f33976ecf967':
API review requests for the TTS package.
2014-09-08 10:54:59 +00:00
Przemyslaw Szczepaniak
4577511570
am 8d4ecfbf: am 4dc1f927: Merge "API review requests for the TTS package." into lmp-dev
...
* commit '8d4ecfbf0b78bc6eb6f16df2e6d409f350b14532':
API review requests for the TTS package.
2014-09-08 10:44:44 +00:00