OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Set final crop on wallpaper instead of intersect clip with stack bounds" into...
Chong Zhang [Fri, 13 May 2016 23:21:03 +0000 (23:21 +0000)]
Merge "Set final crop on wallpaper instead of intersect clip with stack bounds" into nyc-dev

8 years agoMerge "Also freeze configuration when freezing bounds" into nyc-dev
Jorim Jaggi [Fri, 13 May 2016 23:16:12 +0000 (23:16 +0000)]
Merge "Also freeze configuration when freezing bounds" into nyc-dev

8 years agoMerge "Wear 2.0 preview input method documentaation." into mnc-io-docs am: 9c105c50a9
Sreevani Sreejith [Fri, 13 May 2016 23:14:59 +0000 (23:14 +0000)]
Merge "Wear 2.0 preview  input method documentaation." into mnc-io-docs am: 9c105c50a9
am: a9486c041f

* commit 'a9486c041f177f11d5f61dc7fb92a10447c836a3':
  Wear 2.0 preview  input method documentaation.

Change-Id: Ideb177a06ba57134e535dcd67a8c01ca9bb8216d

8 years agoMerge "Wear 2.0 preview input method documentaation." into mnc-io-docs
sreevanis [Fri, 13 May 2016 23:12:28 +0000 (23:12 +0000)]
Merge "Wear 2.0 preview  input method documentaation." into mnc-io-docs
am: 9c105c50a9

* commit '9c105c50a9a7c3a020103287a4d207291b8ab711':
  Wear 2.0 preview  input method documentaation.

Change-Id: I2913fb11624046751bc9097cf9c216d02edae971

8 years agoMerge "Fix Skia filter behavior test" into nyc-dev
Chris Craik [Fri, 13 May 2016 23:12:17 +0000 (23:12 +0000)]
Merge "Fix Skia filter behavior test" into nyc-dev

8 years agoMerge "Wear 2.0 preview input method documentaation." into mnc-io-docs
Sreevani Sreejith [Fri, 13 May 2016 23:04:50 +0000 (23:04 +0000)]
Merge "Wear 2.0 preview  input method documentaation." into mnc-io-docs

8 years agoAlso freeze configuration when freezing bounds
Jorim Jaggi [Tue, 10 May 2016 02:57:25 +0000 (19:57 -0700)]
Also freeze configuration when freezing bounds

We also need to freeze the override configuration so we don't report
the new configuration too early, which leads to bugs.

Bug: 27915587
Change-Id: Idffadbb02ab0311796caa760ae1f467fd2d17768

8 years agoWear 2.0 preview input method documentaation.
sreevanis [Wed, 11 May 2016 18:30:58 +0000 (11:30 -0700)]
Wear 2.0 preview  input method documentaation.

Bug:28472831
Change-Id: Ic2143ec8087d084609e3c6e8c125c37e1a5849da

8 years agoSet final crop on wallpaper instead of intersect clip with stack bounds
Chong Zhang [Fri, 13 May 2016 22:38:02 +0000 (15:38 -0700)]
Set final crop on wallpaper instead of intersect clip with stack bounds

Wallpaper's clip rect is offset by its window offsets, it can't be
intersect directly with stack bounds.

bug: 28763785
Change-Id: Id87d668c9e59832498c9c62730617d0a5a9207c2

8 years agoMerge "Make settings cahches generation mechanism robust." into nyc-dev
Svetoslav Ganov [Fri, 13 May 2016 22:22:31 +0000 (22:22 +0000)]
Merge "Make settings cahches generation mechanism robust." into nyc-dev

8 years agoMake settings cahches generation mechanism robust.
Svetoslav Ganov [Wed, 11 May 2016 01:55:47 +0000 (18:55 -0700)]
Make settings cahches generation mechanism robust.

Settings is using a MemoryIntArray to communicate the settings table
version enabling apps to have up-to-date local caches. However, ashmem
allows an arbitrary process with a handle to the fd (even in read only
mode) to unpin the memory which can then be garbage collected. Here we
make this mechanism fault tolerant against bad apps unpinning the ashmem
region. First, we no longer unpin the ashmem on the client side and if
the ashmem region is purged and cannot be pinned we recreate it and
hook up again with the local app caches. The change also adds a test
that clients can only read while owner can read/write.

bug:28764789

Change-Id: I1ef79b4b21e976124b268c9126a55d614157059b

8 years agodocs: Updates to multi-window and related docs. am: 4d93a21980 am: 8263d6c0a3 am...
Andrew Solovay [Fri, 13 May 2016 22:08:17 +0000 (22:08 +0000)]
docs: Updates to multi-window and related docs. am: 4d93a21980 am: 8263d6c0a3 am: c88130c572
am: d29c26073e

* commit 'd29c26073e97e4c6e7825641cf6e76720df395e3':
  docs: Updates to multi-window and related docs.

Change-Id: Ic4be60debb41d074d717bfb0989125299428831a

8 years agodocs: Updates to multi-window and related docs. am: 4d93a21980 am: 8263d6c0a3
Andrew Solovay [Fri, 13 May 2016 22:03:15 +0000 (22:03 +0000)]
docs: Updates to multi-window and related docs. am: 4d93a21980 am: 8263d6c0a3
am: c88130c572

* commit 'c88130c5724227b3ba7ef0b5ef4476fedabca650':
  docs: Updates to multi-window and related docs.

Change-Id: I308c988e3a93737a478f9f2445b512e86f218643

8 years agodocs: Updates to multi-window and related docs. am: 4d93a21980
Andrew Solovay [Fri, 13 May 2016 22:00:39 +0000 (22:00 +0000)]
docs: Updates to multi-window and related docs. am: 4d93a21980
am: 8263d6c0a3

* commit '8263d6c0a35a5467764ed12d6586ab176fdc15ff':
  docs: Updates to multi-window and related docs.

Change-Id: Ia571cf3a38f1cd621bba6bc35d9b2b836361d7b5

8 years agodocs: Updates to multi-window and related docs.
Andrew Solovay [Fri, 13 May 2016 21:57:51 +0000 (21:57 +0000)]
docs: Updates to multi-window and related docs.
am: 4d93a21980

* commit '4d93a21980f7e82bd346ad9c3a18c0c932d09253':
  docs: Updates to multi-window and related docs.

Change-Id: Ie12e3c25417943582aa1db1bf476e53a41838745

8 years agoMerge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev
TreeHugger Robot [Fri, 13 May 2016 21:53:41 +0000 (21:53 +0000)]
Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev

8 years agoMerge "docs: Bridger feature page for Wear preview" into mnc-io-docs am: 1334929863
Bert McMeen [Fri, 13 May 2016 21:43:01 +0000 (21:43 +0000)]
Merge "docs: Bridger feature page for Wear preview" into mnc-io-docs am: 1334929863
am: 2288757582

* commit '2288757582bd8b572f009aee68a0fe1599507060':
  docs: Bridger feature page for Wear preview

Change-Id: Ica0f66a85c0b5c9d3db6eee71338b7a7956cb827

8 years agoMerge "docs: Bridger feature page for Wear preview" into mnc-io-docs
Bert McMeen [Fri, 13 May 2016 21:40:22 +0000 (21:40 +0000)]
Merge "docs: Bridger feature page for Wear preview" into mnc-io-docs
am: 1334929863

* commit '133492986389a63e34cb9066e515864eadeeb485':
  docs: Bridger feature page for Wear preview

Change-Id: If629e5ff1d0a90661fc69287f9e669625f8ce5a2

8 years agoMerge "docs: Wear preview docs: Get Started, Download/Test, Program Overview" into...
Bert McMeen [Fri, 13 May 2016 21:35:03 +0000 (21:35 +0000)]
Merge "docs: Wear preview docs: Get Started, Download/Test, Program Overview" into mnc-io-docs am: e8d7012fba
am: 97158b85ec

* commit '97158b85ec07c22b0aca39ffaf0c8172751c0a65':
  docs: Wear preview docs: Get Started, Download/Test, Program Overview

Change-Id: I549ab462afb03184118a00aa3bcfdb45284b4288

8 years agodocs: Complications guide for Wear Preview am: c0780f1d52
Bert McMeen [Fri, 13 May 2016 21:34:58 +0000 (21:34 +0000)]
docs: Complications guide for Wear Preview am: c0780f1d52
am: 194fbc0da4

* commit '194fbc0da4272b1c957c1e69d363f2c566a30716':
  docs: Complications guide for Wear Preview

Change-Id: Ie3850f9647ec2fa2d0e43560e27ac1947a486375

8 years agoMerge "docs: Wear preview docs: Get Started, Download/Test, Program Overview" into...
Bert McMeen [Fri, 13 May 2016 21:32:10 +0000 (21:32 +0000)]
Merge "docs: Wear preview docs: Get Started, Download/Test, Program Overview" into mnc-io-docs
am: e8d7012fba

* commit 'e8d7012fbafb64e71fe2d94b4ef1cb466f63bfc9':
  docs: Wear preview docs: Get Started, Download/Test, Program Overview

Change-Id: Icc722c4d00fc6862e28fc246cd376e90901c0092

8 years agodocs: Complications guide for Wear Preview
Bert McMeen [Fri, 13 May 2016 21:32:07 +0000 (21:32 +0000)]
docs: Complications guide for Wear Preview
am: c0780f1d52

* commit 'c0780f1d52c8e4d78e750fb0f16eec8280ddf5f4':
  docs: Complications guide for Wear Preview

Change-Id: I71999d68698c336c354cc11d042775685b77da8d

8 years agoMerge "docs: Bridger feature page for Wear preview" into mnc-io-docs
Bert McMeen [Fri, 13 May 2016 21:30:18 +0000 (21:30 +0000)]
Merge "docs: Bridger feature page for Wear preview" into mnc-io-docs

8 years agoMerge "docs: Wear preview docs: Get Started, Download/Test, Program Overview" into...
Bert McMeen [Fri, 13 May 2016 21:29:26 +0000 (21:29 +0000)]
Merge "docs: Wear preview docs: Get Started, Download/Test, Program Overview" into mnc-io-docs

8 years agoMerge "Fix transition for forced resizable exit" into nyc-dev
Jorim Jaggi [Fri, 13 May 2016 21:22:01 +0000 (21:22 +0000)]
Merge "Fix transition for forced resizable exit" into nyc-dev

8 years agoMerge "Remove task based on object rather than position" into nyc-dev
Sid Soundararajan [Fri, 13 May 2016 21:19:23 +0000 (21:19 +0000)]
Merge "Remove task based on object rather than position" into nyc-dev

8 years agoFix transition for forced resizable exit
Jorim Jaggi [Fri, 13 May 2016 21:11:42 +0000 (14:11 -0700)]
Fix transition for forced resizable exit

Since the transition is picked from layout params from the activity
below, we need to manually override it.

Bug: 28750938
Change-Id: I7351c7d8bd14a393cba51d6afb1e644204217440

8 years agoDon't allow any app to specify rotation unless in home task
Jorim Jaggi [Thu, 12 May 2016 21:47:27 +0000 (14:47 -0700)]
Don't allow any app to specify rotation unless in home task

The previous logic was racy/buggy in a sense so that the non-home app
could still force the orientation when the divider was still minimized.
The logic is cleaned up so only the home task can force the orientation
in multi-window.

Change-Id: I9eccf86d9fa442375d6eca400cb6ac0815c9fa10
Fixes: 28675152

8 years agoMerge "Update stack bounds for fullscreen if rotated after updateDisplayInfo" into...
Chong Zhang [Fri, 13 May 2016 20:48:31 +0000 (20:48 +0000)]
Merge "Update stack bounds for fullscreen if rotated after updateDisplayInfo" into nyc-dev

8 years agoMerge "Fixed some issues with fullscreen dimming" into nyc-dev
TreeHugger Robot [Fri, 13 May 2016 20:42:20 +0000 (20:42 +0000)]
Merge "Fixed some issues with fullscreen dimming" into nyc-dev

8 years agoAdd Fragment#onAttachFragment for parent fragments
Adam Powell [Fri, 13 May 2016 18:04:39 +0000 (11:04 -0700)]
Add Fragment#onAttachFragment for parent fragments

Framework edition

Add a matching onAttachFragment method to Fragment to match the
fragment host version.

Bug 28760393

Change-Id: I5f50b3446449cae7110da6b4e468ee80f413e1e5

8 years agodocs: Updates to multi-window and related docs.
Andrew Solovay [Fri, 13 May 2016 20:33:55 +0000 (13:33 -0700)]
docs: Updates to multi-window and related docs.

Clarified behavior when activity is resized or put in fullscreen
mode, per b/28580007 . Also (per email from o-o) removed misleading
statement about when onStop() might or might not be called.

Both changes can go live now (multiwindow update applies to DP1 & 2,
and onStop() clarification applies to all versions of API), so I'll
submit as soon as this is approved.

See first comment for doc stage location.

bug: 28580007
Change-Id: Ib008f24e5796ec7810b67c91e512e679680d4afd

8 years agodocs: Complications guide for Wear Preview
Bert McMeen [Wed, 11 May 2016 20:55:09 +0000 (13:55 -0700)]
docs: Complications guide for Wear Preview

Bug: 28425614
Change-Id: Ic1d5ce1a962b39a395c447c1f4d3bfadd6114246

8 years agoProperly handle registration timeout in BLE.
Wei Wang [Tue, 10 Nov 2015 03:45:53 +0000 (19:45 -0800)]
Properly handle registration timeout in BLE.

Bug:25384098
Change-Id: I7877f6368c4982fcd91e68810c4da0ab7b5fc6b7

8 years agoMerge "Correct the DP2 status beta -> alpha." into mnc-mr-docs am: 3a263cec30 am...
Dirk Dougherty [Fri, 13 May 2016 18:16:15 +0000 (18:16 +0000)]
Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs am: 3a263cec30 am: 6d3ca9aaa9
am: 0e4b51ebc6

* commit '0e4b51ebc6b86a535a9f7757e8b64f70a10aaa30':
  Correct the DP2 status beta -> alpha.

Change-Id: I9fded988b946d669f9560716563771f8e6b82351

8 years agoMerge "docs: change preview landing page top ribbon color" into mnc-io-docs am: a138a...
Joe Fernandez [Fri, 13 May 2016 18:13:46 +0000 (18:13 +0000)]
Merge "docs: change preview landing page top ribbon color" into mnc-io-docs am: a138ad92b2
am: 3357a67905

* commit '3357a67905453d64846079e560bbe893c4c733b6':
  docs: change preview landing page top ribbon color

Change-Id: I7eede6be5a8960e7f2360656c66b136f519fb1bb

8 years agoMerge "Correct the DP2 status beta -> alpha." into mnc-mr-docs am: 3a263cec30
Dirk Dougherty [Fri, 13 May 2016 18:13:40 +0000 (18:13 +0000)]
Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs am: 3a263cec30
am: 6d3ca9aaa9

* commit '6d3ca9aaa91328d3664a217fee8a49c9ee46858e':
  Correct the DP2 status beta -> alpha.

Change-Id: Iecc460e2b5399bff284f8d2479d475325fc8a1df

8 years agoMerge "docs: change preview landing page top ribbon color" into mnc-io-docs
Joe Fernandez [Fri, 13 May 2016 18:11:15 +0000 (18:11 +0000)]
Merge "docs: change preview landing page top ribbon color" into mnc-io-docs
am: a138ad92b2

* commit 'a138ad92b299bf32a59ee5f4ba5a9e34e6998cb4':
  docs: change preview landing page top ribbon color

Change-Id: Ib7d5c3fc9a133ceb0a97f801218481a94fb15a47

8 years agoMerge "Correct the DP2 status beta -> alpha." into mnc-mr-docs
Dirk Dougherty [Fri, 13 May 2016 18:11:11 +0000 (18:11 +0000)]
Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs
am: 3a263cec30

* commit '3a263cec302b3d1883e3cc48b068c05240506d31':
  Correct the DP2 status beta -> alpha.

Change-Id: I925a0c044e1b7b6186f348c4c8e216b8f53a13f4

8 years agoUpdate stack bounds for fullscreen if rotated after updateDisplayInfo
Chong Zhang [Fri, 13 May 2016 18:04:38 +0000 (11:04 -0700)]
Update stack bounds for fullscreen if rotated after updateDisplayInfo

Rotation could change again after updateDisplayInfo is called. We
need to set stack bounds even for fullscreen stacks in this case.
Otherwise the bounds will be incorrect until it's rotated again.

bug: 28611814
Change-Id: I31289524a9ceacaaaa66924e9bf6cbe88fd83f99

8 years agoMerge "docs: change preview landing page top ribbon color" into mnc-io-docs
Joe Fernandez [Fri, 13 May 2016 18:06:41 +0000 (18:06 +0000)]
Merge "docs: change preview landing page top ribbon color" into mnc-io-docs

8 years agoMerge "Correct the DP2 status beta -> alpha." into mnc-mr-docs
Dirk Dougherty [Fri, 13 May 2016 18:03:23 +0000 (18:03 +0000)]
Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs

8 years agoCorrect the DP2 status beta -> alpha.
Dirk Dougherty [Fri, 13 May 2016 17:57:56 +0000 (10:57 -0700)]
Correct the DP2 status beta -> alpha.

Bug: 28175714
Change-Id: I050c9a41961528c1d65cd9b9737d93c82d16aef2

8 years agoMerge "Clean up sdk/sdk_vars.cs file b/28744510" into mnc-mr-docs am: 379e28db22...
Amanda Kassay [Fri, 13 May 2016 17:59:59 +0000 (17:59 +0000)]
Merge "Clean up sdk/sdk_vars.cs file b/28744510" into mnc-mr-docs am: 379e28db22 am: 494a4c967c
am: 899981c244

* commit '899981c2442807cf637b5a9280a71cfe22e45880':
  Clean up sdk/sdk_vars.cs file b/28744510

Change-Id: I3d21f2b99ead958ed064ea4d81dbea95513ce5a6

8 years agodocs: change preview landing page top ribbon color
Joe Fernandez [Fri, 13 May 2016 17:59:02 +0000 (10:59 -0700)]
docs: change preview landing page top ribbon color

Change-Id: Iaa406a83de47df49eab54d1265629edc4dd57479

8 years agoMerge "Clean up sdk/sdk_vars.cs file b/28744510" into mnc-mr-docs am: 379e28db22
Amanda Kassay [Fri, 13 May 2016 17:57:28 +0000 (17:57 +0000)]
Merge "Clean up sdk/sdk_vars.cs file b/28744510" into mnc-mr-docs am: 379e28db22
am: 494a4c967c

* commit '494a4c967cc4bb648da3b79d777b1c089445b41f':
  Clean up sdk/sdk_vars.cs file b/28744510

Change-Id: Id6ba8a4083bc7753f5d0e6387ac0a18778cf1a27

8 years agoMerge "Clean up sdk/sdk_vars.cs file b/28744510" into mnc-mr-docs
Amanda Kassay [Fri, 13 May 2016 17:54:57 +0000 (17:54 +0000)]
Merge "Clean up sdk/sdk_vars.cs file b/28744510" into mnc-mr-docs
am: 379e28db22

* commit '379e28db228f2c0102ec41925600155c058a1ea7':
  Clean up sdk/sdk_vars.cs file b/28744510

Change-Id: I4b262eca7ca315d1ae0d51bd77ec2bcf35cadb77

8 years agoMerge "Clean up sdk/sdk_vars.cs file b/28744510" into mnc-mr-docs
Amanda Kassay [Fri, 13 May 2016 17:51:18 +0000 (17:51 +0000)]
Merge "Clean up sdk/sdk_vars.cs file b/28744510" into mnc-mr-docs

8 years agoMerge "Don't show new-window item in Downloads per Gabe." into nyc-dev
TreeHugger Robot [Fri, 13 May 2016 17:26:45 +0000 (17:26 +0000)]
Merge "Don't show new-window item in Downloads per Gabe." into nyc-dev

8 years agodocs: Wear preview docs: Get Started, Download/Test, Program Overview
Bert McMeen [Wed, 11 May 2016 22:34:22 +0000 (15:34 -0700)]
docs: Wear preview docs: Get Started, Download/Test, Program Overview

Bug: 28317997
Change-Id: I7053f9cc336edecf91a256c31e6650a61ef4ae2d

8 years agoMerge "Merge "docs: App Translation API updates" into mnc-docs am: 1ede811143 am...
Android Build Merger (Role) [Fri, 13 May 2016 17:21:13 +0000 (17:21 +0000)]
Merge "Merge "docs: App Translation API updates" into mnc-docs am: 1ede811143 am: ec6effa1b0 am: 70f2e39008 am: e60af6b9e2" into nyc-dev

8 years agoMerge "docs: App Translation API updates" into mnc-docs am: 1ede811143 am: ec6effa1b0...
Kevin Hufnagle [Fri, 13 May 2016 17:20:42 +0000 (17:20 +0000)]
Merge "docs: App Translation API updates" into mnc-docs am: 1ede811143 am: ec6effa1b0 am: 70f2e39008
am: e60af6b9e2

* commit 'e60af6b9e2645144cda30c5e54a1267f05ac1d0d':
  docs: App Translation API updates

Change-Id: Idc2ad381a5105b6502f3c37b08ec30ebbf6568eb

8 years agoMerge "docs: App Translation API updates" into mnc-docs am: 1ede811143 am: ec6effa1b0
Joe Fernandez [Fri, 13 May 2016 17:17:53 +0000 (17:17 +0000)]
Merge "docs: App Translation API updates" into mnc-docs am: 1ede811143 am: ec6effa1b0
am: 70f2e39008

* commit '70f2e3900830f58cd8b4644319ba7e173c49f7c3':
  docs: App Translation API updates

Change-Id: Id1b10da621def8add8384011755a8a7061e06ff0

8 years agoMerge "Use APF program to drop non-IP non-ARP broadcasts" into nyc-dev
Paul Jensen [Fri, 13 May 2016 17:14:46 +0000 (17:14 +0000)]
Merge "Use APF program to drop non-IP non-ARP broadcasts" into nyc-dev

8 years agoMerge "docs: App Translation API updates" into mnc-docs am: 1ede811143
Kevin Hufnagle [Fri, 13 May 2016 17:14:36 +0000 (17:14 +0000)]
Merge "docs: App Translation API updates" into mnc-docs am: 1ede811143
am: ec6effa1b0

* commit 'ec6effa1b0c7381f5d29a5b87d9bef53516dda4e':
  docs: App Translation API updates

Change-Id: I77d01fcaa4c4ef1cefdbba2dad8af71f7aa6fa62

8 years agoMerge "Fixed connectivity state in some power saving scenarios." into nyc-dev
TreeHugger Robot [Fri, 13 May 2016 17:14:11 +0000 (17:14 +0000)]
Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev

8 years agoMerge "Show package icon/label for resolved package-targeted implicit intents" into...
TreeHugger Robot [Fri, 13 May 2016 17:11:13 +0000 (17:11 +0000)]
Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev

8 years agoMerge "docs: App Translation API updates" into mnc-docs
Joe Fernandez [Fri, 13 May 2016 17:11:08 +0000 (17:11 +0000)]
Merge "docs: App Translation API updates" into mnc-docs
am: 1ede811143

* commit '1ede811143d32afe8ba6ce49a19060da4a1b6092':
  docs: App Translation API updates

Change-Id: Id075bdfddf3c5ccabf063690a37c487a87f9635d

8 years agoMerge "Call isUserUnlockingOrUnlocked with cleared identity" into nyc-dev
Fyodor Kupolov [Fri, 13 May 2016 17:07:57 +0000 (17:07 +0000)]
Merge "Call isUserUnlockingOrUnlocked with cleared identity" into nyc-dev

8 years agoDocs: API Overview page for Android N, Dev Preview 3 am: 93970bae9b
David Friedman [Fri, 13 May 2016 17:06:14 +0000 (17:06 +0000)]
Docs: API Overview page for Android N, Dev Preview 3 am: 93970bae9b
am: 95d6fa6b5d

* commit '95d6fa6b5d594951b6ce49f690792184d5ef8e72':
  Docs: API Overview page for Android N, Dev Preview 3

Change-Id: I357b712f7daa382f408e3b212486b5da0e7ec5f7

8 years agoMerge "docs: App Translation API updates" into mnc-docs
Kevin Hufnagle [Fri, 13 May 2016 17:05:10 +0000 (17:05 +0000)]
Merge "docs: App Translation API updates" into mnc-docs

8 years agoDocs: API Overview page for Android N, Dev Preview 3
David Friedman [Fri, 13 May 2016 17:03:28 +0000 (17:03 +0000)]
Docs: API Overview page for Android N, Dev Preview 3
am: 93970bae9b

* commit '93970bae9b4fc9297b76df7c610de682d91bf5dc':
  Docs: API Overview page for Android N, Dev Preview 3

Change-Id: I0d639f0bd499509a0bedaf0d0539acd21d43d079

8 years agoMerge "PIP: Fix NPE when onboarding is shown" into nyc-dev
TreeHugger Robot [Fri, 13 May 2016 16:55:11 +0000 (16:55 +0000)]
Merge "PIP: Fix NPE when onboarding is shown" into nyc-dev

8 years agoMerge "System server: Add Bluetooth to native processes" into nyc-dev
Andreas Gampe [Fri, 13 May 2016 16:27:57 +0000 (16:27 +0000)]
Merge "System server: Add Bluetooth to native processes" into nyc-dev

8 years agoClean up sdk/sdk_vars.cs file b/28744510
Amanda Kassay [Fri, 13 May 2016 14:58:06 +0000 (10:58 -0400)]
Clean up sdk/sdk_vars.cs file b/28744510

Change-Id: I9e09f0a320c4379db517ddb4e0783035dea5c061

8 years agoShow package icon/label for resolved package-targeted implicit intents
Adam Powell [Thu, 12 May 2016 23:13:17 +0000 (16:13 -0700)]
Show package icon/label for resolved package-targeted implicit intents

If we're going to show metadata about a resolved implicit intent that
is targeted to a single package with multiple potential targets,
populate the ResolveInfo with the label and icon of the target
package's ApplicationInfo and set resolvePackageName. This helps use
cases such as EXTRA_INITIAL_INTENTS in ChooserActivity, where
sometimes apps set target packages but not components.

Bug 28739056

Change-Id: I8070d341fccc139463c5ac8d66db45fce02252e5

8 years agoMerge "ApfFilter unit test" into nyc-dev
Paul Jensen [Fri, 13 May 2016 14:33:24 +0000 (14:33 +0000)]
Merge "ApfFilter unit test" into nyc-dev

8 years agoDocs: API Overview page for Android N, Dev Preview 3
David Friedman [Fri, 13 May 2016 08:23:13 +0000 (01:23 -0700)]
Docs: API Overview page for Android N, Dev Preview 3

Change-Id: Ib9a5dbe796eba85ea94686cce2532e0e77d6c615

8 years agoPIP: Fix NPE when onboarding is shown
Jaewan Kim [Fri, 13 May 2016 07:18:49 +0000 (16:18 +0900)]
PIP: Fix NPE when onboarding is shown

Bug: 28754669
Change-Id: Ifca78e111b63422c3875dc4eba48c02e11f83530

8 years agoSupport IPv4-only and IPv6-only provisioning
Erik Kline [Thu, 12 May 2016 06:13:02 +0000 (15:13 +0900)]
Support IPv4-only and IPv6-only provisioning

Bug: 28437662
Change-Id: I95b2d6eeb48cc526c8e6e015c5130ff9141fb898

8 years agoMerge "Close leaked windows when trying to preserve main one" into nyc-dev
Andrii Kulian [Fri, 13 May 2016 03:24:33 +0000 (03:24 +0000)]
Merge "Close leaked windows when trying to preserve main one" into nyc-dev

8 years agoMerge "docs: Continue CL of emoji section in api-overview" into mnc-io-docs am: 16d7c...
David Friedman [Fri, 13 May 2016 02:46:05 +0000 (02:46 +0000)]
Merge "docs: Continue CL of emoji section in api-overview" into mnc-io-docs am: 16d7c71365
am: fd9dca7783

* commit 'fd9dca77839260c7a808b8e57a73da4107ced88f':
  docs: Continue CL of emoji section in api-overview

Change-Id: I539ce22956d67b4a1e85cad1ab35375a615412b6

8 years agoMerge "docs: Continue CL of notifications updates" into mnc-io-docs am: 272db39ad8
David Friedman [Fri, 13 May 2016 02:42:58 +0000 (02:42 +0000)]
Merge "docs: Continue CL of notifications updates" into mnc-io-docs am: 272db39ad8
am: 87ec2a1348

* commit '87ec2a13488163b8ed51493a8f4b30165272c847':
  docs: Continue CL of notifications updates

Change-Id: I8fb81d096b30c4bb5ac52c1bad3a883492acc45c

8 years agoMerge "docs: Continue CL of emoji section in api-overview" into mnc-io-docs
Eric Schmidt [Fri, 13 May 2016 02:42:50 +0000 (02:42 +0000)]
Merge "docs: Continue CL of emoji section in api-overview" into mnc-io-docs
am: 16d7c71365

* commit '16d7c713656a0b4b98d15d29bc845ffe6b3dfe79':
  docs: Continue CL of emoji section in api-overview

Change-Id: I822c82db9d385325e754a93054cc9878880e6590

8 years agoMerge "Add metadata for tools videos." into mnc-mr-docs am: 96762b8500 am: 0ec5620717
Dirk Dougherty [Fri, 13 May 2016 02:40:25 +0000 (02:40 +0000)]
Merge "Add metadata for tools videos." into mnc-mr-docs am: 96762b8500 am: 0ec5620717
am: fc05721530

* commit 'fc05721530dcaa532e58b188624bb51d0024032c':
  Add metadata for tools videos.

Change-Id: I39bd537935258fab40ed38804c3233c6f124b91b

8 years agoMerge "docs: Continue CL of notifications updates" into mnc-io-docs
Eric Schmidt [Fri, 13 May 2016 02:40:20 +0000 (02:40 +0000)]
Merge "docs: Continue CL of notifications updates" into mnc-io-docs
am: 272db39ad8

* commit '272db39ad8909d78562cc520aef9e75d501e79d7':
  docs: Continue CL of notifications updates

Change-Id: I9c06da55a3172f70f92f35fad4e889da049dba17

8 years agoMerge "docs: Continue CL of emoji section in api-overview" into mnc-io-docs
David Friedman [Fri, 13 May 2016 02:37:37 +0000 (02:37 +0000)]
Merge "docs: Continue CL of emoji section in api-overview" into mnc-io-docs

8 years agoMerge "Add metadata for tools videos." into mnc-mr-docs am: 96762b8500
Dirk Dougherty [Fri, 13 May 2016 02:37:18 +0000 (02:37 +0000)]
Merge "Add metadata for tools videos." into mnc-mr-docs am: 96762b8500
am: 0ec5620717

* commit '0ec5620717dec4ca0a4cf66e30567867df98b2d4':
  Add metadata for tools videos.

Change-Id: I71219fac0af88663cf1a5d270d7533016b8b866e

8 years agoMerge "docs: Continue CL of notifications updates" into mnc-io-docs
David Friedman [Fri, 13 May 2016 02:36:39 +0000 (02:36 +0000)]
Merge "docs: Continue CL of notifications updates" into mnc-io-docs

8 years agoMerge "Add metadata for tools videos." into mnc-mr-docs
Dirk Dougherty [Fri, 13 May 2016 02:34:52 +0000 (02:34 +0000)]
Merge "Add metadata for tools videos." into mnc-mr-docs
am: 96762b8500

* commit '96762b8500166d931bbb8d5e6193c841540bdec8':
  Add metadata for tools videos.

Change-Id: I5b79243c49a5fba1637223dee0bfc7dfad5f9eea

8 years agoMerge "Add metadata for tools videos." into mnc-mr-docs
Dirk Dougherty [Fri, 13 May 2016 02:30:49 +0000 (02:30 +0000)]
Merge "Add metadata for tools videos." into mnc-mr-docs

8 years agoMerge "Fix a flicker when window is removed during entering animation" into nyc-dev
Chong Zhang [Fri, 13 May 2016 01:58:51 +0000 (01:58 +0000)]
Merge "Fix a flicker when window is removed during entering animation" into nyc-dev

8 years agodocs: Continue CL of emoji section in api-overview
Eric Schmidt [Thu, 12 May 2016 23:29:18 +0000 (16:29 -0700)]
docs: Continue CL of emoji section in api-overview

Bug: 27920740
Change-Id: I069dcdad67ab91c6085bdf52b1a0af6833afbd11

8 years agoMerge "Adjust divider when IME height is changed." into nyc-dev
Keisuke Kuroyanagi [Fri, 13 May 2016 01:46:09 +0000 (01:46 +0000)]
Merge "Adjust divider when IME height is changed." into nyc-dev

8 years agodocs: Continue CL of notifications updates
Eric Schmidt [Fri, 13 May 2016 01:33:25 +0000 (18:33 -0700)]
docs: Continue CL of notifications updates

Bug: 28520914
Change-Id: If0bbd5c503e4149fcd8f1db34fe7847a6cbefd20

8 years agoFixed some issues with fullscreen dimming
Wale Ogunwale [Thu, 12 May 2016 22:13:52 +0000 (15:13 -0700)]
Fixed some issues with fullscreen dimming

- Always dim home stack and task fullscreen. The home stack could be
in split-screen mode, but we still want to dim dialogs that are
associated with the stack or task in fullscreen. The dialogs are not
really activities, but they are associated with the home stack for
things like dimming. Don't ask me why...
- Update the fullscreen dim layer bounds anytime the dim layer is
adjusted so we always have up-to-date bounds after rotation.

Bug: 28575624
Change-Id: I805c771153a2d25fb199bd9987bbf78a5967f6b9

8 years agoMerge "Partial fix for jumping freeform windows" into nyc-dev
TreeHugger Robot [Fri, 13 May 2016 01:21:11 +0000 (01:21 +0000)]
Merge "Partial fix for jumping freeform windows" into nyc-dev

8 years agoMerge "ContentValues: improve documentation" into nyc-dev
TreeHugger Robot [Fri, 13 May 2016 01:12:51 +0000 (01:12 +0000)]
Merge "ContentValues: improve documentation" into nyc-dev

8 years agoMerge "Fix documentation bug in SQLiteDatabase" into nyc-dev
TreeHugger Robot [Fri, 13 May 2016 01:08:51 +0000 (01:08 +0000)]
Merge "Fix documentation bug in SQLiteDatabase" into nyc-dev

8 years agoMerge "cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc" into...
Kevin Hufnagle [Fri, 13 May 2016 01:02:36 +0000 (01:02 +0000)]
Merge "cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc" into mnc-io-docs am: 458b991356
am: e328025835

* commit 'e32802583591d10f9bb8687a6e00b6f3484ecbdd':
  cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc

Change-Id: If775ca04c0922f586b42d870fe9bc3b7c1312ca6

8 years agoMerge "cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc" into...
Kevin Hufnagle [Fri, 13 May 2016 00:59:40 +0000 (00:59 +0000)]
Merge "cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc" into mnc-io-docs
am: 458b991356

* commit '458b99135671cbb3d49f9e71e35e1cf5926b7d2c':
  cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc

Change-Id: I50b1383c264433677297023d378a2f622bd873b7

8 years agoMerge "cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc" into...
Kevin Hufnagle [Fri, 13 May 2016 00:56:27 +0000 (00:56 +0000)]
Merge "cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc" into mnc-io-docs

8 years agoFix Skia filter behavior test
Chris Craik [Fri, 13 May 2016 00:50:34 +0000 (17:50 -0700)]
Fix Skia filter behavior test

Fixes: 28751534

Change-Id: Ie5e2ee946b21702539fc0cc7358d0f9550e7d095

8 years agoMerge "Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into...
Android Build Merger (Role) [Fri, 13 May 2016 00:54:18 +0000 (00:54 +0000)]
Merge "Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs am: d5ef1ef028 am: ac5dc2f581" into nyc-dev

8 years agoMerge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc...
Adarsh Fernando [Fri, 13 May 2016 00:53:53 +0000 (00:53 +0000)]
Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs am: d5ef1ef028
am: ac5dc2f581

* commit 'ac5dc2f581b84affcd25a4d405cb8036b92a3797':
  Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)

Change-Id: Ia729337de141ebb48e39d54edcafff207bb9f974

8 years agoMerge "Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into...
Android Build Merger (Role) [Fri, 13 May 2016 00:52:14 +0000 (00:52 +0000)]
Merge "Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs am: d5ef1ef028 am: ac5dc2f581" into nyc-dev

8 years agoMerge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc...
Adarsh Fernando [Fri, 13 May 2016 00:51:49 +0000 (00:51 +0000)]
Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs am: d5ef1ef028
am: ac5dc2f581

* commit 'ac5dc2f581b84affcd25a4d405cb8036b92a3797':
  Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)

Change-Id: I5924aee920021fbbdb3792c87d719f393ce2a27b

8 years agoMerge "Fix incorrect inheritance from TextAppearance to Widget." into nyc-dev
Seigo Nonaka [Fri, 13 May 2016 00:50:20 +0000 (00:50 +0000)]
Merge "Fix incorrect inheritance from TextAppearance to Widget." into nyc-dev

8 years agoMerge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc...
Adarsh Fernando [Fri, 13 May 2016 00:49:26 +0000 (00:49 +0000)]
Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs
am: d5ef1ef028

* commit 'd5ef1ef028d5d7e529746206aa72f4cd65edd55b':
  Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)

Change-Id: Ic32c9e030b2a287bba161716f67788e740b78433

8 years agoMerge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc...
Adarsh Fernando [Fri, 13 May 2016 00:43:25 +0000 (00:43 +0000)]
Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs