Commit Graph

44883 Commits

Author SHA1 Message Date
Eino-Ville Talvala
ee7ea85340 Camera2: Allow captures right after abort
Since implementation is still largely synchronous, this is safe.
For the future full-asynchronous implementation, this is the behavior
we want in any case.

Bug: 17345630
Change-Id: Ib54a3441b21fa8cb42bcc6548e5639d9db7ec193
2014-09-09 12:38:12 -07:00
Eino-Ville Talvala
e8df3093f5 Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
Otherwise, cannot reliably match up capture progressed and failure callbacks
with the start callback.

Bug: 17421092
Change-Id: I91d92be70a15536b215bac330370ce37e426ec26
2014-09-09 12:38:11 -07:00
Amith Yamasani
26af829fd7 User restriction to disallow outgoing NFC beam
This can be controlled by MDMs via DPM.

Also fixes:
 - javadoc for restrictions
 - persisting of cross profile copy/paste restriction

Bug: 17387303
Change-Id: Ie148f56189181d2a4c6345c0823d417ab13a94a3
2014-09-09 12:09:47 -07:00
Griff Hazen
b6327ea2f0 am df35ac5f: Merge "Remove reference to StatusBarNotification after the value is accessed." into lmp-dev
* commit 'df35ac5fab51383099a2f8e5206202af58ef79bf':
  Remove reference to StatusBarNotification after the value is accessed.
2014-09-09 18:54:36 +00:00
Griff Hazen
f8ead28ecb 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:54:22 +00:00
Alexandra Gherghina
f89e794a15 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 18:53:50 +00:00
Griff Hazen
6b6fe58db1 am 527006ad: am df35ac5f: Merge "Remove reference to StatusBarNotification after the value is accessed." into lmp-dev
* commit '527006ad3a84a1cec342d00a59ab766aee4730cd':
  Remove reference to StatusBarNotification after the value is accessed.
2014-09-09 18:47:50 +00:00
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
2f439763bd Merge "Remove reference to StatusBarNotification after the value is accessed." into lmp-dev 2014-09-09 18:35:54 +00:00
Tao Bai
e8df27aec8 Revise createIntent and parseResult API.
- Both are move to FileChooserParams, remove UploadHelper class.
- createIntent only handls non-capture intents
- parseResult is the static member of FileChooseParams and should
  be used with createIntent.

BUG:17253647,16624450

Change-Id: I81cac7c1b739880db4e4c1f2b4612ed2ee87cb1b
2014-09-09 11:21:22 -07:00
Adam Lesinski
eddeb49a73 ActivityManager shouldn't return null for getCurrentUser
There was a race where ActivityManager would return null
for getCurrentUser() when switching between guest accounts.
This is because the Guest account was marked for deletion
while it was still active.

Bug:17290209

Change-Id: I224fb4b6836380e5acb7dbeb8f3343d74505f88a
2014-09-09 11:15:17 -07: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
c09a20c4c3 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:10: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
8d7567f406 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:04 +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
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
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
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
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
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
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