Commit Graph

256895 Commits

Author SHA1 Message Date
Selim Cinek
a6a27fb71f Merge "Fixed a bug with auto cancelling" into nyc-dev
am: a35d9b3ee0

* commit 'a35d9b3ee055d591249a30c58285fe2be5a45c43':
  Fixed a bug with auto cancelling

Change-Id: Id6e2850c96274a406ea52095516bfbe39dd2d2c8
2016-05-17 22:21:36 +00:00
Selim Cinek
d61b5b655e Merge "Fixed a bug with auto cancelling" into nyc-dev
am: a35d9b3ee0

* commit 'a35d9b3ee055d591249a30c58285fe2be5a45c43':
  Fixed a bug with auto cancelling

Change-Id: I46be6f420c4ad89ffc7cd88f621aed173ba130d1
2016-05-17 22:21:32 +00:00
Jim Miller
d79eaa220c Merge "Don\'t always announce accessibility events when resetting password" into nyc-dev
am: 2d1c424a0e

* commit '2d1c424a0ee8e210c1cd3f71b78d5a11e94f4ff3':
  Don't always announce accessibility events when resetting password

Change-Id: I7e1e2b8982708490b9ff467f6dfc129b11269259
2016-05-17 22:21:30 +00:00
Dianne Hackborn
a648b098f8 Merge "Work on issue #28689719: Runtime restart" into nyc-dev am: 77ad5f1657
am: ab82de14b1

* commit 'ab82de14b1c6bdf44fa2cac96c37620f0f2319f0':
  Work on issue #28689719: Runtime restart

Change-Id: I9dc025c78a1d58cf46b73141063dda0c9632d502
2016-05-17 22:21:24 +00:00
Jim Miller
9e507bd737 Merge "Don\'t always announce accessibility events when resetting password" into nyc-dev
am: 2d1c424a0e

* commit '2d1c424a0ee8e210c1cd3f71b78d5a11e94f4ff3':
  Don't always announce accessibility events when resetting password

Change-Id: I8ff47b7b9c340fbf5ef4dfde619a80264ca9c170
2016-05-17 22:21:24 +00:00
Andrew Solovay
33d83dbd6c Merge "docs: Creating new support library revision history page" into mnc-mr-docs
am: e780c62462

* commit 'e780c6246202ea42c8de159e5b473a897faeb6bb':
  docs: Creating new support library revision history page

Change-Id: I249c9a9c889cdf273fd995860f3b0129aa9e12ce
2016-05-17 22:21:23 +00:00
smain@google.com
bf4296e500 invert the quotes for links in the JSON to avoid breakage from devsite\'s URL parser (or whatever). bug: 28801246
am: 28445c4d7d

* commit '28445c4d7d46a14e8cc2654c4912019327cbe471':
  invert the quotes for links in the JSON to avoid breakage from devsite's URL parser (or whatever). bug: 28801246

Change-Id: I243768d45ff5ac5eb11140ac8f8d770335be3d70
2016-05-17 22:21:19 +00:00
Ruben Brunk
c30c8fd29c Dismiss immersive mode overlay while in VR mode.
Bug: 28052143
Change-Id: I750753c72cb8d41bf91c108e8fc645750fbf9c45
2016-05-17 15:15:28 -07:00
TreeHugger Robot
e780c62462 Merge "docs: Creating new support library revision history page" into mnc-mr-docs 2016-05-17 22:13:08 +00:00
Chong Zhang
b8da4a7fa8 Use focused app's stack for IME adjustment
Don't use mInputMethodTarget as it could be set to some system alert
window that has both FLAG_NOT_FOCUSABLE and FLAG_ALT_FOCUSABLE_IM,
and it's not actually taking inputs.

bug: 28328085
Change-Id: I38263f64fec13a5e10357499ebc97671389ba69a
2016-05-17 15:08:44 -07:00
Dianne Hackborn
ebfbc39537 Merge "Work on issue #28689719: Runtime restart" into nyc-dev
am: 77ad5f1657

* commit '77ad5f1657a8bef6b28f69f9bd8a2d1978c88a57':
  Work on issue #28689719: Runtime restart

Change-Id: I29e0ef82bed0df030939b198d5a238405dc7486a
2016-05-17 22:07:01 +00:00
Dianne Hackborn
ab82de14b1 Merge "Work on issue #28689719: Runtime restart" into nyc-dev
am: 77ad5f1657

* commit '77ad5f1657a8bef6b28f69f9bd8a2d1978c88a57':
  Work on issue #28689719: Runtime restart

Change-Id: Ic44a4f56be67e3a50932d6bfbb58cdca6536e501
2016-05-17 22:06:57 +00:00
Selim Cinek
ce80acd73a Merge "Fixed a screen flickering on tablets" into nyc-dev 2016-05-17 22:05:54 +00:00
Selim Cinek
a35d9b3ee0 Merge "Fixed a bug with auto cancelling" into nyc-dev 2016-05-17 22:05:39 +00:00
sreevanis
a214c7c269 Notification changes for Wear 2.0 and Release notes.
Bug:28472076
Change-Id: Ie5231c6a4d3c243249c8345b94186af67ff21a06
2016-05-17 15:04:37 -07:00
Jim Miller
2d1c424a0e Merge "Don't always announce accessibility events when resetting password" into nyc-dev 2016-05-17 22:00:37 +00:00
Dianne Hackborn
77ad5f1657 Merge "Work on issue #28689719: Runtime restart" into nyc-dev 2016-05-17 21:58:21 +00:00
Android Build Merger (Role)
349ca27ce3 Merge "Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev am: c4e8471ba4 am: 613dc4cc1d" into nyc-mr1-dev-plus-aosp 2016-05-17 21:45:58 +00:00
Wei Jia
68e1651912 Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev am: c4e8471ba4
am: 613dc4cc1d

* commit '613dc4cc1d902aa9f4ac5a0db375c6e9972ec256':
  android_media_MediaSync: Do not pass NULL to AString ctor.

Change-Id: I412def216bdb52238b560b0e575ff629473cc0a6
2016-05-17 21:45:27 +00:00
Wei Jia
68e8d86b02 Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev am: c4e8471ba4
am: 8a53cc9e26

* commit '8a53cc9e267d88f013402ea246ca507c494ccea4':
  android_media_MediaSync: Do not pass NULL to AString ctor.

Change-Id: If80c04ca3a7a61ee774e0353eb69d1017a31ffdc
2016-05-17 21:44:49 +00:00
Wei Jia
8a53cc9e26 Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev
am: c4e8471ba4

* commit 'c4e8471ba4afb0d2cae0d9e29f5c14b4bbfe4524':
  android_media_MediaSync: Do not pass NULL to AString ctor.

Change-Id: I1b883f4fe46ebb150841f5a75517a8340597edba
2016-05-17 21:39:05 +00:00
Wei Jia
613dc4cc1d Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev
am: c4e8471ba4

* commit 'c4e8471ba4afb0d2cae0d9e29f5c14b4bbfe4524':
  android_media_MediaSync: Do not pass NULL to AString ctor.

Change-Id: Id138df3cfe1ee989d4abf52ae283b63419e7047a
2016-05-17 21:39:01 +00:00
Philip P. Moltmann
f1413249db Handle printers selected by SelectPrinter activity
- Declare a printers availability when changing the removed state.
- Set printJob.printerId to current printer when returning from
  SelectPrinter

Change-Id: Ie4680be04fa614a4088f2f32a527e80928c957cc
Fixes: 27643305
2016-05-17 14:26:13 -07:00
sreevanis
fb4206387d API Overview page for Wear 2.0 preview.
Bug:28714669
Change-Id: Icc76b610f329d6c24046bf654e2895f123af9cc6
2016-05-17 14:25:19 -07:00
Android Build Merger (Role)
4fa6801180 Merge "Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700 am: d91b14d862" into nyc-mr1-dev-plus-aosp 2016-05-17 21:23:36 +00:00
Adrian Roos
5db7ac8086 Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700
am: d91b14d862

* commit 'd91b14d862568233d3467bb91497a3aabeecab29':
  Fix broken MessagingStyle

Change-Id: If3cd26444ee728e5b71eb3921aaa983591d0d8a1
2016-05-17 21:23:10 +00:00
Adrian Roos
31459c3202 Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700
am: efc9c88d00

* commit 'efc9c88d002263f748716405f7e63becc3685211':
  Fix broken MessagingStyle

Change-Id: Ia328b569b347cb29ddc82b5fcce3efee6bfc7734
2016-05-17 21:22:39 +00:00
Hangyu Kuang
1e7d1aa6a6 Hide HdrCapabilities constructor.
Bug:25684127
Change-Id: I1a30ab3c162d8891c8aea1447757c85942033a0d
2016-05-17 14:21:01 -07:00
Wei Jia
c4e8471ba4 Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev 2016-05-17 21:17:37 +00:00
Adrian Roos
efc9c88d00 Merge "Fix broken MessagingStyle" into nyc-dev
am: 8802fd0700

* commit '8802fd0700e40ce97555f70db1b02daeece3bfb5':
  Fix broken MessagingStyle

Change-Id: I31975da4749c801a8fbf3bfffb666daa69c9c2af
2016-05-17 21:17:33 +00:00
Adrian Roos
d91b14d862 Merge "Fix broken MessagingStyle" into nyc-dev
am: 8802fd0700

* commit '8802fd0700e40ce97555f70db1b02daeece3bfb5':
  Fix broken MessagingStyle

Change-Id: I611823cbd36336828f6ee1b57a6cef3908d8ef6f
2016-05-17 21:17:10 +00:00
Roshan Pius
684591116f Adjust wifi idle times to fit in system time period
The battery stats time period calculation is done using a
different clock source compared to the wifi chip's on time calculation. So,
account for skews between the two by adjusting the idle time reported by
wifi chip to fit into the system time calculation.

BUG: 28628799
Change-Id: I3110c53317f3246e26fdc3731f7be0a3d9c8e229
TEST: Compiles & manual verification
2016-05-17 14:11:22 -07:00
Adrian Roos
8802fd0700 Merge "Fix broken MessagingStyle" into nyc-dev 2016-05-17 21:02:25 +00:00
Dianne Hackborn
4cb96ca45f Fix issue #28817455: [NYC] [BullHead] Fatal Exception in CNEService
Deadlock between DeviceIdleController and NetworkPolicyManagerService
because DeviceIdleController was calling out to ConnectivityService
with its lock held.

Change-Id: I21195c2dfd5f50d0264e5e32819f8fc1f35a23a9
2016-05-17 13:57:02 -07:00
Andrii Kulian
5c96320e40 DO NOT MERGE Hide decor caption APIs
Hiding the APIs for now since we're not releasing freeform yet and it's
better not to expose them now in case we'll decide to change them later.

Bug: 28774476
Change-Id: Ic2de33c5a611a515fc1c72535587ebf2e0a03a7f
2016-05-17 20:56:24 +00:00
Andrew Solovay
09e9d24bcf docs: Creating new support library revision history page
Previously, the support library revision history had been on
index.html, along with the overview. Pulling the history out onto
its own page. (There doesn't seem to be a way to set up a redirect--
redirects from /foo.html#bar to /bar.html don't seem to be honored.)

bug: 28721552
Change-Id: I26b8aead4161f1555cead02a4c61cc1b45ca1dbe
2016-05-17 13:51:43 -07:00
Dianne Hackborn
2675616719 Work on issue #28689719: Runtime restart
There are few paths I can see to get a null intent down into
the framework at this point.  Add in some checks and reports
at those places to mitigate and report such problems.

Change-Id: If235bf342558321d3fabe9363fcebb2bcea18df1
2016-05-17 13:40:44 -07:00
Toni Barzic
e97f923c18 Handle PhoneStatusBarPolicy user switch callbacks on main thread
Said callbacks poke around StatusBarIconController, which lives on
main thread and is not thread safe.

BUG=27047911
Bug:28613935

Change-Id: I880d79a237b03c06d72b5dff3db24bd60c7b8839
(cherry picked from commit 4f65092f5c95b89f48a48a916467b78d2a07ff89)
2016-05-17 20:32:37 +00:00
John Reck
7c9f2b8aa2 DO NOT MERGE Cherry pick libpng usage fixes
------------------------------------------

This is a combination of 2 commits.
The first commit's message is:

Forward compatibility fixes

Change-Id: Iaf387a10c387e5e157bb16d120a1e033b3d1a6e8

-------------------------------------------

This is the 2nd commit message:

libpng usage tweaks

 Bug: 10447005

 Call png_set_interlace_handling explicitly instead of relying on
 implicit handling that logs warnings

 Include filename when printing warnings

Change-Id: Ia343427f5522dc8ab1010f8d7017e86f389caf99

-------------------------------------------
BUG:23265085
2016-05-17 20:29:52 +00:00
Sudheer Shanka
93f8fd714a Update RestrictedLockUtils to use UM.getUserRestrictionSource.
Bug: 28269827
Change-Id: Ib4a1441b71986ca6637a9236136b60e18dbc1643
2016-05-17 13:27:27 -07:00
Vineeta Srivastava
14fd0ca669 Merge "wifi calling emergency address carrier config" into nyc-mr1-dev
am: db41be8ef4

* commit 'db41be8ef4c1c3364eaf3b552f0037f80cd0fe0f':
  wifi calling emergency address carrier config

Change-Id: I5d1ff70da4e92637e77d144eba70009a12ced185
2016-05-17 20:26:41 +00:00
Vineeta Srivastava
db41be8ef4 Merge "wifi calling emergency address carrier config" into nyc-mr1-dev 2016-05-17 20:18:03 +00:00
Julia Reynolds
df0268f03e Merge "Title is a CharSequence." into nyc-dev am: 94789b4ddf
am: eac3096666

* commit 'eac30966669a09dd431a34c574c257f14b88b802':

Change-Id: Ic47ad5e85ee9ee8751335f9ec68b5e3abb9f9b62
2016-05-17 20:03:45 +00:00
Andrii Kulian
f66a83db41 Rename minWidth/Height attributes
Rename WindowLayout#minimalWidth and #minimalHeight to #minWidth
and #minHeight to be consistent with other APIs.

Bug: 28775586
Change-Id: Ib7dc26318c4391693ef23f908b4d6090138dd0d7
2016-05-17 13:00:53 -07:00
Julia Reynolds
073ebc776c Merge "Title is a CharSequence." into nyc-dev am: 94789b4ddf
am: 6003616501

* commit '6003616501688d8ed0ac10e75a017349c86dd375':
  Title is a CharSequence.

Change-Id: I921be25c7bb076966bf8d5c1c940c99f47272871
2016-05-17 19:59:41 +00:00
Julia Reynolds
eac3096666 Merge "Title is a CharSequence." into nyc-dev
am: 94789b4ddf

* commit '94789b4ddff239760adf91896bd6ea86b62d0137':
  Title is a CharSequence.

Change-Id: I62839dc7fd216454bd8b43b9905a241bed31948b
2016-05-17 19:55:49 +00:00
Julia Reynolds
6003616501 Merge "Title is a CharSequence." into nyc-dev
am: 94789b4ddf

* commit '94789b4ddff239760adf91896bd6ea86b62d0137':
  Title is a CharSequence.

Change-Id: I7eedd41ca91201469ad2d8a9ad16e69843d7b8d6
2016-05-17 19:55:33 +00:00
Julia Reynolds
94789b4ddf Merge "Title is a CharSequence." into nyc-dev 2016-05-17 19:48:33 +00:00
Andrii Kulian
3bc57882c8 Update docs for minWidth/minHeight attributes
Rename WindowLayout#minimalWidth and #minimalHeight to #minWidth
and #minHeight to be consistent with other APIs.

Bug: 28775586
Change-Id: I6064db6aa41a32118619b69c7db07a612f5597ac
2016-05-17 12:36:22 -07:00
Julia Reynolds
7f9ce782a0 Title is a CharSequence.
Change-Id: Ib464d422ca1cf6d7c0547a02847ecb7085682ae9
Fixes: 28680336
2016-05-17 15:34:34 -04:00