OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge \"Note null alarm worksource names under the alarm\'s package\" into nyc-dev
Christopher Tate [Tue, 14 Jun 2016 20:54:09 +0000 (20:54 +0000)]
Merge \"Note null alarm worksource names under the alarm\'s package\" into nyc-dev
am: 2f4636a333

Change-Id: I326cbd9ed3494797190fc9ee8bfe22a5cdc844c8

8 years agoMerge \"docs: Updated support library revisions page for 24.0.0\" into nyc-dev
Andrew Solovay [Tue, 14 Jun 2016 20:53:58 +0000 (20:53 +0000)]
Merge \"docs: Updated support library revisions page for 24.0.0\" into nyc-dev
am: eb4e8105d3

Change-Id: I4f53b453d1b72d6051b50e3ec3dd979020ea7c6a

8 years agoMerge "Note null alarm worksource names under the alarm's package" into nyc-dev
Chris Tate [Tue, 14 Jun 2016 20:37:06 +0000 (20:37 +0000)]
Merge "Note null alarm worksource names under the alarm's package" into nyc-dev

8 years agoMerge "docs: Updated support library revisions page for 24.0.0" into nyc-dev
TreeHugger Robot [Tue, 14 Jun 2016 20:36:28 +0000 (20:36 +0000)]
Merge "docs: Updated support library revisions page for 24.0.0" into nyc-dev

8 years agoMerge \\\"docs: Clarifying direct boot notification messages\\\" into mnc-io-docs...
Daniel Yu [Tue, 14 Jun 2016 20:07:00 +0000 (20:07 +0000)]
Merge \\\"docs: Clarifying direct boot notification messages\\\" into mnc-io-docs am: 120fd583d5 am: 4c5e5ec6d5
am: 189ef624d1

Change-Id: I8dd09259cd766055b3fff690cb4bbc12d871ec85

8 years agoMerge \\"docs: Clarifying direct boot notification messages\\" into mnc-io-docs am...
Dan Yu [Tue, 14 Jun 2016 19:59:36 +0000 (19:59 +0000)]
Merge \\"docs: Clarifying direct boot notification messages\\" into mnc-io-docs am: 120fd583d5
am: 4c5e5ec6d5

Change-Id: I2bfe82b79c928d10b7725315d42b00a1994bbd52

8 years agoMerge \"Improve action bar transition\" into nyc-dev
Adrian Roos [Tue, 14 Jun 2016 19:56:59 +0000 (19:56 +0000)]
Merge \"Improve action bar transition\" into nyc-dev
am: 207cbee824

Change-Id: I9fe03bc7409f2631aa8b7a5d1d2a8542d4a1fd3c

8 years agoMerge \"docs: Clarifying direct boot notification messages\" into mnc-io-docs
Daniel Yu [Tue, 14 Jun 2016 19:53:35 +0000 (19:53 +0000)]
Merge \"docs: Clarifying direct boot notification messages\" into mnc-io-docs
am: 120fd583d5

Change-Id: I076e69e0a0497ed461dc576b72419152e89bb010

8 years agoMerge "docs: Clarifying direct boot notification messages" into mnc-io-docs
Dan Yu [Tue, 14 Jun 2016 19:49:11 +0000 (19:49 +0000)]
Merge "docs: Clarifying direct boot notification messages" into mnc-io-docs

8 years agoMerge "Improve action bar transition" into nyc-dev
Adrian Roos [Tue, 14 Jun 2016 19:42:40 +0000 (19:42 +0000)]
Merge "Improve action bar transition" into nyc-dev

8 years agoMerge \"Fix jittery action bar during transitions\" into nyc-dev
Adrian Roos [Tue, 14 Jun 2016 19:42:03 +0000 (19:42 +0000)]
Merge \"Fix jittery action bar during transitions\" into nyc-dev
am: 8507d98ad1

Change-Id: I398e98789bd7ebac32289a0a84ba9ab3393fb70e

8 years agoMerge \"Make RemoteView margins density-change safe\" into nyc-dev
Adrian Roos [Tue, 14 Jun 2016 19:41:59 +0000 (19:41 +0000)]
Merge \"Make RemoteView margins density-change safe\" into nyc-dev
am: 26e864c398

Change-Id: I9fb7b321751443c750ee8acb0190a79dd8669941

8 years agoMerge "Fix jittery action bar during transitions" into nyc-dev
Adrian Roos [Tue, 14 Jun 2016 19:31:24 +0000 (19:31 +0000)]
Merge "Fix jittery action bar during transitions" into nyc-dev

8 years agoMerge "Make RemoteView margins density-change safe" into nyc-dev
Adrian Roos [Tue, 14 Jun 2016 19:31:12 +0000 (19:31 +0000)]
Merge "Make RemoteView margins density-change safe" into nyc-dev

8 years agoMerge \"Update SyncManager min period to match JobScheduler\" into nyc-dev
Shreyas Basarge [Tue, 14 Jun 2016 19:04:02 +0000 (19:04 +0000)]
Merge \"Update SyncManager min period to match JobScheduler\" into nyc-dev
am: 166b0abf13

Change-Id: I8cfeb60e96a58d6778488c1b4c3ce9565a11bf88

8 years agoMerge \"MediaPlayer: fix java doc for setSurface and setDisplay.\" into nyc-dev
Wei Jia [Tue, 14 Jun 2016 18:58:55 +0000 (18:58 +0000)]
Merge \"MediaPlayer: fix java doc for setSurface and setDisplay.\" into nyc-dev
am: c6f39a0c36

Change-Id: I1c6dea8e60e96804c9d7564b367c21b146728072

8 years agoMerge "Update SyncManager min period to match JobScheduler" into nyc-dev
Shreyas Basarge [Tue, 14 Jun 2016 18:54:43 +0000 (18:54 +0000)]
Merge "Update SyncManager min period to match JobScheduler" into nyc-dev

8 years agoMerge "MediaPlayer: fix java doc for setSurface and setDisplay." into nyc-dev
Wei Jia [Tue, 14 Jun 2016 18:50:00 +0000 (18:50 +0000)]
Merge "MediaPlayer: fix java doc for setSurface and setDisplay." into nyc-dev

8 years agoMerge \"docs: Updating N download pages for DP4\" into nyc-dev
Andrew Solovay [Tue, 14 Jun 2016 18:32:54 +0000 (18:32 +0000)]
Merge \"docs: Updating N download pages for DP4\" into nyc-dev
am: f2d5d876b9

Change-Id: I30d07c84d858d3ca262320525082c7cf8a5e1c3a

8 years agoMerge \"Don\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\" into...
Makoto Onuki [Tue, 14 Jun 2016 18:26:00 +0000 (18:26 +0000)]
Merge \"Don\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\" into nyc-dev
am: 5e94a16b74

Change-Id: I61c3582d8b51124b33b39249f20bdfe71e764a69

8 years agoMerge "docs: Updating N download pages for DP4" into nyc-dev
TreeHugger Robot [Tue, 14 Jun 2016 18:20:48 +0000 (18:20 +0000)]
Merge "docs: Updating N download pages for DP4" into nyc-dev

8 years agoMerge \"Docs: Changed a command in Keyboard Shortcuts\" into nyc-dev
Hemal Patel [Tue, 14 Jun 2016 18:19:54 +0000 (18:19 +0000)]
Merge \"Docs: Changed a command in Keyboard Shortcuts\" into nyc-dev
am: d0067507be

Change-Id: Id30ee255e889c18cba0ab43cd9d0759e35dd53b7

8 years agoMerge "Don't take the DPMS lock in DPMI.createPackageSuspendedDialogIntent" into...
Makoto Onuki [Tue, 14 Jun 2016 18:17:00 +0000 (18:17 +0000)]
Merge "Don't take the DPMS lock in DPMI.createPackageSuspendedDialogIntent" into nyc-dev

8 years agoMerge "Docs: Changed a command in Keyboard Shortcuts" into nyc-dev
Hemal Patel [Tue, 14 Jun 2016 18:11:09 +0000 (18:11 +0000)]
Merge "Docs: Changed a command in Keyboard Shortcuts" into nyc-dev

8 years agoMediaPlayer: fix java doc for setSurface and setDisplay.
Wei Jia [Tue, 14 Jun 2016 17:53:40 +0000 (10:53 -0700)]
MediaPlayer: fix java doc for setSurface and setDisplay.

Bug: 29149415
Change-Id: I281b6328c068255387ca01a987ff136c3be5e25b

8 years agoMerge \\\"Fix broken {@docRoot} links\\\" into mnc-io-docs am: a0fa50e40b am: 423fe7db6a
Aurimas Liutikas [Tue, 14 Jun 2016 17:44:17 +0000 (17:44 +0000)]
Merge \\\"Fix broken {@docRoot} links\\\" into mnc-io-docs am: a0fa50e40b am: 423fe7db6a
am: 68d5e4b9ff

Change-Id: I19ac9f6a9006030e2aeba2a1b48c2781d263ad01

8 years agoMerge \\"Fix broken {@docRoot} links\\" into mnc-io-docs am: a0fa50e40b
Aurimas Liutikas [Tue, 14 Jun 2016 17:37:38 +0000 (17:37 +0000)]
Merge \\"Fix broken {@docRoot} links\\" into mnc-io-docs am: a0fa50e40b
am: 423fe7db6a

Change-Id: I192297bc254d199e25249952591b3b2a1fc2b617

8 years agoMerge \"Fix broken {@docRoot} links\" into mnc-io-docs
Aurimas Liutikas [Tue, 14 Jun 2016 17:27:57 +0000 (17:27 +0000)]
Merge \"Fix broken {@docRoot} links\" into mnc-io-docs
am: a0fa50e40b

Change-Id: I7dd53f31f44262e09624d23d820723893aaba5c7

8 years agoNote null alarm worksource names under the alarm's package
Christopher Tate [Tue, 14 Jun 2016 17:16:28 +0000 (10:16 -0700)]
Note null alarm worksource names under the alarm's package

And log a nastygram because it implies the app is misbehaving.

Bug 29333122

Change-Id: Ia683304b8a9eafb234df81e874ee3f0636c4e56a

8 years agoMerge \"Add a key for setting carrier\'s CDMA roaming mode\" into nyc-dev
qingxi [Tue, 14 Jun 2016 17:15:41 +0000 (17:15 +0000)]
Merge \"Add a key for setting carrier\'s CDMA roaming mode\" into nyc-dev
am: 130db7715a

Change-Id: I130ba1362d755e1859d5c22311867008d0626890

8 years agoMerge "Fix broken {@docRoot} links" into mnc-io-docs
Aurimas Liutikas [Tue, 14 Jun 2016 17:14:57 +0000 (17:14 +0000)]
Merge "Fix broken {@docRoot} links" into mnc-io-docs

8 years agoMerge "Add a key for setting carrier's CDMA roaming mode" into nyc-dev
Qingxi Li [Tue, 14 Jun 2016 17:02:51 +0000 (17:02 +0000)]
Merge "Add a key for setting carrier's CDMA roaming mode" into nyc-dev

8 years agoMerge \"Fixed a bug with a legacy notification API\" into nyc-dev
Selim Cinek [Tue, 14 Jun 2016 17:02:39 +0000 (17:02 +0000)]
Merge \"Fixed a bug with a legacy notification API\" into nyc-dev
am: 05e19bba37

Change-Id: I419b48b3a4e73b5cc1c7597d885541f4b163a00f

8 years agoMerge "Fixed a bug with a legacy notification API" into nyc-dev
Selim Cinek [Tue, 14 Jun 2016 16:54:20 +0000 (16:54 +0000)]
Merge "Fixed a bug with a legacy notification API" into nyc-dev

8 years agoDon't take the DPMS lock in DPMI.createPackageSuspendedDialogIntent
Makoto Onuki [Mon, 13 Jun 2016 21:50:11 +0000 (14:50 -0700)]
Don't take the DPMS lock in DPMI.createPackageSuspendedDialogIntent

This method is called by AM with the lock held, so can't take the
DPMS lock.

It still takes a different lock, but we don't call into the external
world while holding this lock, so this is fine.

Bug 29242568

Change-Id: Idbecdd7d97385ca66c693903443471fdbae833e6

8 years agodocs: Clarifying direct boot notification messages
Daniel Yu [Mon, 6 Jun 2016 18:27:07 +0000 (11:27 -0700)]
docs: Clarifying direct boot notification messages

Adding details on which notification message to listen for
when developing apps that need to interact with direct boot mode.
Note: This is a doc fix for the N direct boot feature docs, but
not specific to any preview release.

Bug: 28729775
Change-Id: If6b239e7aa92bced735cfa1e72d8891d193a420c

8 years agoMerge \\\"Docs: Watch face performance update\\\" into mnc-io-docs am: 99677fb42d...
Bert McMeen [Tue, 14 Jun 2016 15:21:58 +0000 (15:21 +0000)]
Merge \\\"Docs: Watch face performance update\\\" into mnc-io-docs am: 99677fb42d am: 106af82850
am: 22eb26c27d

Change-Id: Ifd3b004c5401ba7374d642439938849da19060e8

8 years agoMerge \\"Docs: Watch face performance update\\" into mnc-io-docs am: 99677fb42d
Bert McMeen [Tue, 14 Jun 2016 15:15:59 +0000 (15:15 +0000)]
Merge \\"Docs: Watch face performance update\\" into mnc-io-docs am: 99677fb42d
am: 106af82850

Change-Id: Ia9fa224a4ebb6e51a3c6141751036504d202e137

8 years agoMerge \"Docs: Watch face performance update\" into mnc-io-docs
Bert McMeen [Tue, 14 Jun 2016 15:07:53 +0000 (15:07 +0000)]
Merge \"Docs: Watch face performance update\" into mnc-io-docs
am: 99677fb42d

Change-Id: I41b6ee0628e561cfb7f711d07ac1e41ff71fcb60

8 years agoMerge "Docs: Watch face performance update" into mnc-io-docs
Bert McMeen [Tue, 14 Jun 2016 15:01:59 +0000 (15:01 +0000)]
Merge "Docs: Watch face performance update" into mnc-io-docs

8 years agoUpdate SyncManager min period to match JobScheduler
Shreyas Basarge [Tue, 14 Jun 2016 14:32:02 +0000 (15:32 +0100)]
Update SyncManager min period to match JobScheduler

Use JobScheduler's minimum period in SyncManager.
Syncs will respect JobScheduler's min period anyway,
this change ensures that dumpsys of both services
show the same period.

Bug: 29253834
Change-Id: I0cd7f85da56af967963573a048c3a71436ed9c5b

8 years agoMerge \"Redraw if dirty during stopped when resumed\" into nyc-dev
John Reck [Tue, 14 Jun 2016 14:54:21 +0000 (14:54 +0000)]
Merge \"Redraw if dirty during stopped when resumed\" into nyc-dev
am: 5b4ff21a74

Change-Id: I75235a18c29939b4f221c8af664d5f7218660aed

8 years agoMerge "Redraw if dirty during stopped when resumed" into nyc-dev
John Reck [Tue, 14 Jun 2016 14:43:19 +0000 (14:43 +0000)]
Merge "Redraw if dirty during stopped when resumed" into nyc-dev

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Bill Yi [Tue, 14 Jun 2016 12:21:19 +0000 (12:21 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 7ce75172dd  -s ours

Change-Id: Ie8451e38f89fedd49445ff91b1d01fe93177292b

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Bill Yi [Tue, 14 Jun 2016 12:06:34 +0000 (12:06 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: bb8b32262f  -s ours

Change-Id: I711e22ef0d10409d81c1ed4352876697797b95a8

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 14 Jun 2016 11:47:53 +0000 (11:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 14 Jun 2016 11:46:42 +0000 (11:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge \"Show sign-in to network notification to all users, not just owner.\" into...
Paul Jensen [Tue, 14 Jun 2016 11:16:15 +0000 (11:16 +0000)]
Merge \"Show sign-in to network notification to all users, not just owner.\" into nyc-dev
am: 78452db285

Change-Id: Ic8f99cb7c7fa7ed1f40c73342840f82c56f9f90f

8 years agoMerge "Show sign-in to network notification to all users, not just owner." into nyc-dev
Paul Jensen [Tue, 14 Jun 2016 11:05:31 +0000 (11:05 +0000)]
Merge "Show sign-in to network notification to all users, not just owner." into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 14 Jun 2016 06:26:51 +0000 (23:26 -0700)]
Import translations. DO NOT MERGE

Change-Id: I4aafe42447a82d42a1b3c013f046a4a264dafcc4
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 14 Jun 2016 05:58:21 +0000 (22:58 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ied2403cbd3d46b70771f137bd4b5aab6fb7150b5
Auto-generated-cl: translation import

8 years agoMerge \"Make CotentResolver#openInputStream handle errors from reliable pipes.\"...
Tomasz Mikolajewski [Tue, 14 Jun 2016 04:24:44 +0000 (04:24 +0000)]
Merge \"Make CotentResolver#openInputStream handle errors from reliable pipes.\" into nyc-dev
am: ac3fe8fffe

Change-Id: Ia2caacf5d322b807d29f51bde10b7866023b5de1

8 years agoMerge "Make CotentResolver#openInputStream handle errors from reliable pipes." into...
Tomasz Mikolajewski [Tue, 14 Jun 2016 04:15:25 +0000 (04:15 +0000)]
Merge "Make CotentResolver#openInputStream handle errors from reliable pipes." into nyc-dev

8 years agoImprove action bar transition
Adrian Roos [Mon, 13 Jun 2016 21:54:39 +0000 (14:54 -0700)]
Improve action bar transition

Improves the transition of the action bar between
the collapsed and expanded states.

Bug: 28935363
Change-Id: I89efe95aa045d04bab4208a001f82cb69b38fce5

8 years agoMerge \"docs: Expanded description of \"Key Attestation\" N Preview feature.\" into...
Kevin Hufnagle [Tue, 14 Jun 2016 03:04:40 +0000 (03:04 +0000)]
Merge \"docs: Expanded description of \"Key Attestation\" N Preview feature.\" into nyc-dev
am: f6250cc7df

Change-Id: Iaa6ddf4ca95d0780c5b5d306680d56126ac6c0b5

8 years agoMerge "docs: Expanded description of "Key Attestation" N Preview feature." into nyc-dev
Kevin Hufnagle [Tue, 14 Jun 2016 02:53:29 +0000 (02:53 +0000)]
Merge "docs: Expanded description of "Key Attestation" N Preview feature." into nyc-dev

8 years agoDocs: Changed a command in Keyboard Shortcuts
Hemal Patel [Wed, 8 Jun 2016 01:22:21 +0000 (18:22 -0700)]
Docs: Changed a command in Keyboard Shortcuts

In the Keyboard Shortcuts Helper section, changed the command to read 'Meta + /' and added information related to Meta key.

Bug: 28240770

Change-Id: Id7317999ea9acb4aa904d440af63b7d02c39184f

8 years agoMerge \"docs: Add Videos section to N Preview landing page\" into nyc-dev
Joe Fernandez [Tue, 14 Jun 2016 01:25:44 +0000 (01:25 +0000)]
Merge \"docs: Add Videos section to N Preview landing page\" into nyc-dev
am: e335ccdc00

Change-Id: I84dd9b79392333bac2dbd1a7ce947c2c044485b2

8 years agoMerge \\\"Fix a spelling error in Supporting Languages page.\\\" into mnc-io-docs...
Aurimas Liutikas [Tue, 14 Jun 2016 01:17:03 +0000 (01:17 +0000)]
Merge \\\"Fix a spelling error in Supporting Languages page.\\\" into mnc-io-docs am: ab239a0c1a am: 5699312627
am: a53fc1f2c0

Change-Id: I7e242b90394992b6f48eb738351f8f016d5e94cb

8 years agoMerge \\\"Swap fill_parent with match_parent in best practices doc.\\\" into mnc...
Aurimas Liutikas [Tue, 14 Jun 2016 01:16:58 +0000 (01:16 +0000)]
Merge \\\"Swap fill_parent with match_parent in best practices doc.\\\" into mnc-io-docs am: df4528fbe8 am: 1729c75f73
am: 8bf5f6c851

Change-Id: I361068cabbea494480fc20e176a5335d653ee1d6

8 years agoMerge \\\"Correct parentActivity example in Activity Element docs.\\\" into mnc-io...
Aurimas Liutikas [Tue, 14 Jun 2016 01:16:53 +0000 (01:16 +0000)]
Merge \\\"Correct parentActivity example in Activity Element docs.\\\" into mnc-io-docs am: 893413e50c am: ce2e9d8716
am: 3f1741a19c

Change-Id: Ib7ecbfec74f43726fdd1c0b935d995c3f57f613d

8 years agoMerge "docs: Add Videos section to N Preview landing page" into nyc-dev
Joe Fernandez [Tue, 14 Jun 2016 01:13:25 +0000 (01:13 +0000)]
Merge "docs: Add Videos section to N Preview landing page" into nyc-dev

8 years agodocs: Add Videos section to N Preview landing page
Joe Fernandez [Mon, 13 Jun 2016 17:11:13 +0000 (10:11 -0700)]
docs: Add Videos section to N Preview landing page

b/29215717

Change-Id: I0bcd995a0a458e7624d1e8a689cb3eb249f9397d

8 years agodocs: Updating N download pages for DP4
Andrew Solovay [Mon, 13 Jun 2016 21:54:01 +0000 (14:54 -0700)]
docs: Updating N download pages for DP4

Verified the checksums against the image files before uploading
them to cloud share. For OTA versions, only the SHA256 checksums were
provided; I verified those checksums against the original image files,
then generated the MD5 and SHA1 checksums myself.

Once all files were staged to cloudshare, I re-downloaded them and
verified them against the checksums I'd added to the preview HTML
page; everything checks out.

See first comment for doc stage location.

bug: 28981896
Change-Id: I10165d402c4f7f07cad267f460b289a7bbf6b858

8 years agoMerge \\"Fix a spelling error in Supporting Languages page.\\" into mnc-io-docs am...
Aurimas Liutikas [Tue, 14 Jun 2016 00:57:28 +0000 (00:57 +0000)]
Merge \\"Fix a spelling error in Supporting Languages page.\\" into mnc-io-docs am: ab239a0c1a
am: 5699312627

Change-Id: I7e7e4777b0475a7c2dd242370a6900cfd4457f90

8 years agoMerge \\"Swap fill_parent with match_parent in best practices doc.\\" into mnc-io...
Aurimas Liutikas [Tue, 14 Jun 2016 00:57:24 +0000 (00:57 +0000)]
Merge \\"Swap fill_parent with match_parent in best practices doc.\\" into mnc-io-docs am: df4528fbe8
am: 1729c75f73

Change-Id: I074f24ee54e2ec7005e31a6528f54068c6e1eb3c

8 years agoMerge \\"Correct parentActivity example in Activity Element docs.\\" into mnc-io...
Aurimas Liutikas [Tue, 14 Jun 2016 00:57:18 +0000 (00:57 +0000)]
Merge \\"Correct parentActivity example in Activity Element docs.\\" into mnc-io-docs am: 893413e50c
am: ce2e9d8716

Change-Id: I90462329a4fbdd264714c653b0df30cbc9f4f866

8 years agoMerge \"Use NoPreloadHolder for certificate sources\" into nyc-dev
Chad Brubaker [Tue, 14 Jun 2016 00:49:25 +0000 (00:49 +0000)]
Merge \"Use NoPreloadHolder for certificate sources\" into nyc-dev
am: c738e48ed6

Change-Id: Iae1170534a10b81778e9e1cd3df8e5fca62f7546

8 years agoMerge \"Fix a spelling error in Supporting Languages page.\" into mnc-io-docs
Aurimas Liutikas [Tue, 14 Jun 2016 00:48:55 +0000 (00:48 +0000)]
Merge \"Fix a spelling error in Supporting Languages page.\" into mnc-io-docs
am: ab239a0c1a

Change-Id: I2de3485349f22c1eae990808c81320c8a995430d

8 years agoMerge \"Swap fill_parent with match_parent in best practices doc.\" into mnc-io-docs
Aurimas Liutikas [Tue, 14 Jun 2016 00:48:50 +0000 (00:48 +0000)]
Merge \"Swap fill_parent with match_parent in best practices doc.\" into mnc-io-docs
am: df4528fbe8

Change-Id: Ie2039cf96c3591b6fc2c0cb8ec1097707edcc76b

8 years agoMerge \"Correct parentActivity example in Activity Element docs.\" into mnc-io-docs
Aurimas Liutikas [Tue, 14 Jun 2016 00:48:43 +0000 (00:48 +0000)]
Merge \"Correct parentActivity example in Activity Element docs.\" into mnc-io-docs
am: 893413e50c

Change-Id: I845619909443f9d56bfc7d9f5284b15c2587c5d6

8 years agoMerge "Use NoPreloadHolder for certificate sources" into nyc-dev
TreeHugger Robot [Tue, 14 Jun 2016 00:35:48 +0000 (00:35 +0000)]
Merge "Use NoPreloadHolder for certificate sources" into nyc-dev

8 years agoMerge "Fix a spelling error in Supporting Languages page." into mnc-io-docs
Aurimas Liutikas [Tue, 14 Jun 2016 00:33:52 +0000 (00:33 +0000)]
Merge "Fix a spelling error in Supporting Languages page." into mnc-io-docs

8 years agoMerge "Swap fill_parent with match_parent in best practices doc." into mnc-io-docs
Aurimas Liutikas [Tue, 14 Jun 2016 00:33:19 +0000 (00:33 +0000)]
Merge "Swap fill_parent with match_parent in best practices doc." into mnc-io-docs

8 years agoFix broken {@docRoot} links
Aurimas Liutikas [Wed, 8 Jun 2016 18:20:03 +0000 (11:20 -0700)]
Fix broken {@docRoot} links

Some {@docRoot} links were followed by a "/" causing links to break.

Bug:
https://code.google.com/p/android/issues/detail?id=174753

Change-Id: Ic5923ee447c55ac2aa95af365ae63425041e4fcf
(cherry picked from commit e0af48d190114afcd0c7a615187fd524aecda512)

8 years agoMerge "Correct parentActivity example in Activity Element docs." into mnc-io-docs
Aurimas Liutikas [Tue, 14 Jun 2016 00:31:46 +0000 (00:31 +0000)]
Merge "Correct parentActivity example in Activity Element docs." into mnc-io-docs

8 years agodocs: Expanded description of "Key Attestation" N Preview feature.
Kevin Hufnagle [Thu, 9 Jun 2016 23:02:31 +0000 (16:02 -0700)]
docs: Expanded description of "Key Attestation" N Preview feature.

The Key Attestation section within the Android N Preview "API
Overview" page now links to a separate page, which contains a
procedure for completing the attestation process, as well as the
certificate schema and its elements' associated descriptions.

Bug: 28851641
Change-Id: If96af7f5e7e6ba9297f48f20c669591b1a9ee9ce

8 years agoUpdate validation-layer.jd for NDK-R12: use packed layer binaries punt building...
ggfan [Mon, 13 Jun 2016 23:30:53 +0000 (23:30 +0000)]
Update validation-layer.jd for NDK-R12:    use packed layer binaries    punt building layers to Khronos github repo am: c1755d345d am: 999b7afac8
am: 3c76d062ae

Change-Id: I0609d3492d42e80ca6456128e7a80f78964463d1

8 years agoUpdate validation-layer.jd for NDK-R12: use packed layer binaries punt building...
ggfan [Mon, 13 Jun 2016 23:21:33 +0000 (23:21 +0000)]
Update validation-layer.jd for NDK-R12:    use packed layer binaries    punt building layers to Khronos github repo am: c1755d345d
am: 999b7afac8

Change-Id: I7f3c8d7c65373570193fe5fde940698c1eb3f3e9

8 years agoMerge \"CtsShim: Support building with tapas\" into nyc-dev
Dan Willemsen [Mon, 13 Jun 2016 23:17:12 +0000 (23:17 +0000)]
Merge \"CtsShim: Support building with tapas\" into nyc-dev
am: c47168d592

Change-Id: I2b444c36225693f0755c1b6854c86c17203a9945

8 years agoUpdate validation-layer.jd for NDK-R12: use packed layer binaries punt building...
ggfan [Mon, 13 Jun 2016 23:12:49 +0000 (23:12 +0000)]
Update validation-layer.jd for NDK-R12:    use packed layer binaries    punt building layers to Khronos github repo
am: c1755d345d

Change-Id: I881cd1e70e422267dbe345be525330f18bae4126

8 years agoMerge \"docs: Noted that N Preview doc is available online as of DP4\" into nyc-dev
Andrew Solovay [Mon, 13 Jun 2016 23:08:39 +0000 (23:08 +0000)]
Merge \"docs: Noted that N Preview doc is available online as of DP4\" into nyc-dev
am: 98d2f591e0

Change-Id: I73b1d551fc865cc54b827bfc62ecb9dc6c95412b

8 years agoMerge "CtsShim: Support building with tapas" into nyc-dev
Dan Willemsen [Mon, 13 Jun 2016 23:07:05 +0000 (23:07 +0000)]
Merge "CtsShim: Support building with tapas" into nyc-dev

8 years agoMerge \"Correclty capitalize Date in status bar panel\" into nyc-dev
Adrian Roos [Mon, 13 Jun 2016 22:56:54 +0000 (22:56 +0000)]
Merge \"Correclty capitalize Date in status bar panel\" into nyc-dev
am: 366f324113

Change-Id: I2ab3815031d483af53e587e0ff97327cd6ae23b4

8 years agoMerge "docs: Noted that N Preview doc is available online as of DP4" into nyc-dev
TreeHugger Robot [Mon, 13 Jun 2016 22:56:09 +0000 (22:56 +0000)]
Merge "docs: Noted that N Preview doc is available online as of DP4" into nyc-dev

8 years agoUpdate validation-layer.jd for NDK-R12:
ggfan [Thu, 9 Jun 2016 19:44:01 +0000 (12:44 -0700)]
Update validation-layer.jd for NDK-R12:
   use packed layer binaries
   punt building layers to Khronos github repo

Change-Id: Icf840de42856d2488a87174b2cd6c604ef8d8770
(cherry picked from commit f22d094a30c9446abe074b82bb84f6daf51e0534)

8 years agoUse NoPreloadHolder for certificate sources
Chad Brubaker [Mon, 13 Jun 2016 22:51:40 +0000 (15:51 -0700)]
Use NoPreloadHolder for certificate sources

The static instances of SystemCertificateSource and
UserCertificateSource depend on the current user, avoid triggering their
static initializer when preloaded.

Bug: 29258379
Change-Id: I5088366ae67145b8bc928d6c04118529c82a7fc3

8 years agoFixed a bug with a legacy notification API
Selim Cinek [Mon, 13 Jun 2016 22:47:03 +0000 (15:47 -0700)]
Fixed a bug with a legacy notification API

When using setLatestEventInfo the icons would not be shown
at all anymore, leading to a crash if they were grouped.
This CL makes sure the smallIcon is always set even for those
legacy apps.
It also fixes the usage of setShow when, as legacy apps wouldn't
have the time anymore.

Change-Id: I2645175b2adabcedbbfec7a502b89d143d2b9bd3
Fixes: 29255365
Fixes: 27430676

8 years agoMerge \"Prevent crash from null ApplicationInfo after package is removed.\" into...
Chong Zhang [Mon, 13 Jun 2016 22:43:08 +0000 (22:43 +0000)]
Merge \"Prevent crash from null ApplicationInfo after package is removed.\" into nyc-dev
am: 42edc7c2c2

Change-Id: Ieaef2531a5f4c7bd462917d5c6a12b0095938211

8 years agoMerge "Correclty capitalize Date in status bar panel" into nyc-dev
Adrian Roos [Mon, 13 Jun 2016 22:39:50 +0000 (22:39 +0000)]
Merge "Correclty capitalize Date in status bar panel" into nyc-dev

8 years agoFix jittery action bar during transitions
Adrian Roos [Fri, 3 Jun 2016 20:33:43 +0000 (13:33 -0700)]
Fix jittery action bar during transitions

Fixes a bug where the action bar would get cut off slightly
resulting in a bad transition when transforming between action
bars that were correct and those that were cut off.

Fixes: 28935363
Change-Id: I7d8eeb5e5fa545820a8979ea09816b330bdb384b

8 years agoMake RemoteView margins density-change safe
Adrian Roos [Thu, 9 Jun 2016 00:11:53 +0000 (17:11 -0700)]
Make RemoteView margins density-change safe

Bug: 28935363
Change-Id: I279da8da84f794c512a66cb46c76ae9e746a6387

8 years agoMerge \"Don\'t update task to return to type for last task over home\" into nyc-dev
Andrii Kulian [Mon, 13 Jun 2016 22:20:10 +0000 (22:20 +0000)]
Merge \"Don\'t update task to return to type for last task over home\" into nyc-dev
am: 62b08eb5f2

Change-Id: Ibf43a0588feb20e94cc8aaec1193e06e5b3426b4

8 years agoMerge \"Add MessagingStyle transitions\" into nyc-dev
Adrian Roos [Mon, 13 Jun 2016 22:20:05 +0000 (22:20 +0000)]
Merge \"Add MessagingStyle transitions\" into nyc-dev
am: a5e2aa99c0

Change-Id: I96170c3811dd624969a1f93bb7a2dc65b8d5df0a

8 years agoMerge \\\"docs: Corrected method name in multi-window docs\\\" into mnc-io-docs am...
Andrew Solovay [Mon, 13 Jun 2016 22:19:57 +0000 (22:19 +0000)]
Merge \\\"docs: Corrected method name in multi-window docs\\\" into mnc-io-docs am: 0e68b6b5fc am: 2c0261224a
am: 2cb6ca1892

Change-Id: Ie01897c2a111084dd1cb6162c70abd44852f307a

8 years agoMerge \"Push DO/PO package names from DPMS to PM\" into nyc-dev
Makoto Onuki [Mon, 13 Jun 2016 22:17:10 +0000 (22:17 +0000)]
Merge \"Push DO/PO package names from DPMS to PM\" into nyc-dev
am: f419bd9e03

Change-Id: I27dec65477ddfa90060baeea26169ea79503f642

8 years agoMerge \"Make sure we don\'t accidentally allow the night mode tile\" into nyc-dev
Jason Monk [Mon, 13 Jun 2016 22:17:07 +0000 (22:17 +0000)]
Merge \"Make sure we don\'t accidentally allow the night mode tile\" into nyc-dev
am: 126366dde5

Change-Id: Iba8b3696738f9fc0260311d49d6e98dfcedbc118

8 years agoMerge \"Ensuring we don\'t try and dismiss task views that are already removed.\...
Winson [Mon, 13 Jun 2016 22:17:04 +0000 (22:17 +0000)]
Merge \"Ensuring we don\'t try and dismiss task views that are already removed.\" into nyc-dev
am: c169a9d8a1

Change-Id: I16e8679a30285ca9c1472022348861b759e1aed7

8 years agoDocs: Fixed one of the addListener() links am: 33a1ea297d am: ba86350c63
Bert McMeen [Mon, 13 Jun 2016 22:17:00 +0000 (22:17 +0000)]
Docs: Fixed one of the addListener() links am: 33a1ea297d am: ba86350c63
am: 51487f06f9

Change-Id: I4c0c094dda9ce0313c10c78438252e6174c48bc8

8 years agoMerge \"Fix setCurrentPlayTime for started but not yet pulsed animations\" into nyc-dev
Doris Liu [Mon, 13 Jun 2016 22:16:57 +0000 (22:16 +0000)]
Merge \"Fix setCurrentPlayTime for started but not yet pulsed animations\" into nyc-dev
am: 42d39300cf

Change-Id: Ia7bf744345494bbd13a742f33cb63acbe0ab3315