Commit Graph

60562 Commits

Author SHA1 Message Date
Jim Miller
e3a46d8e81 Merge "Add fingerprint navigation to enable pulling down the statusbar" into nyc-mr1-dev am: 0991ba5b01
am: a6ae8004c5

* commit 'a6ae8004c501f998818dc4af727b81dcc20de3f9':
  Add fingerprint navigation to enable pulling down the statusbar

Change-Id: Ie28b7098c298daeabd35af3c0bfb6b88976ddc7a
2016-05-18 03:35:41 +00:00
Jim Miller
a6ae8004c5 Merge "Add fingerprint navigation to enable pulling down the statusbar" into nyc-mr1-dev
am: 0991ba5b01

* commit '0991ba5b01da4560116bebaa92e30fc97e7f2879':
  Add fingerprint navigation to enable pulling down the statusbar

Change-Id: I52de480ef1a1efc335b215fdf21d9d29c05aa951
2016-05-18 03:19:58 +00:00
Jim Miller
0991ba5b01 Merge "Add fingerprint navigation to enable pulling down the statusbar" into nyc-mr1-dev 2016-05-18 02:55:10 +00:00
Yohei Yukawa
af15c8bcae Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13 am: ddaf3f4681
am: bf4c8f730b

* commit 'bf4c8f730b167e5ee65ed7c59dfa1d7867b63fcc':
  Move LocaleList to avoid layering violation.

Change-Id: I78fee5269f7428e34b196573575784fc15cb1372
2016-05-18 02:25:10 +00:00
Yohei Yukawa
bf4c8f730b Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13
am: ddaf3f4681

* commit 'ddaf3f468195e5aa47617317c08e9e2c35bcfeee':
  Move LocaleList to avoid layering violation.

Change-Id: I7dbe5c3d552a7350ab61c929f431e2a3cffdee5b
2016-05-18 02:22:07 +00:00
Yohei Yukawa
ddaf3f4681 Merge "Move LocaleList to avoid layering violation." into nyc-dev
am: 31884efd13

* commit '31884efd13b3ac60078edaa0b7e8a4b75d995538':
  Move LocaleList to avoid layering violation.

Change-Id: I9132fe456a8d79569c651dac0a0bce0153444767
2016-05-18 02:18:38 +00:00
Yohei Yukawa
13fa6b7c48 Merge "Move LocaleList to avoid layering violation." into nyc-dev
am: 31884efd13

* commit '31884efd13b3ac60078edaa0b7e8a4b75d995538':
  Move LocaleList to avoid layering violation.

Change-Id: I45e9b7e834d2c5e515eb6c60885296358e7d786e
2016-05-18 02:18:29 +00:00
Yohei Yukawa
31884efd13 Merge "Move LocaleList to avoid layering violation." into nyc-dev 2016-05-18 02:14:26 +00:00
Jim Miller
f4c0a13170 Add fingerprint navigation to enable pulling down the statusbar
Change-Id: If0584358fd615ebd9df11614c662f4f287abf5c4
2016-05-17 18:11:52 -07:00
Chris Craik
661e4cb059 Merge "Document that SurfaceView is synchronous in N" into nyc-dev am: 0cfbb7643e am: 77f706980e
am: 44f88692b7

* commit '44f88692b7054be6eb3dfeed5bf428c8c36ece5f':
  Document that SurfaceView is synchronous in N

Change-Id: I62d5f1eed6441b99edb5054e8d6ee3858663bc38
2016-05-18 01:05:01 +00:00
Chris Craik
44f88692b7 Merge "Document that SurfaceView is synchronous in N" into nyc-dev am: 0cfbb7643e
am: 77f706980e

* commit '77f706980ed2dff9bfb916382be26204b589b96e':
  Document that SurfaceView is synchronous in N

Change-Id: I357c8be635a5e78f42997bfc4c96509729504c35
2016-05-18 01:00:53 +00:00
Andrii Kulian
5417ca597a Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev am: 47aa3f61ac
am: 06a325c3e3

* commit '06a325c3e3b1925c2208892f13570f08e180b12c':
  DO NOT MERGE Hide decor caption APIs

Change-Id: I6eb614317b520e5a902dbc7533f3f08b68ed4861
2016-05-18 01:00:50 +00:00
Joe Onorato
160d5c57cf Merge changes If51568c3,Idd434c19 into nyc-dev am: 45165c9373 am: 6b10cec210
am: 269f64079b

* commit '269f64079b34eb178a33dba306d610c8dfb322c4':
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from

Change-Id: I9d6419d9c587eaca1577cef82a1ec054a6bb3d6c
2016-05-18 00:55:42 +00:00
Hangyu Kuang
47389bce2c Merge "Hide HdrCapabilities constructor." into nyc-dev am: c189934573 am: 993f685045
am: c936ef8af2

* commit 'c936ef8af23ae78e0f50a71c566f4d0fa1b56ea8':
  Hide HdrCapabilities constructor.

Change-Id: I168da49d4044cca71ae423813044682c17e692f7
2016-05-18 00:55:35 +00:00
Chris Craik
77f706980e Merge "Document that SurfaceView is synchronous in N" into nyc-dev
am: 0cfbb7643e

* commit '0cfbb7643ef81cc8d1fd72bfe7c651d0e5e04949':
  Document that SurfaceView is synchronous in N

Change-Id: I508585ec749b0a5d4e241757d655349b09b31566
2016-05-18 00:55:17 +00:00
Chris Craik
1edc049919 Merge "Document that SurfaceView is synchronous in N" into nyc-dev
am: 0cfbb7643e

* commit '0cfbb7643ef81cc8d1fd72bfe7c651d0e5e04949':
  Document that SurfaceView is synchronous in N

Change-Id: I1e4a36d64be663103c3150c86a75e2baa51fa4c4
2016-05-18 00:55:16 +00:00
Andrii Kulian
06a325c3e3 Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev
am: 47aa3f61ac

* commit '47aa3f61ac26195e11d7244c84bce3a1ea2dfb3f':
  DO NOT MERGE Hide decor caption APIs

Change-Id: I7654435d1b251d1349125beb0b5d4a35c81855b1
2016-05-18 00:55:12 +00:00
Andrii Kulian
88a2a7be72 Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev
am: 47aa3f61ac

* commit '47aa3f61ac26195e11d7244c84bce3a1ea2dfb3f':
  DO NOT MERGE Hide decor caption APIs

Change-Id: I588355b4e5ac95e4f872bf06d77fd3d3346cddac
2016-05-18 00:55:12 +00:00
Joe Onorato
269f64079b Merge changes If51568c3,Idd434c19 into nyc-dev am: 45165c9373
am: 6b10cec210

* commit '6b10cec2108746e15388125fdd6fa0cbfd6cb28d':
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from

Change-Id: Ifc94199cc5ad69af73871cc012aa2dac31b6f67b
2016-05-18 00:52:32 +00:00
Joe Onorato
6f04fef272 Merge changes If51568c3,Idd434c19 into nyc-dev
am: 45165c9373

* commit '45165c9373f1bf2dbe0c3f11b271daa24414ea35':
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from

Change-Id: Ibb36bb8d2c32c0fa8ec85eb093b8281f349158fb
2016-05-18 00:52:11 +00:00
TreeHugger Robot
0cfbb7643e Merge "Document that SurfaceView is synchronous in N" into nyc-dev 2016-05-18 00:51:57 +00:00
Andrii Kulian
47aa3f61ac Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev 2016-05-18 00:51:17 +00:00
Joe Onorato
6b10cec210 Merge changes If51568c3,Idd434c19 into nyc-dev
am: 45165c9373

* commit '45165c9373f1bf2dbe0c3f11b271daa24414ea35':
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from

Change-Id: Id56c7ee80254eac26132956ef62b83c405a0e2f8
2016-05-18 00:49:54 +00:00
Hangyu Kuang
c936ef8af2 Merge "Hide HdrCapabilities constructor." into nyc-dev am: c189934573
am: 993f685045

* commit '993f68504528cffd32b5ab06998ba4bd43c3203b':
  Hide HdrCapabilities constructor.

Change-Id: I19746caa1081f6e37b8c055b1c571618ec38b93b
2016-05-18 00:49:39 +00:00
TreeHugger Robot
45165c9373 Merge changes If51568c3,Idd434c19 into nyc-dev
* changes:
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from
2016-05-18 00:46:47 +00:00
Hangyu Kuang
993f685045 Merge "Hide HdrCapabilities constructor." into nyc-dev
am: c189934573

* commit 'c1899345730ab3c4504cb314b371b4fa43ca0702':
  Hide HdrCapabilities constructor.

Change-Id: Id3e15f6d3f26634dc632caa8f775071516436cd5
2016-05-18 00:46:35 +00:00
Hangyu Kuang
8f3e14bc92 Merge "Hide HdrCapabilities constructor." into nyc-dev
am: c189934573

* commit 'c1899345730ab3c4504cb314b371b4fa43ca0702':
  Hide HdrCapabilities constructor.

Change-Id: I55e8a10631507c6022a68467401f66ca70cfa0be
2016-05-18 00:46:31 +00:00
Hangyu Kuang
c189934573 Merge "Hide HdrCapabilities constructor." into nyc-dev 2016-05-18 00:42:55 +00:00
Adrian Roos
d7c7d1466a Merge "Adjust Notification APIs per API council" into nyc-dev am: 718ba309cf am: 3a0f4f4b64
am: 16e54ef2ff

* commit '16e54ef2ffb49fe090a8059bce6494e9fba2d4fb':
  Adjust Notification APIs per API council

Change-Id: Iad10ffc7346eb3b2d3d8f9b8478f2e67bc6c641c
2016-05-18 00:21:12 +00:00
Adrian Roos
16e54ef2ff Merge "Adjust Notification APIs per API council" into nyc-dev am: 718ba309cf
am: 3a0f4f4b64

* commit '3a0f4f4b642087138b59a18612be437376652c92':
  Adjust Notification APIs per API council

Change-Id: I20a1e1a542f48532be1b9d71bb5fb2eb0498b395
2016-05-18 00:17:47 +00:00
Adrian Roos
3a0f4f4b64 Merge "Adjust Notification APIs per API council" into nyc-dev
am: 718ba309cf

* commit '718ba309cfc9bbc3bbf785bbe5dfc1049ce02d20':
  Adjust Notification APIs per API council

Change-Id: I282bb2b6e4718f7b1afb3eb418a8d37deaa457b0
2016-05-18 00:13:14 +00:00
Adrian Roos
6cb72ee2eb Merge "Adjust Notification APIs per API council" into nyc-dev
am: 718ba309cf

* commit '718ba309cfc9bbc3bbf785bbe5dfc1049ce02d20':
  Adjust Notification APIs per API council

Change-Id: Ic85fdd92c691f7b30cd73a9e1a7f147fcf55c3c5
2016-05-18 00:13:07 +00:00
TreeHugger Robot
718ba309cf Merge "Adjust Notification APIs per API council" into nyc-dev 2016-05-18 00:06:30 +00:00
Yohei Yukawa
23cbe85610 Move LocaleList to avoid layering violation.
Since LocaleList needs to depend on android.os.Parcelable, we cannot let
that class belong to "android.util" package, which causes layering
violation.

Bug: 28819696
Change-Id: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
2016-05-17 16:42:58 -07:00
Chris Craik
6ee192f4e9 Document that SurfaceView is synchronous in N
bug:28821062

Change-Id: I1c17949d93de3d1f89c504fc061f7d20dd451a4d
2016-05-17 16:17:25 -07:00
Adrian Roos
96b7e20ba6 Adjust Notification APIs per API council
Also fixes a slight bug where a CharSequence extra
was retrieved as a string.

Change-Id: I8a40ab1934b8a20355c3cd4afd66a4a7b91fb517
Fixes: 28775580
Fixes: 28775582
2016-05-17 15:35:33 -07:00
Dianne Hackborn
9b58317a39 Merge "Work on issue #28689719: Runtime restart" into nyc-dev am: 77ad5f1657 am: ab82de14b1
am: a648b098f8

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

Change-Id: I77448a9fd570fb20b9f7c82c1f420f53afd61bae
2016-05-17 22:32:30 +00:00
Joe Onorato
22cfef381d @hide SystemHealthManager.from
Bug: 28820055
Change-Id: Idd434c196428178e2c66facea36a7e010246611c
2016-05-17 15:29:51 -07: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
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
Dianne Hackborn
77ad5f1657 Merge "Work on issue #28689719: Runtime restart" into nyc-dev 2016-05-17 21:58:21 +00:00
Adrian Roos
e5b0923a02 Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700 am: efc9c88d00
am: 31459c3202

* commit '31459c32028951101a338abf95e48d9143444914':
  Fix broken MessagingStyle

Change-Id: Ibc65e18c45862df50fc651028ce2347af886d7c6
2016-05-17 21:38:31 +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
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
Adrian Roos
8802fd0700 Merge "Fix broken MessagingStyle" into nyc-dev 2016-05-17 21:02:25 +00: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
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