Commit Graph

44100 Commits

Author SHA1 Message Date
Adam Lesinski
ceb63ed177 am 2413aa58: am 38bd55ff: Merge changes I79ba54d7,I224fb4b6 into lmp-dev
* commit '2413aa5838c0d9e653c419c4566ab76a5c7bde2d':
  Make UsageStats API default on only for the system
  ActivityManager shouldn't return null for getCurrentUser
2014-09-10 00:51:43 +00:00
Alan Viverette
8c2b2085c9 am 0ca92d44: am b7afde5c: Merge "Bring up the IME when TextView receives ACTION_CLICK" into lmp-dev
* commit '0ca92d44894f7af06f595368281034d762693c61':
  Bring up the IME when TextView receives ACTION_CLICK
2014-09-10 00:50:53 +00:00
Adam Powell
361ca8c1e9 am 129aeb16: am 8197da77: Merge "ActionMenuViews always reserve overflow when creating their own menus" into lmp-dev
* commit '129aeb1644b8faf9600d74e18b2ab799a121830f':
  ActionMenuViews always reserve overflow when creating their own menus
2014-09-10 00:50:48 +00:00
Christopher Tate
239e587ab9 am 1ca58e08: am 3b9417ff: Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev
* commit '1ca58e08f44ae97ed238bdbb820eea12d62f6ce3':
  Fix BackupManager.isBackupEnabled()
2014-09-10 00:50:41 +00:00
Jeff Sharkey
2dadfeb306 am 47bf9080: am c5d4ebd6: Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev
* commit '47bf90808bd42a3fcfd5434ec216a8ba8859f8f0':
  Missing manifest error should be NO_CERTIFICATES.
2014-09-10 00:50:06 +00:00
Yin-Chia Yeh
0efe661696 am 5fc81692: am 916d8faf: Merge "camera2: make 3A regions null when not available" into lmp-dev
* commit '5fc81692af2d249b901a0f7ce4ec6bc5327ff8c2':
  camera2: make 3A regions null when not available
2014-09-10 00:49:37 +00:00
Eino-Ville Talvala
2f94ed6cee am f9e64824: am 28312293: Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev
* commit 'f9e648243298760e96053a90674b30fe00ce3f5c':
  Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
2014-09-10 00:49:31 +00:00
Adam Lesinski
732edf098f Merge changes I79ba54d7,I224fb4b6 into lmp-dev
* changes:
  Make UsageStats API default on only for the system
  ActivityManager shouldn't return null for getCurrentUser
2014-09-09 23:50:04 +00:00
Alan Viverette
a7cbaeb138 Merge "Bring up the IME when TextView receives ACTION_CLICK" into lmp-dev 2014-09-09 22:58:28 +00:00
Adam Powell
ad0c450d4d Merge "ActionMenuViews always reserve overflow when creating their own menus" into lmp-dev 2014-09-09 22:56:20 +00:00
Christopher Tate
363c408af5 Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev 2014-09-09 22:51:27 +00:00
Jeff Sharkey
ad5f44a68c Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev 2014-09-09 22:44:52 +00:00
Christopher Tate
9e079298ed Fix BackupManager.isBackupEnabled()
It wasn't properly lazy-initializing the service binder, so it always
thought the backend service didn't exist, and so always returned false.

Also directly validated that every usage of sService in the module is
now correctly lazy-initialized.

Bug 16661321

Change-Id: If5fbb18aef81bfa8fd70eb40a1f6af54cc96d804
2014-09-09 22:36:14 +00:00
Yin-Chia Yeh
8544c7da86 Merge "camera2: make 3A regions null when not available" into lmp-dev 2014-09-09 22:24:49 +00:00
Eino-Ville Talvala
31913c334a Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev 2014-09-09 22:20:58 +00:00
Jeff Sharkey
bc09755e19 Missing manifest error should be NO_CERTIFICATES.
When META-INF/MANIFEST.MF is missing, treat as NO_CERTIFICATES
instead of CERTIFICATE_ENCODING.  Also remove redundant layer of
debugging details when wrapping exceptions.

Bug: 15667982
Change-Id: I6e8216d5bf6e42da1feb70c89f991001380305be
2014-09-09 14:57:26 -07:00
Amith Yamasani
1f4ea68a07 am d94df395: am 7a9f541e: Merge "User restriction to disallow outgoing NFC beam" into lmp-dev
* commit 'd94df395a87836b5dba6bd159010046e1d016661':
  User restriction to disallow outgoing NFC beam
2014-09-09 21:56:09 +00:00
Riley Andrews
4ef0f50c29 am f41b1485: am 4b7c14bf: Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev
* commit 'f41b14855e6fd1bcf2ddaa843d0e177825010023':
  Use surfaceflinger for recents thumbnail rotations.
2014-09-09 21:55:38 +00:00
Alan Viverette
d381834c77 am aafd303e: am e74dff14: Merge "Use correct row/column order in list and grid CollectionItems" into lmp-dev
* commit 'aafd303e48e95fda8b2b5bd9e3541e87997d6ef4':
  Use correct row/column order in list and grid CollectionItems
2014-09-09 21:55:33 +00:00
Adam Powell
e8d153673b ActionMenuViews always reserve overflow when creating their own menus
ActionMenuViews work in two modes: hosting another Menu instance or
creating their own. The former is used when an action bar is
displaying a window's options menu. The latter is used when an
ActionMenuView (or Toolbar) is placed within an arbitrary layout and
the getMenu method is called.

When showing a window's options menu, ActionMenuPresenter calls into
the ActionBarPolicy to determine if we should reserve an overflow
button or if overflow will be presented by the window instead. Always
reserve overflow if the ActionMenuView is presenting its own menu.

Bug 17381966

Change-Id: I17c495986994d421bf6276ae39ba233243432e97
2014-09-09 13:51:16 -07:00
Alan Viverette
b687788f52 Bring up the IME when TextView receives ACTION_CLICK
Simulates the relevant portions of a DOWN/UP event pair to request focus
and bring up the IME.

BUG: 8213791
Change-Id: Idb32d81552ecbbdefc64686c914eba6d8e28b0b8
2014-09-09 13:38:08 -07:00
Amith Yamasani
da6e6c888f Merge "User restriction to disallow outgoing NFC beam" into lmp-dev 2014-09-09 20:29:57 +00:00
Riley Andrews
0b81adcaea Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev 2014-09-09 19:59:15 +00:00
Alan Viverette
b505298489 Merge "Use correct row/column order in list and grid CollectionItems" into lmp-dev 2014-09-09 19:57:09 +00: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
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
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
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
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
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
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
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