drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
243,068 Commits 1 Branch 0 Tags
Commit Graph

243068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bert McMeen
689826fba9 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
 2016-05-13 21:35:03 +00:00
Bert McMeen
ccbf8c5dde docs: Complications guide for Wear Preview am: c0780f1d52 
am: 194fbc0da4

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

Change-Id: Ie3850f9647ec2fa2d0e43560e27ac1947a486375
 2016-05-13 21:34:58 +00:00
Bert McMeen
97158b85ec 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
 2016-05-13 21:32:10 +00:00
Bert McMeen
194fbc0da4 docs: Complications guide for Wear Preview 
am: c0780f1d52

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

Change-Id: I71999d68698c336c354cc11d042775685b77da8d
 2016-05-13 21:32:07 +00:00
Bert McMeen
e8d7012fba Merge "docs: Wear preview docs: Get Started, Download/Test, Program Overview" into mnc-io-docs 2016-05-13 21:29:27 +00:00
Jorim Jaggi
6cb8a2cfd2 Merge "Fix transition for forced resizable exit" into nyc-dev 2016-05-13 21:22:02 +00:00
Sid Soundararajan
e1293b7d07 Merge "Remove task based on object rather than position" into nyc-dev 2016-05-13 21:19:24 +00:00
Jorim Jaggi
e6d157b936 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
 2016-05-13 21:18:52 +00:00
Jorim Jaggi
0f6a6c4bc1 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
 2016-05-13 21:17:53 +00:00
Chong Zhang
918084e9ae Merge "Update stack bounds for fullscreen if rotated after updateDisplayInfo" into nyc-dev 2016-05-13 20:48:32 +00:00
TreeHugger Robot
e208bd4cbe Merge "Fixed some issues with fullscreen dimming" into nyc-dev 2016-05-13 20:42:21 +00:00
Bert McMeen
c0780f1d52 docs: Complications guide for Wear Preview 
Bug: 28425614
Change-Id: Ic1d5ce1a962b39a395c447c1f4d3bfadd6114246
 2016-05-13 12:30:17 -07:00
Wei Wang
02bc008607 Properly handle registration timeout in BLE. 
Bug:25384098
Change-Id: I7877f6368c4982fcd91e68810c4da0ab7b5fc6b7
 2016-05-13 18:32:15 +00:00
Dirk Dougherty
b72bf5cfdd 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
 2016-05-13 18:16:15 +00:00
Joe Fernandez
cfe2e7e1a9 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
 2016-05-13 18:13:46 +00:00
Dirk Dougherty
0e4b51ebc6 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
 2016-05-13 18:13:40 +00:00
Joe Fernandez
3357a67905 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
 2016-05-13 18:11:15 +00:00
Dirk Dougherty
6d3ca9aaa9 Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs 
am: 3a263cec30

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

Change-Id: I925a0c044e1b7b6186f348c4c8e216b8f53a13f4
 2016-05-13 18:11:11 +00:00
Chong Zhang
ccc335cfc7 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
 2016-05-13 11:07:22 -07:00
Joe Fernandez
a138ad92b2 Merge "docs: change preview landing page top ribbon color" into mnc-io-docs 2016-05-13 18:06:42 +00:00
Dirk Dougherty
3a263cec30 Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs 2016-05-13 18:03:24 +00:00
Dirk Dougherty
d9ad1ca8fb Correct the DP2 status beta -> alpha. 
Bug: 28175714
Change-Id: I050c9a41961528c1d65cd9b9737d93c82d16aef2
 2016-05-13 11:01:46 -07:00
Amanda Kassay
a63801a7c2 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
 2016-05-13 17:59:59 +00:00
Joe Fernandez
85f0641d1b docs: change preview landing page top ribbon color 
Change-Id: Iaa406a83de47df49eab54d1265629edc4dd57479
 2016-05-13 10:59:02 -07:00
Amanda Kassay
899981c244 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
 2016-05-13 17:57:28 +00:00
Amanda Kassay
494a4c967c 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
 2016-05-13 17:54:57 +00:00
Amanda Kassay
379e28db22 Merge "Clean up sdk/sdk_vars.cs file b/28744510" into mnc-mr-docs 2016-05-13 17:51:19 +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
Bert McMeen
3ec4cf8068 docs: Wear preview docs: Get Started, Download/Test, Program Overview 
Bug: 28317997
Change-Id: I7053f9cc336edecf91a256c31e6650a61ef4ae2d
 2016-05-13 10:26:34 -07:00
Android Build Merger (Role)
5dbbb72e71 Merge "Merge "docs: App Translation API updates" into mnc-docs am: 1ede811143 am: ec6effa1b0 am: 70f2e39008 am: e60af6b9e2" into nyc-dev 2016-05-13 17:21:14 +00:00
Kevin Hufnagle
90fa73b6d6 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
 2016-05-13 17:20:42 +00:00
Joe Fernandez
e60af6b9e2 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
 2016-05-13 17:17:53 +00:00
Paul Jensen
90ba8cf379 Merge "Use APF program to drop non-IP non-ARP broadcasts" into nyc-dev 2016-05-13 17:14:47 +00:00
Kevin Hufnagle
70f2e39008 Merge "docs: App Translation API updates" into mnc-docs am: 1ede811143 
am: ec6effa1b0

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

Change-Id: I77d01fcaa4c4ef1cefdbba2dad8af71f7aa6fa62
 2016-05-13 17:14:36 +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
Joe Fernandez
ec6effa1b0 Merge "docs: App Translation API updates" into mnc-docs 
am: 1ede811143

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

Change-Id: Id075bdfddf3c5ccabf063690a37c487a87f9635d
 2016-05-13 17:11:08 +00:00
Fyodor Kupolov
b7bd2e645d Merge "Call isUserUnlockingOrUnlocked with cleared identity" into nyc-dev 2016-05-13 17:07:59 +00:00
David Friedman
d180d46711 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
 2016-05-13 17:06:14 +00:00
Kevin Hufnagle
1ede811143 Merge "docs: App Translation API updates" into mnc-docs 2016-05-13 17:05:11 +00:00
David Friedman
95d6fa6b5d 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
 2016-05-13 17:03:28 +00:00
TreeHugger Robot
abe26c8d69 Merge "PIP: Fix NPE when onboarding is shown" into nyc-dev 2016-05-13 16:55:12 +00:00
Andreas Gampe
3264b60738 Merge "System server: Add Bluetooth to native processes" into nyc-dev 2016-05-13 16:27:58 +00:00
Amanda Kassay
b32811214c Clean up sdk/sdk_vars.cs file b/28744510 
Change-Id: I9e09f0a320c4379db517ddb4e0783035dea5c061
 2016-05-13 12:17:43 -04: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
Paul Jensen
b742495cf5 Merge "ApfFilter unit test" into nyc-dev 2016-05-13 14:33:25 +00:00
David Friedman
93970bae9b Docs: API Overview page for Android N, Dev Preview 3 
Change-Id: Ib9a5dbe796eba85ea94686cce2532e0e77d6c615
 2016-05-13 01:23:13 -07:00
Jaewan Kim
91c5066c00 PIP: Fix NPE when onboarding is shown 
Bug: 28754669
Change-Id: Ifca78e111b63422c3875dc4eba48c02e11f83530
 2016-05-13 16:18:49 +09:00
Erik Kline
2ec229a0ed Support IPv4-only and IPv6-only provisioning 
Bug: 28437662
Change-Id: I95b2d6eeb48cc526c8e6e015c5130ff9141fb898
 2016-05-13 13:21:25 +09: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