Griff Hazen
1d67649c61
am accb122d: am c06b7a78: Copy visibility docs from support version to base Notification.
...
* commit 'accb122dcd7b45914b508299af0b44376745bed3':
Copy visibility docs from support version to base Notification.
2014-09-09 18:47:29 +00:00
Griff Hazen
fc3922d49b
Copy visibility docs from support version to base Notification.
...
(Noticed the difference in a javadoc diff between Notification and
NotificationCompat)
Bug: 17424399
Change-Id: I639a46c429ffebf8ca47118b2ea80f40ccdc1286
2014-09-09 18:03:40 +00:00
Alexandra Gherghina
ed225682c5
am f695833a: am c3b392d0: Merge "Removing the NO_CROSS_PROFILE flag for intent forwarding" into lmp-dev
...
* commit 'f695833ab5764c7b031f43f78a288eec2e162dcc':
Removing the NO_CROSS_PROFILE flag for intent forwarding
2014-09-09 17:57:56 +00:00
Alexandra Gherghina
7677694320
Merge "Removing the NO_CROSS_PROFILE flag for intent forwarding" into lmp-dev
2014-09-09 17:45:36 +00:00
Craig Mautner
c8cc92f852
am 2297d88d: am 77e1dc74: Merge "Remove deprecated (and now unused) API method." into lmp-dev
...
* commit '2297d88d163daafde81d41e13d2207fc64865a72':
Remove deprecated (and now unused) API method.
2014-09-09 17:21:35 +00:00
Craig Mautner
345d4f4f14
Merge "Remove deprecated (and now unused) API method." into lmp-dev
2014-09-09 17:05:04 +00:00
Dianne Hackborn
aadc76edb1
am 2146dc79: am 0ad9e247: Merge "Add new wallpaper features for insets and offsets." into lmp-dev
...
* commit '2146dc791c53895b60161d8819b25b4277290c4b':
Add new wallpaper features for insets and offsets.
2014-09-09 16:55:06 +00:00
Dianne Hackborn
bb8c483461
Merge "Add new wallpaper features for insets and offsets." into lmp-dev
2014-09-09 16:41:44 +00: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
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
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
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
f8a52c0667
Merge "Allowing a ContentProvider to have a null authority." into lmp-dev
2014-09-09 09:07:02 +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
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
f43f04ed6f
Merge "Frameworks/base: Add native bridge post-fork initialization" into lmp-dev
2014-09-09 00:41:35 +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
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
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
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
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
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
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
f98fbb710b
Merge "Restrict line count for BigTextStyle" into lmp-dev
2014-09-08 19:46:45 +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
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
Nicolas Prevot
6e412adaa7
Allowing a ContentProvider to have a null authority.
...
In this case, it will not be possible to query it with any uri.
BUG: 17414813
Change-Id: I76e8ad91539904f3c52b5a3436b2f1bd5e4d0fdf
2014-09-08 18:28:43 +01: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
Zoltan Szatmary-Ban
f0ae135049
Extend IKeyChainService AIDL with CACert retrieval
...
Bug:16029580
Change-Id: I41a3bd2f3bd95550e59f1d0d0acd0e765d7b62d7
2014-09-08 17:59:42 +01:00
Jeff Sharkey
e016605981
Merge "Delayed ASEC allocation, refine progress handling." into lmp-dev
2014-09-08 16:38:42 +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