Esteban Talavera
ef9c523848
Update string value for provisioning action and extra
...
As per API review. This will be submitted in sync with a new version of DMAgent, as the string is hardcoded there.
Bug: 17389863
Change-Id: I3a3d7a9cf05bcb713da8690ceec6af02845a5ff1
2014-09-09 17:14:43 +01:00
Craig Mautner
0321573fa7
Remove deprecated (and now unused) API method.
...
Removes ActivityOptions.makeLaunchTaskBehindAnimation().
Fixes bug 16958544.
Change-Id: I2d58f4235994fe01d55b3309d0ec6f8449c5d5b8
2014-09-09 08:53:56 -07:00
Zoltan Szatmary-Ban
b9c95b8a50
am c39a2152: am 52847478: am 1bb79472: Merge "Extend IKeyChainService AIDL with CACert retrieval" into lmp-dev
...
* commit 'c39a215242b1bc9e89437bd0c187f627288c73ea':
Extend IKeyChainService AIDL with CACert retrieval
2014-09-09 15:04:14 +00:00
Nicolas Prevot
d1d3d2335d
am 1f019e26: am bed59864: am 7d1d9f77: Merge "Allowing a ContentProvider to have a null authority." into lmp-dev
...
* commit '1f019e2641ada90e7c8c9226352609ac305bf6f7':
Allowing a ContentProvider to have a null authority.
2014-09-09 15:03:25 +00:00
Yin-Chia Yeh
808150f066
camera2: make 3A regions null when not available
...
Bug: 17346456
Change-Id: If8e1611614622e7eef6f77e03ef55375650f1c51
2014-09-09 07:56:18 -07:00
Christoph Studer
aca4b25f47
Notification: Use ViewStub for ProgressBar
...
Lazily inflate ProgressBars since they're expensive.
Bug: 17366831
Bug: 17399567
Change-Id: I2b85169a67d41a66fead2fccef2381eaa671c3e4
2014-09-09 15:58:41 +02:00
Zoltan Szatmary-Ban
1dbd4b6646
am 52847478: am 1bb79472: Merge "Extend IKeyChainService AIDL with CACert retrieval" into lmp-dev
...
* commit '52847478b208d8fed1d8b0d191b080b411f3df8b':
Extend IKeyChainService AIDL with CACert retrieval
2014-09-09 11:18:10 +00:00
Zoltan Szatmary-Ban
3fa3d84376
am 1bb79472: Merge "Extend IKeyChainService AIDL with CACert retrieval" into lmp-dev
...
* commit '1bb79472882f5926606713f8b8ddf2e82128051e':
Extend IKeyChainService AIDL with CACert retrieval
2014-09-09 11:08:00 +00:00
Zoltan Szatmary-Ban
1d38f58990
Merge "Extend IKeyChainService AIDL with CACert retrieval" into lmp-dev
2014-09-09 11:05:45 +00:00
Alexandra Gherghina
c788487ae5
Removing the NO_CROSS_PROFILE flag for intent forwarding
...
Bug: 17435289
Change-Id: Iffbecd3cf9338a8633bfcc5bc47247bfc50e7546
2014-09-09 12:04:34 +01:00
Christoph Studer
704dd61f5b
NoLiService: Delete @removed meetsInterruptionFilter
...
This should not break any apps as this API has been marked
@removed more than a week ago.
Bug: 17425123
Change-Id: I19d7e933a3f2a59e1b406a9f87d272f058a13e0d
2014-09-09 11:31:43 +02:00
Nicolas Prevot
d4ca8a19dd
am bed59864: am 7d1d9f77: Merge "Allowing a ContentProvider to have a null authority." into lmp-dev
...
* commit 'bed598649b9eeae6d0112477113bb3904314a10e':
Allowing a ContentProvider to have a null authority.
2014-09-09 09:29:19 +00:00
Nicolas Prevot
a90f97fabe
am 7d1d9f77: Merge "Allowing a ContentProvider to have a null authority." into lmp-dev
...
* commit '7d1d9f774203522c98f65a3e3dceb9dc88be2129':
Allowing a ContentProvider to have a null authority.
2014-09-09 09:17:31 +00:00
Nicolas Prevot
f8a52c0667
Merge "Allowing a ContentProvider to have a null authority." into lmp-dev
2014-09-09 09:07:02 +00:00
Martijn Coenen
826a73b83b
AID prefix registration.
...
Bug: 16517161
Change-Id: I4e008b84fd1372b17a98437ec8a6b71c33d7cd05
2014-09-08 23:49:07 -07:00
Adam Powell
d94728a78c
am 1ae1e4a1: am 2cd0a9ca: am d6fa07e7: Merge "New new design for ResolverActivity" into lmp-dev
...
* commit '1ae1e4a1156580cc5877b8781686e0fccee13c48':
New new design for ResolverActivity
2014-09-09 05:30:42 +00:00
Adam Powell
5b39e1f3bc
am 2cd0a9ca: am d6fa07e7: Merge "New new design for ResolverActivity" into lmp-dev
...
* commit '2cd0a9cace832232252f7344f5c9c5cbca282d99':
New new design for ResolverActivity
2014-09-09 05:21:33 +00:00
Adam Powell
ebbbc4525c
am d6fa07e7: Merge "New new design for ResolverActivity" into lmp-dev
...
* commit 'd6fa07e7a598a070ac70ed0bead3b0a070d1b946':
New new design for ResolverActivity
2014-09-09 03:20:20 +00:00
Riley Andrews
1d13406538
Use surfaceflinger for recents thumbnail rotations.
...
+ This removes 30ms of latency on app to home transitions
on volantis.
Change-Id: Ia3747b8f8be0d41b9b3d095753edfe1df185c84d
2014-09-09 03:15:48 +00:00
Adam Powell
fd1e93d128
New new design for ResolverActivity
...
Switch back to using a list as the grid and differently positioned
activity icons were confusing to users. Keep the distinct "last used"
presentation but align icons and titles with the further choices
below. Adjust this to make the fold more apparent. Remember
open/closed slider state across config changes.
Fix some bugs in nested scrolling and flinging.
Bug 17301272
Change-Id: I175937d5821df27b6ac7ffad7f01cd9a6ed3e3e3
2014-09-08 19:25:37 -07:00
Dianne Hackborn
067e5f68b9
Add new wallpaper features for insets and offsets.
...
Issue #17394151 : WallpaperService / Engines need to get notified
of WindowInsets
Issue #17394203 Wallpapers need a system API to be shifted in order
to support burn in protection
Adds a new API on WallpaperManager to set additional offsets to
make wallpapers extend beyond the display size.
Insets are now reported to wallpapers, to use as they may. This
includes information about the above offsets, so they can place
their content within the visible area. And to help with this, also
expose the stable offsets APIs in WindowInsets which is also very
useful information for the wallpaper.
Another new API on WallpaperManager to set a raw offset to apply
to the wallpaper window, forcing it to move on the screen regardless
of what the wallpaper is drawing.
Fix wallpapers when used with overscan enabled, so they still extend
out across the entire screen. Conveniently, the above new window
insets information is very useful for this case as well!
And a new wallpaper test app for all this stuff.
Change-Id: I287ee36581283dd34607609fcd3170d99d120d8e
2014-09-08 18:02:18 -07:00
Andreas Gampe
27f7f13831
am cd74e05a: Merge "Frameworks/base: Add native bridge post-fork initialization" into lmp-dev
...
* commit 'cd74e05a85802230c32a75e9e2d6504ecd6dd76a':
Frameworks/base: Add native bridge post-fork initialization
2014-09-09 00:47:42 +00:00
Andreas Gampe
f43f04ed6f
Merge "Frameworks/base: Add native bridge post-fork initialization" into lmp-dev
2014-09-09 00:41:35 +00:00
Michael Wright
e133febca6
am 80890a79: am 36bbc399: am d49dc106: Merge "Add FEATURE_GAMEPAD." into lmp-dev
...
* commit '80890a7955dbc8364402666865b6c6105d0e3cff':
Add FEATURE_GAMEPAD.
2014-09-08 23:54:06 +00:00
Michael Wright
58da18133b
am 36bbc399: am d49dc106: Merge "Add FEATURE_GAMEPAD." into lmp-dev
...
* commit '36bbc3991bff010a9e55a1a117ff03ec84bc40e0':
Add FEATURE_GAMEPAD.
2014-09-08 23:42:37 +00:00
Michael Wright
e63c753f9a
am d49dc106: Merge "Add FEATURE_GAMEPAD." into lmp-dev
...
* commit 'd49dc106aec6441f0db0c5a181b8ae578a76f927':
Add FEATURE_GAMEPAD.
2014-09-08 23:35:45 +00:00
Michael Wright
8e3b4d41e3
Merge "Add FEATURE_GAMEPAD." into lmp-dev
2014-09-08 23:21:49 +00:00
Michael Wright
6faa6759cd
Add FEATURE_GAMEPAD.
...
This allows micro-consoles or other devices to signify that there's a
game controller in the box, even if the user hasn't connected it.
Change-Id: Ie5e2cf69f777ebe84abb83f34c9ed63d9555deff
2014-09-08 16:08:18 -07:00
Alan Viverette
77c180a513
Use correct row/column order in list and grid CollectionItems
...
BUG: 17427260
Change-Id: Ie90767100bc38fa903173ae150b9807203230020
2014-09-08 15:30:34 -07:00
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
8dc2c62821
am af99dec4: Merge "Replace Calls.FEATURES_NONE with 0 (1/4)" into lmp-dev
...
* commit 'af99dec488b5eae712253d24ce9f1e85ccfefdeb':
Replace Calls.FEATURES_NONE with 0 (1/4)
2014-09-08 21:50:35 +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
3e3fcdf742
am 4e9c9518: Merge "Renaming of LauncherApps apis" into lmp-dev
...
* commit '4e9c9518f937377fab1afd78c09d5d47a1a11ed1':
Renaming of LauncherApps apis
2014-09-08 20:51:05 +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
Kenny Guy
5856bcfd5f
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 '652e64d30c2b1d499dbcba93056eaf40b270ad09':
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:13:08 +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
Kenny Guy
8942bcd6ea
Remember userId when stripping / rebuilding notification.
...
ApplicationInfo.uid isn't enough because when system
posts notifications it Context.getUserId doesn't match
userId bit of ApplicationInfo.uid, so put back the
mOriginatingUserId.
Bug: 17002733
Change-Id: Ie3d8de121255bcb551cbe80c263e74f1a60b6f1c
2014-09-08 21:09:47 +01: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
Andreas Gampe
6b0ed64fb8
Frameworks/base: Add native bridge post-fork initialization
...
(cherry picked from commit d7746a8b65ee4690427ed798816f970218578fa3)
Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
2014-09-08 13:07:59 -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
80be90606e
am 5d629572: Merge "Restrict line count for BigTextStyle" into lmp-dev
...
* commit '5d629572c2e3c8142ed437efbd1ebdd4bde4220c':
Restrict line count for BigTextStyle
2014-09-08 19:57:10 +00:00