Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,895 Commits 3 Branches 0 Tags
87f3aeeee2a9859cd312c3f1d8a18946cf8f582b
Commit Graph

256895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hemal Patel
593de1ab98 Docs: Fixed a wrong adb command example 
Bug: 28310568

Change-Id: Ie727a7dcbcba23a6fed36ff6b1572096d3cc7832
 2016-05-17 17:51:51 -07: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
Winson
529c8e4cf2 Mark occluded home stack as invisible. 
- The home stack is still visible when a translucent activity (like 
  dialer) is on top, which caused us to use the logic path that just 
  tries to launch the next task.  However, that path does not reload
  the stack state (since the activity stack generally doesn’t change
  while Recents is visible) so it was always launching the already top
  activity.  The new check ensures that we start the activity anew
  as if it was coming from an occluding app.

Bug: 28767764
Change-Id: Iec0fdc0957e5070cec532c5de5cba3454c906a3b
 2016-05-17 17:47:40 -07: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
Jorim Jaggi
22507e99ff Merge "Fix threading problems with drawables" into nyc-dev am: 1e09e9826b 
am: e48384c867

* commit 'e48384c8672f53b00b231a7590f45650f1e3f22e':
  Fix threading problems with drawables

Change-Id: Icad4ab1e6f497ab1c549b2d0bb1720c13f6254c2
 2016-05-18 00:33:59 +00:00
Jorim Jaggi
e48384c867 Merge "Fix threading problems with drawables" into nyc-dev 
am: 1e09e9826b

* commit '1e09e9826b24c6d877920b027954e0e861a336a0':
  Fix threading problems with drawables

Change-Id: I06a58a1a9454f9e9c384b9999ef6077cc45cf46f
 2016-05-18 00:28:48 +00:00
Jorim Jaggi
eae7928b34 Merge "Fix threading problems with drawables" into nyc-dev 
am: 1e09e9826b

* commit '1e09e9826b24c6d877920b027954e0e861a336a0':
  Fix threading problems with drawables

Change-Id: I524eed30e7abb6aaf32cf596a8bb4de6ca52b673
 2016-05-18 00:28:43 +00:00
TreeHugger Robot
1e09e9826b Merge "Fix threading problems with drawables" into nyc-dev 2016-05-18 00:24:04 +00:00
Andrew Solovay
71edb581a2 Merge "docs: Updating N Preview downloads page for DP3" into mnc-io-docs 
am: bd57a67b8f

* commit 'bd57a67b8f806eea57063f7d5d5188d8b318d3a2':
  docs: Updating N Preview downloads page for DP3

Change-Id: Id6aa668761f1c854556d12dc09c22723f81b28f3
 2016-05-18 00:23:37 +00:00
Andrew Solovay
bd57a67b8f Merge "docs: Updating N Preview downloads page for DP3" into mnc-io-docs 2016-05-18 00:18:08 +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
Amith Yamasani
eb437d4dff Retail mode flag and some clients for it 
Bug: 27280140
Change-Id: Ide33e941b9c71eb925b5977d0b0d62198537ca14
 2016-05-18 00:07:36 +00:00
Andrew Solovay
61dbd85a9e resolve merge conflicts of bd96855 to nyc-dev 
Change-Id: Ic07598d00f7ea59f800c260ba448a16df4e397dd
 2016-05-17 17:06:52 -07:00
TreeHugger Robot
718ba309cf Merge "Adjust Notification APIs per API council" into nyc-dev 2016-05-18 00:06:30 +00:00
Dianne Hackborn
a7cb651e8f Merge "Fix issue #28817455: [NYC] [BullHead] Fatal Exception in CNEService" into nyc-dev am: 0fda52b92e 
am: fe061f1bcb

* commit 'fe061f1bcbc0b0ba8880f4cf65d0ea0ce51ef0b5':
  Fix issue #28817455: [NYC] [BullHead] Fatal Exception in CNEService

Change-Id: I71a4ca6d12bb300868021e2971c16b52e8f1275c
 2016-05-18 00:06:30 +00:00
Dianne Hackborn
fe061f1bcb Merge "Fix issue #28817455: [NYC] [BullHead] Fatal Exception in CNEService" into nyc-dev 
am: 0fda52b92e

* commit '0fda52b92ecc8e9eb508c6ce249705be53761277':
  Fix issue #28817455: [NYC] [BullHead] Fatal Exception in CNEService

Change-Id: I86591bd5a343ef4028ee6451b307f2a96a400486
 2016-05-18 00:02:13 +00:00
Dianne Hackborn
3269d29083 Merge "Fix issue #28817455: [NYC] [BullHead] Fatal Exception in CNEService" into nyc-dev 
am: 0fda52b92e

* commit '0fda52b92ecc8e9eb508c6ce249705be53761277':
  Fix issue #28817455: [NYC] [BullHead] Fatal Exception in CNEService

Change-Id: Ib2f03f35260d4475c34ebbcd3ffa4a4986f835b5
 2016-05-18 00:02:06 +00:00
Andrew Solovay
212ad35500 docs: Updating N Preview downloads page for DP3 
Updated downloads and OTA-downloads pages with DP3 binaries.
Tested all downloads and verified the checksums before uploading
the patchset.

See first comment for doc stage location.

bug: 28817699
Change-Id: I03f2560ca0516343d764a3596a0d133ab73f636c
 2016-05-17 17:01:38 -07:00
Wale Ogunwale
7f1ecdd495 Merge "Make Recents activity invisible when it is behind a translucent activity" into nyc-dev am: cbc73decf1 
am: db314a0aa1

* commit 'db314a0aa16e4aaf5bfda8f501821db697e63050':
  Make Recents activity invisible when it is behind a translucent activity

Change-Id: I719527f747c8b1ad2bc3fd81926a1ab39daf062d
 2016-05-17 23:57:44 +00:00
Joe Fernandez
73836a0e20 Merge "docs: Wear 2 Preview - improve visibility and look of pages" into mnc-io-docs 
am: 2b3870cd94

* commit '2b3870cd949d7dbd8d5b6a75b08794c654df00c6':
  docs: work - Update devhub url

Change-Id: I331f94361c3ab22ac277a5dd93b551a6cc617c36
 2016-05-17 23:57:09 +00:00
sreevanis
a590325a98 Merge "Updated documentation for Input Method Framework Wear 2.0" into mnc-io-docs 
am: 2015256ccc

* commit '2015256ccc5b26593441254cdfc695055f840420':
  docs: Wear 2 Preview - improve visibility and look of pages

Change-Id: I2b5e1be660bb53989ce9dc47e0ba576a2d66d471
 2016-05-17 23:57:07 +00:00
Bert McMeen
cb62df2b44 Merge "Docs: Iterating on Wear docs - Bridger API" into mnc-io-docs 
am: 1e2739e635

* commit '1e2739e635f89aac86354f6e5b885138634ffe54':
  Updated documentation for Input Method Framework Wear 2.0

Change-Id: I35029d1eadc0e849382928645faba29f11c3eb5a
 2016-05-17 23:57:04 +00:00
Bert McMeen
f097e00a2a Merge "docs: Iterating on Wear docs - Get Started, Download/Test, Program Overview" into mnc-io-docs 
am: ba803db9a6

* commit 'ba803db9a62a58b1d98a0f889aa094e86fbbf6cd':
  Docs: Iterating on Wear docs - Bridger API

Change-Id: I7b1e36ebe1bcadb4af2dc70c50333cd4d839b55d
 2016-05-17 23:57:00 +00:00
sreevanis
40ee002949 Merge "Updated app pattern documentation." into mnc-io-docs 
am: 5d0f016f4b

* commit '5d0f016f4b6e18214892ee87f4942509764652c8':
  docs: Iterating on Wear docs - Get Started, Download/Test, Program Overview

Change-Id: I5eea8daa157ba5dd94e60bb9bd49593587fe8a0c
 2016-05-17 23:56:57 +00:00
sreevanis
6bfb873c0f Merge "Notification changes for Wear 2.0 and Release notes." into mnc-io-docs 
am: abe5e7e366

* commit 'abe5e7e366873bda0e0119c798e97064fd1b8abc':
  Updated app pattern documentation.

Change-Id: Ib1405a77bfd5f3a068fc2916232c92667a6ab635
 2016-05-17 23:56:52 +00:00
sreevanis
fd249ffc45 Merge "API Overview page for Wear 2.0 preview." into mnc-io-docs 
am: 14981cbe35

* commit '14981cbe35371a8096de6f3c399e29c7167e3ddc':
  Notification changes for Wear 2.0 and Release notes.

Change-Id: Ie9b0e6f86e3d32dbb426ee8bfc1731eaac07de15
 2016-05-17 23:56:45 +00:00
Andrew Solovay
c48a127662 Merge "docs: Creating new support library revision history page" into mnc-mr-docs am: e780c62462 
am: f62ae36a96

* commit 'f62ae36a96351d44cacdbbdbb5e3dc46413b7e49':
  API Overview page for Wear 2.0 preview.

Change-Id: I5d6b935700e5fa977f3245044c74755e8cf9246a
 2016-05-17 23:56:39 +00:00
Dianne Hackborn
0fda52b92e Merge "Fix issue #28817455: [NYC] [BullHead] Fatal Exception in CNEService" into nyc-dev 2016-05-17 23:54:14 +00:00
Wale Ogunwale
db314a0aa1 Merge "Make Recents activity invisible when it is behind a translucent activity" into nyc-dev 
am: cbc73decf1

* commit 'cbc73decf11344ebcf7a35c31585b66e021e38a1':
  Make Recents activity invisible when it is behind a translucent activity

Change-Id: I345069ffbb0f9694b29e4077240d6527d2ec096c
 2016-05-17 23:52:18 +00:00
Wale Ogunwale
9951b883fe Merge "Make Recents activity invisible when it is behind a translucent activity" into nyc-dev 
am: cbc73decf1

* commit 'cbc73decf11344ebcf7a35c31585b66e021e38a1':
  Make Recents activity invisible when it is behind a translucent activity

Change-Id: I15cc347614adde088edd112d302e2ceb09d6ae34
 2016-05-17 23:52:11 +00:00
TreeHugger Robot
cbc73decf1 Merge "Make Recents activity invisible when it is behind a translucent activity" into nyc-dev 2016-05-17 23:46:57 +00:00
Chong Zhang
47e1e14589 Merge "Fix wallpaper cropped too soon when unminimizing dock" into nyc-dev am: daa0d214dd 
am: d73883c7f8

* commit 'd73883c7f83452ea20e07e344ebc5363b57c060d':
  Fix wallpaper cropped too soon when unminimizing dock

Change-Id: Ic78fb852bd40babe1a9548c607f6c01389b11d94
 2016-05-17 23:43:46 +00:00
Ruben Brunk
aef12f4ffd Merge "Dismiss immersive mode overlay while in VR mode." into nyc-dev am: 8ecf66fc83 
am: 2b699f0fe0

* commit '2b699f0fe065ee9d4a7a3c14bebae88c3505ba2f':
  Dismiss immersive mode overlay while in VR mode.

Change-Id: Ib38d654dea478622bfa1cda2e7a58b71c27e5492
 2016-05-17 23:43:38 +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
Android Build Merger (Role)
3d99cd41e6 Merge "Merge "Use focused app\'s stack for IME adjustment" into nyc-dev am: 65ee55457d am: da107902d9" into nyc-mr1-dev-plus-aosp 2016-05-17 23:40:31 +00:00
Chong Zhang
d73883c7f8 Merge "Fix wallpaper cropped too soon when unminimizing dock" into nyc-dev 
am: daa0d214dd

* commit 'daa0d214dd07caa8dc99abe635211ed94200bc2e':
  Fix wallpaper cropped too soon when unminimizing dock

Change-Id: I851227f5df0bf3cb0a1519fca1991db8927222c5
 2016-05-17 23:39:47 +00:00
Chong Zhang
12a23a9004 Merge "Use focused app\'s stack for IME adjustment" into nyc-dev am: 65ee55457d 
am: da107902d9

* commit 'da107902d9cd46d1ed9d051f89b91cee14dd8f17':
  Use focused app's stack for IME adjustment

Change-Id: I9825f8b9738072ae5fbc8f33db74c68a6f7c6603
 2016-05-17 23:39:43 +00:00
Chong Zhang
832dd49a1f Merge "Fix wallpaper cropped too soon when unminimizing dock" into nyc-dev 
am: daa0d214dd

* commit 'daa0d214dd07caa8dc99abe635211ed94200bc2e':
  Fix wallpaper cropped too soon when unminimizing dock

Change-Id: I74f7eb8fb8eed0157ef1278241b1f22164e600b5
 2016-05-17 23:39:42 +00:00
Ruben Brunk
2b699f0fe0 Merge "Dismiss immersive mode overlay while in VR mode." into nyc-dev 
am: 8ecf66fc83

* commit '8ecf66fc83e76165bea3cd408c687bd0b79c0552':
  Dismiss immersive mode overlay while in VR mode.

Change-Id: I15038cfb9e2ccfc119353d33699f2001eed4e180
 2016-05-17 23:39:41 +00:00
Ruben Brunk
f4907f747c Merge "Dismiss immersive mode overlay while in VR mode." into nyc-dev 
am: 8ecf66fc83

* commit '8ecf66fc83e76165bea3cd408c687bd0b79c0552':
  Dismiss immersive mode overlay while in VR mode.

Change-Id: I1ab8911349218071003ed4fa9231ea4b8647aa9e
 2016-05-17 23:39:39 +00:00
Chong Zhang
afe4482b4a Merge "Use focused app\'s stack for IME adjustment" into nyc-dev am: 65ee55457d 
am: e5bbbea494

* commit 'e5bbbea4940c490e0f8977f7568bf3ba6a86eba4':
  Use focused app's stack for IME adjustment

Change-Id: I02afe6824d506982c86a4d70f1ba903ab2dcc0f5
 2016-05-17 23:39:35 +00:00
Chong Zhang
daa0d214dd Merge "Fix wallpaper cropped too soon when unminimizing dock" into nyc-dev 2016-05-17 23:35:27 +00:00
Chong Zhang
e5bbbea494 Merge "Use focused app\'s stack for IME adjustment" into nyc-dev 
am: 65ee55457d

* commit '65ee55457dc39c3e30c677d9126565799b50a8dc':
  Use focused app's stack for IME adjustment

Change-Id: I4852a25d7a0bc356b659d8acb4407d820cd14502
 2016-05-17 23:34:20 +00:00