Commit Graph

66250 Commits

Author SHA1 Message Date
Andrew Solovay
e7ffd8086f docs: Updates to multi-window and related docs. am: 4d93a21980 am: 8263d6c0a3 am: c88130c572 am: d29c26073e am: f975b74c0c am: 0b15a5c94f
am: 3882169d7f

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

Change-Id: Ief8906a4c0e57229b433c4e89c23990d957a4014
2016-05-13 22:16:16 +00:00
Andrew Solovay
3882169d7f docs: Updates to multi-window and related docs. am: 4d93a21980 am: 8263d6c0a3 am: c88130c572 am: d29c26073e am: f975b74c0c
am: 0b15a5c94f

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

Change-Id: Id40a1c06b5a12c02ee26b855ec7c813abac8e554
2016-05-13 22:13:30 +00:00
Andrew Solovay
0b15a5c94f docs: Updates to multi-window and related docs. am: 4d93a21980 am: 8263d6c0a3 am: c88130c572 am: d29c26073e
am: f975b74c0c

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

Change-Id: Ia7b8adbe3140a59d2e2433b3795e58a16763527c
2016-05-13 22:10:49 +00:00
Andrew Solovay
f975b74c0c 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
2016-05-13 22:08:17 +00:00
Adam Powell
c68c2b44ab Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev am: a6c0cc0992 am: 46ca7d8c28
am: bbb2c35902

* commit 'bbb2c359023a0cd8ee3790235ed35cec2c13ea27':
  Add Fragment#onAttachFragment for parent fragments

Change-Id: I0561042957f8f150c5206cd5a3cfb3b2d5ce4035
2016-05-13 22:03:16 +00:00
Andrew Solovay
d29c26073e 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
2016-05-13 22:03:15 +00:00
Adam Powell
bbb2c35902 Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev am: a6c0cc0992
am: 46ca7d8c28

* commit '46ca7d8c288da4414f40de7e8b1d8f929816bd82':
  Add Fragment#onAttachFragment for parent fragments

Change-Id: I6862300fc5aff480c4215d66eb8c9167ed17e448
2016-05-13 22:00:46 +00:00
Adam Powell
f1dda81c42 Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev
am: a6c0cc0992

* commit 'a6c0cc099221a5321505b1343f623e76f52b2ad5':
  Add Fragment#onAttachFragment for parent fragments

Change-Id: I9138e3ee5706cbd35a119843f0007f548021e2f9
2016-05-13 21:57:57 +00:00
Adam Powell
46ca7d8c28 Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev
am: a6c0cc0992

* commit 'a6c0cc099221a5321505b1343f623e76f52b2ad5':
  Add Fragment#onAttachFragment for parent fragments

Change-Id: I04c96f7a7ecf73d63b401bb0e1e7d3900fd59310
2016-05-13 21:57:52 +00:00
TreeHugger Robot
a6c0cc0992 Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev 2016-05-13 21:53:42 +00:00
Adam Powell
e30299f990 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
2016-05-13 13:38:45 -07:00
Andrew Solovay
4d93a21980 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
2016-05-13 13:33:55 -07:00
Wei Wang
cead26c363 Properly handle registration timeout in BLE. am: 02bc008607 am: cde5d3db24
am: faf357e83c

* commit 'faf357e83cfda779b36ea579b8304038ae9c6089':
  Properly handle registration timeout in BLE.

Change-Id: I9b9a7ef6167ae397ebf943bc61e854e4b887140d
2016-05-13 18:40:04 +00:00
Wei Wang
faf357e83c Properly handle registration timeout in BLE. am: 02bc008607
am: cde5d3db24

* commit 'cde5d3db24da4b5b6b640d99595b281a75997ef3':
  Properly handle registration timeout in BLE.

Change-Id: I986e05659a660e69b79e1e762398370394106727
2016-05-13 18:37:36 +00:00
Wei Wang
cde5d3db24 Properly handle registration timeout in BLE.
am: 02bc008607

* commit '02bc0086071b5faff260566b4d3713861703eee3':
  Properly handle registration timeout in BLE.

Change-Id: I1cfeb8c7a84b667854871d7f6eafd0bb6a918d50
2016-05-13 18:35:08 +00:00
Wei Wang
6122c4392a Properly handle registration timeout in BLE.
am: 02bc008607

* commit '02bc0086071b5faff260566b4d3713861703eee3':
  Properly handle registration timeout in BLE.

Change-Id: If6315c9ac1d083c4c26f5835d19722c94ccabcd5
2016-05-13 18:35:06 +00:00
Wei Wang
02bc008607 Properly handle registration timeout in BLE.
Bug:25384098
Change-Id: I7877f6368c4982fcd91e68810c4da0ab7b5fc6b7
2016-05-13 18:32:15 +00:00
Steve McKay
935d7d6854 Merge "Don\'t show new-window item in Downloads per Gabe." into nyc-dev am: fec0d188c1 am: 6fdaf2f2cf
am: b8995b7abc

* commit 'b8995b7abc9cbaa1dcb363c68535a63f4e8768a3':
  Don't show new-window item in Downloads per Gabe.

Change-Id: I54d288582f474ed1a0718a3f6327af7f1814be75
2016-05-13 17:42:44 +00:00
Steve McKay
b8995b7abc Merge "Don\'t show new-window item in Downloads per Gabe." into nyc-dev am: fec0d188c1
am: 6fdaf2f2cf

* commit '6fdaf2f2cf0d060c7f99baa28ff0514c31faa84f':
  Don't show new-window item in Downloads per Gabe.

Change-Id: If6dbf8d3d23f3e97fcf2db9ad7261c9217bfa631
2016-05-13 17:34:16 +00:00
Felipe Leme
5118db67f7 Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev am: 25018d41f4 am: cc02a95cbd
am: 6e12f9d36d

* commit '6e12f9d36da3214367fc4ad5510220a397970aa2':
  Fixed connectivity state in some power saving scenarios.

Change-Id: Idd27e581b208a0d80d8fa6a4d7cf75eac82a32fd
2016-05-13 17:31:58 +00:00
Steve McKay
6fdaf2f2cf Merge "Don\'t show new-window item in Downloads per Gabe." into nyc-dev
am: fec0d188c1

* commit 'fec0d188c166e5a2c517f4494e83c1db11b31c68':
  Don't show new-window item in Downloads per Gabe.

Change-Id: Ic8d6afb5e38c1ded0ca7750be4ac4822aefbe6c1
2016-05-13 17:31:35 +00:00
Steve McKay
270539c6d0 Merge "Don\'t show new-window item in Downloads per Gabe." into nyc-dev
am: fec0d188c1

* commit 'fec0d188c166e5a2c517f4494e83c1db11b31c68':
  Don't show new-window item in Downloads per Gabe.

Change-Id: I3e7b11561ad3d6a3407119428a2e20709072f53a
2016-05-13 17:31:32 +00:00
TreeHugger Robot
fec0d188c1 Merge "Don't show new-window item in Downloads per Gabe." into nyc-dev 2016-05-13 17:26:46 +00:00
Felipe Leme
6e12f9d36d Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev am: 25018d41f4
am: cc02a95cbd

* commit 'cc02a95cbd694927cd70d7b0d7921d3f10300b38':
  Fixed connectivity state in some power saving scenarios.

Change-Id: I9ce60e8520c041e1345960a51394f8477c4ac49e
2016-05-13 17:26:29 +00:00
Adam Powell
0fdf7c326a Merge "Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev am: e89dc40706 am: a53d9cace1" into nyc-mr1-dev-plus-aosp
am: 60c73947d0

* commit '60c73947d087c8272889d7b8a600b59d391cd98c':
  Show package icon/label for resolved package-targeted implicit intents

Change-Id: Id1db07816cc5437b4099123b663e32736283c327
2016-05-13 17:23:25 +00:00
Felipe Leme
e90dee0077 Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev
am: 25018d41f4

* commit '25018d41f482fe21a45eb2e739f22dc7cc937428':
  Fixed connectivity state in some power saving scenarios.

Change-Id: I7ebe3864657d2147034ffae400312e94deb5ef35
2016-05-13 17:23:24 +00:00
Felipe Leme
cc02a95cbd Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev
am: 25018d41f4

* commit '25018d41f482fe21a45eb2e739f22dc7cc937428':
  Fixed connectivity state in some power saving scenarios.

Change-Id: If76cc55916bbd7e5e4093b39ff81a40c1e43034c
2016-05-13 17:23:19 +00:00
Adam Powell
15021f66fa Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev am: e89dc40706
am: a53d9cace1

* commit 'a53d9cace1ff124e23ae54dbb68c9a58947a8ce1':
  Show package icon/label for resolved package-targeted implicit intents

Change-Id: I13c4f6c28551188cf2622a7769b4a11cb67b47bc
2016-05-13 17:20:37 +00:00
Adam Powell
ac3f24fabd Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev
am: e89dc40706

* commit 'e89dc40706f325e039de7dd6714223908dfb9b17':
  Show package icon/label for resolved package-targeted implicit intents

Change-Id: I178045e372dd962383fbc6d26fe7b99b20f6cf88
2016-05-13 17:17:48 +00:00
Adam Powell
a53d9cace1 Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev
am: e89dc40706

* commit 'e89dc40706f325e039de7dd6714223908dfb9b17':
  Show package icon/label for resolved package-targeted implicit intents

Change-Id: I254e8d1a0b3cc45e3c030ca1cec7e7ecc5dbd91e
2016-05-13 17:17:44 +00:00
TreeHugger Robot
25018d41f4 Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev 2016-05-13 17:14:13 +00:00
TreeHugger Robot
e89dc40706 Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev 2016-05-13 17:11:14 +00:00
Adam Powell
86100d18ad 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
2016-05-13 08:34:37 -07:00
Steven Ng
335e4bdf60 Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev am: e333b2eb81
am: a62fc512da

* commit 'a62fc512dae936ec1d8573cacbd4e649ecd9be1f':
  Add a Global setting for disabling OEM unlocking setting

Change-Id: I8e0f6f00599923be663c9808ffa187bbe014121c
2016-05-13 11:38:43 +00:00
Steven Ng
a62fc512da Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev
am: e333b2eb81

* commit 'e333b2eb81958cc8d27eb687ebd84844a84919ea':
  Add a Global setting for disabling OEM unlocking setting

Change-Id: I625b51c1e257afa095dfacb3bcf481fb2068b56f
2016-05-13 11:36:20 +00:00
Steven Ng
e333b2eb81 Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev 2016-05-13 11:27:59 +00:00
Andrii Kulian
42a2e42f94 Merge "Close leaked windows when trying to preserve main one" into nyc-dev am: 4ef107bb7a am: 1c4c2caa4c
am: 49f7135fef

* commit '49f7135fef3a982edd04a292a8c46afff4d6ef86':
  Close leaked windows when trying to preserve main one

Change-Id: Ic83f1f4a07bed89bf77e96ae16a273c859624948
2016-05-13 03:35:42 +00:00
Andrii Kulian
49f7135fef Merge "Close leaked windows when trying to preserve main one" into nyc-dev am: 4ef107bb7a
am: 1c4c2caa4c

* commit '1c4c2caa4c070ae07c30e61c3864e612eea797f2':
  Close leaked windows when trying to preserve main one

Change-Id: Ie9f776dafecf4600f3e73f9bc68b9c85d2826597
2016-05-13 03:33:12 +00:00
Andrii Kulian
1c4c2caa4c Merge "Close leaked windows when trying to preserve main one" into nyc-dev
am: 4ef107bb7a

* commit '4ef107bb7ad0c1f28db710374bb118e6658d3238':
  Close leaked windows when trying to preserve main one

Change-Id: I20b5d6ab8adbb97cffca52e1daf66ed939d508b8
2016-05-13 03:30:45 +00:00
Andrii Kulian
48164fd554 Merge "Close leaked windows when trying to preserve main one" into nyc-dev
am: 4ef107bb7a

* commit '4ef107bb7ad0c1f28db710374bb118e6658d3238':
  Close leaked windows when trying to preserve main one

Change-Id: Ie98ad06c08eb4486d98327201fb7fa10456a2459
2016-05-13 03:30:41 +00:00
Andrii Kulian
4ef107bb7a Merge "Close leaked windows when trying to preserve main one" into nyc-dev 2016-05-13 03:24:34 +00:00
Vladislav Kaznacheev
89126c6a1f Merge "Partial fix for jumping freeform windows" into nyc-dev am: d5c94d1af3 am: a072db029f
am: 7f163a39a3

* commit '7f163a39a37ce2c5ef54787c7b8e6bea663a03ca':
  Partial fix for jumping freeform windows

Change-Id: Ic2f89842adbe119d59fa868bd5ea5721735a7fce
2016-05-13 01:31:30 +00:00
Vladislav Kaznacheev
7f163a39a3 Merge "Partial fix for jumping freeform windows" into nyc-dev am: d5c94d1af3
am: a072db029f

* commit 'a072db029f876e37bd0bd855c0909192d2efecec':
  Partial fix for jumping freeform windows

Change-Id: Icf2b9daf7e3688d164d0b0236bb065eabe29468f
2016-05-13 01:28:45 +00:00
Vladislav Kaznacheev
a072db029f Merge "Partial fix for jumping freeform windows" into nyc-dev
am: d5c94d1af3

* commit 'd5c94d1af3c042fa373d0864c07387a3d2125a08':
  Partial fix for jumping freeform windows

Change-Id: Icf1d177ba6b04629beb40188dcbde63a19b3dbf9
2016-05-13 01:26:01 +00:00
Vladislav Kaznacheev
9e13b1f218 Merge "Partial fix for jumping freeform windows" into nyc-dev
am: d5c94d1af3

* commit 'd5c94d1af3c042fa373d0864c07387a3d2125a08':
  Partial fix for jumping freeform windows

Change-Id: Ifdff3f152787fb6c8739fddf1767d0ce3e4b0e26
2016-05-13 01:25:52 +00:00
TreeHugger Robot
d5c94d1af3 Merge "Partial fix for jumping freeform windows" into nyc-dev 2016-05-13 01:21:12 +00:00
Steve Pomeroy
4c8c470015 Merge "ContentValues: improve documentation" into nyc-dev
am: 33d0ff9959

* commit '33d0ff995976533f9989cd6ec95c3de5ba9aee05':
  ContentValues: improve documentation

Change-Id: I29244d0c039abcd08139e2814bb465e2e5b9e03a
2016-05-13 01:17:57 +00:00
Steve Pomeroy
115f43cda7 Merge "Fix documentation bug in SQLiteDatabase" into nyc-dev
am: d07a3c4203

* commit 'd07a3c42034b35a0474619f9395a9d97abc83069':
  Fix documentation bug in SQLiteDatabase

Change-Id: I6df7ab83572b128672af473941c487ac20f5d077
2016-05-13 01:17:54 +00:00
TreeHugger Robot
33d0ff9959 Merge "ContentValues: improve documentation" into nyc-dev 2016-05-13 01:12:52 +00:00
Vladislav Kaznacheev
cb4bbd7af8 Partial fix for jumping freeform windows
Currently every focus change causes a freeform window to jump
for a few frames. The size of the jump is equal to the difference
in inset size (which is derived directly from the window elevation).

This problem goes away for most real use cases if the insets are
not allowed to decrease.

Bug: 28318973
Bug: 22668382
Change-Id: I77ca440a7d9c89cc4d45e6667bf37da94a5c8a9a
2016-05-12 23:56:32 +00:00