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

243052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
David Friedman
02a71e6eeb 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
 2016-05-13 02:46:05 +00:00
David Friedman
938fff13e4 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
 2016-05-13 02:42:58 +00:00
Eric Schmidt
fd9dca7783 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
 2016-05-13 02:42:50 +00:00
Dirk Dougherty
ccfda4ecd8 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
 2016-05-13 02:40:25 +00:00
Eric Schmidt
87ec2a1348 Merge "docs: Continue CL of notifications updates" into mnc-io-docs 
am: 272db39ad8

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

Change-Id: I9c06da55a3172f70f92f35fad4e889da049dba17
 2016-05-13 02:40:20 +00:00
David Friedman
16d7c71365 Merge "docs: Continue CL of emoji section in api-overview" into mnc-io-docs 2016-05-13 02:37:39 +00:00
Dirk Dougherty
fc05721530 Merge "Add metadata for tools videos." into mnc-mr-docs am: 96762b8500 
am: 0ec5620717

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

Change-Id: I71219fac0af88663cf1a5d270d7533016b8b866e
 2016-05-13 02:37:18 +00:00
David Friedman
272db39ad8 Merge "docs: Continue CL of notifications updates" into mnc-io-docs 2016-05-13 02:36:40 +00:00
Dirk Dougherty
0ec5620717 Merge "Add metadata for tools videos." into mnc-mr-docs 
am: 96762b8500

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

Change-Id: I5b79243c49a5fba1637223dee0bfc7dfad5f9eea
 2016-05-13 02:34:52 +00:00
Dirk Dougherty
96762b8500 Merge "Add metadata for tools videos." into mnc-mr-docs 2016-05-13 02:30:51 +00:00
Chong Zhang
a285fdeb16 Merge "Fix a flicker when window is removed during entering animation" into nyc-dev 2016-05-13 01:58:52 +00:00
Eric Schmidt
700127aecf docs: Continue CL of emoji section in api-overview 
Bug: 27920740
Change-Id: I069dcdad67ab91c6085bdf52b1a0af6833afbd11
 2016-05-13 01:54:23 +00:00
Keisuke Kuroyanagi
36d1296cf4 Merge "Adjust divider when IME height is changed." into nyc-dev 2016-05-13 01:46:10 +00:00
Eric Schmidt
c563e0b99b docs: Continue CL of notifications updates 
Bug: 28520914
Change-Id: If0bbd5c503e4149fcd8f1db34fe7847a6cbefd20
 2016-05-12 18:33:25 -07:00