Griff Hazen
380c394987
am c06b7a78: Copy visibility docs from support version to base Notification.
...
* commit 'c06b7a78433830308ac62be25b3a13d6415e3699':
Copy visibility docs from support version to base Notification.
2014-09-09 18:36:23 +00:00
Vineeta Srivastava
d3773b2914
am a66c2cd1: Merge "Set MTU size to 1410 for Telus." into lmp-dev
...
* commit 'a66c2cd18b668b8c692b2c632ec260e4b7fdb46f':
Set MTU size to 1410 for Telus.
2014-09-09 18:09:04 +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
Vineeta Srivastava
1f14863871
Merge "Set MTU size to 1410 for Telus." into lmp-dev
2014-09-09 18:02:57 +00:00
Alexandra Gherghina
17f3cdc820
am c3b392d0: Merge "Removing the NO_CROSS_PROFILE flag for intent forwarding" into lmp-dev
...
* commit 'c3b392d02693f8236fdc6ebc90412e3c4aaa5843':
Removing the NO_CROSS_PROFILE flag for intent forwarding
2014-09-09 17:52:46 +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
Griff Hazen
3eeb09605d
am b0e0f2f6: Merge "Add support for a circular bitmap overlay for round android wear emulator." into lmp-dev
...
* commit 'b0e0f2f6185fc42842ff3fccedcc608c5a8f8d27':
Add support for a circular bitmap overlay for round android wear emulator.
2014-09-09 17:31:02 +00:00
Griff Hazen
8fd30e4486
Merge "Add support for a circular bitmap overlay for round android wear emulator." into lmp-dev
2014-09-09 17:25:47 +00:00
Craig Mautner
4e59ecf211
am 77e1dc74: Merge "Remove deprecated (and now unused) API method." into lmp-dev
...
* commit '77e1dc741bfce75f3e3f5446674d1545a74eae2b':
Remove deprecated (and now unused) API method.
2014-09-09 17:11:05 +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
3046cbd8ef
am 0ad9e247: Merge "Add new wallpaper features for insets and offsets." into lmp-dev
...
* commit '0ad9e247c3b553baee5b42599536d9b0bfbbba31':
Add new wallpaper features for insets and offsets.
2014-09-09 16:45:33 +00:00
New Author Steven Liu
82468851b5
Set MTU size to 1410 for Telus.
...
Bug: 17391167
Change-Id: I38c0d2a311624db66113b5eda2a5eceb6fec2a69
2014-09-09 16:44:44 +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
b5d5435869
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:05 +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
442c275bf6
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:18:22 +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
Yohei Yukawa
4fab41a7b1
am dcab9fad: Follow up API signature changes of CursorAnchorInfo part 2
...
* commit 'dcab9fadeccbb6001f52c704946e1b7e2b4af550':
Follow up API signature changes of CursorAnchorInfo part 2
2014-09-09 05:44:16 +00:00
Yohei Yukawa
699a49b9f1
Follow up API signature changes of CursorAnchorInfo part 2
...
This is another follow up CL for Ic8c6fab58c01206872a34e7e.
Ib2371849d32bb44da9ef59f05e648a476e03699a didn't cover
following renamings. This CL fixes them.
- #getCharacterRect -> #getCharacterBounds
- #getCharacterRectFlags -> #getCharacterBoundsFlags
BUG: 17365414
Change-Id: I120795da3f25f1e2fa71f455f92e3cd1c036c1d5
2014-09-09 14:33:07 +09:00
Griff Hazen
7fb6146647
Add support for a circular bitmap overlay for round android wear emulator.
...
Android wear emulators have never had support for enabling both gpu
emulation and also having a round clip overlay present. Fix this by
supporting a drawable overlay when the ro.emulator.circular system
property is set.
Bug: 13415409
Change-Id: I6e0840ebe5c77adb786a7ba7ec6af348308ca46a
2014-09-08 21:34:52 -07:00
Adam Powell
362f4f7f63
am d6fa07e7: Merge "New new design for ResolverActivity" into lmp-dev
...
* commit 'd6fa07e7a598a070ac70ed0bead3b0a070d1b946':
New new design for ResolverActivity
2014-09-09 03:02:25 +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
0ff86c774b
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:50:32 +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
76e374f47a
am d49dc106: Merge "Add FEATURE_GAMEPAD." into lmp-dev
...
* commit 'd49dc106aec6441f0db0c5a181b8ae578a76f927':
Add FEATURE_GAMEPAD.
2014-09-08 23:31:25 +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
63543a2b7d
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:47 +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
5bab6dc2bd
am 4e9c9518: Merge "Renaming of LauncherApps apis" into lmp-dev
...
* commit '4e9c9518f937377fab1afd78c09d5d47a1a11ed1':
Renaming of LauncherApps apis
2014-09-08 20:50:20 +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
ddbdc63be2
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:09:48 +00: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
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
308da8789d
am 5d629572: Merge "Restrict line count for BigTextStyle" into lmp-dev
...
* commit '5d629572c2e3c8142ed437efbd1ebdd4bde4220c':
Restrict line count for BigTextStyle
2014-09-08 19:57:12 +00:00
Jorim Jaggi
f98fbb710b
Merge "Restrict line count for BigTextStyle" into lmp-dev
2014-09-08 19:46:45 +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
Svet Ganov
73221c7b23
am a00c7eb9: Merge "Clicking on partially coverd views by other views or windows." into lmp-dev
...
* commit 'a00c7eb909b043ce5c915604087438d06b7d164e':
Clicking on partially coverd views by other views or windows.
2014-09-08 18:52:07 +00:00
Dharmesh Mokani
17975d0be2
am e70ac872: Merge "Remove old methods : AlwaysOnHotwordDetector" into lmp-dev
...
* commit 'e70ac872c6655c6ab8c0e3ce48a7ed13df99494f':
Remove old methods : AlwaysOnHotwordDetector
2014-09-08 18:52:02 +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
Dharmesh Mokani
2b02f88737
Merge "Remove old methods : AlwaysOnHotwordDetector" into lmp-dev
2014-09-08 18:43:14 +00:00
George Mount
ae2c3fc49f
am f7b281a6: Merge "Use Alpha instead of TransitionAlpha for Activity Transitions." into lmp-dev
...
* commit 'f7b281a624c76d0bb744cf4bb47e92d35b66e34b':
Use Alpha instead of TransitionAlpha for Activity Transitions.
2014-09-08 18:35:20 +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
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
68c9fc8bba
am 2f0ed017: Merge "Delayed ASEC allocation, refine progress handling." into lmp-dev
...
* commit '2f0ed01789f305506426b67139146b634457fd5a':
Delayed ASEC allocation, refine progress handling.
2014-09-08 16:48:41 +00:00