automerge: a912fedb

* commit 'a912fedb':
  Do not paint shadow if outside of the clip area

automerge: 4e474160

* commit '4e474160':
  Changes made by intelliJ 14.1

Prevents color view from showing up on phones when
the orientation changes to landscape. Previously, the
animation was only prevented when the stable inset of a
bar became nonzero; now we disable animations whenever
the nonzeroness changes.

Bug: 19353466
Change-Id: I31b4103fe984d158a98cd446ac2ddbe15a408e49

* commit '98c3461a':
  Do not paint shadow if outside of the clip area

* commit '12c9e498':
  Changes made by intelliJ 14.1

Change-Id: Ia3c84284843a415cdbbc2b6a9b06d9ddffbe0e04

am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
automerge: fe2c687b

* commit 'fe2c687b':
  docs: Update device art generator to include Wear generic devices.

am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
automerge: e0306bbe

* commit 'e0306bbe':
  docs: Fix issue with onCreate() method declaration in file backup section

am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs
automerge: 946bf2de

* commit '946bf2de':
  docs: Fix notification api guide issues (7461154, 12765600)

Bug: 19359916
Change-Id: I22204c50ac918b9be97b5d43efa73c7e87444cea

am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs

* commit '2ea209ab':
  docs: Update device art generator to include Wear generic devices.

am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs

* commit '8d0df9b8':
  docs: Update device art generator to include Wear generic devices.

In addition to relying on change callbacks.

Bug: 19288429
Change-Id: Id54473e5fbb4eac3778781a2052ba0103076f8d1

am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs

* commit 'e726495a':
  docs: Fix issue with onCreate() method declaration in file backup section

am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs

* commit 'b6de0316':
  docs: Fix notification api guide issues (7461154, 12765600)

am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs

* commit 'fe5e7e92':
  docs: Fix issue with onCreate() method declaration in file backup section

* commit 'e1f90b4e':
  docs: Fix notification api guide issues (7461154, 12765600)

Bug: 19363651
Change-Id: Ia0da3ddad587ea842aad19818a62540889d6a9dd

The root view of the new uber statusbar should not be focusable.

Based on history, it looks like this was an oversight when this view
was refactored.

Fixes bug 19296202

Change-Id: Ib7f6908c30ab37384aa50f4fa4198c15593a96a4

Bug: 19352840
Change-Id: Ib668bee0fb2c6f5bcd01a7908ebd20b9ec8a40ef

The GL layer gets exclusive use of the direct producer dimensions;
we should only set the user dimensions.

Bug: 16404608
Change-Id: Ie5b720104bdbee6b096b62520baa1c6b518c6c1c

Bug 19350604

Change-Id: I94f5162c31f9c8853908d7c4699974c236cc7fe7

bug: 3180881
Change-Id: I9616ec0d559bfbce669c5afc5b1742f6f5271fa5

bug: 14617426
Change-Id: I1f693a908c6e8c8cf8cf612fefd8553754978639

Clearly document which methods in Vpn.java are designed to be used to
service a Binder call, and which must therefore check permissions and
clear the calling identity, and which methods are designed for
internal use only and which therefore need not check permission.

Add a new startLegacyVpnPrivileged method which bypasses the
permission checks, to be used by lockdown VPN which is a trusted
system service. Ensure that the existing startLegacyVpn method checks
permissions as this is used whenever we respond to a binder call.

Bug: 19311172
Change-Id: I34f13258ee7481f1356bc523124cf5db068b4972