Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
7c81d495b6 Merge "Fix threading problems with drawables" into nyc-dev am: 1e09e9826b am: e48384c867 
am: 22507e99ff

* commit '22507e99ff289b20caa647fad0ca3b637ee0f14e':
  Fix threading problems with drawables

Change-Id: I06fa9ebcdd1c0b0006ecc8f4481fcf45a3f5f8fa
 2016-05-18 00:39:39 +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
TreeHugger Robot
4e5b694ab2 Merge "Open root list when hovering on the edge in drawer layout." 2016-05-18 00:31:17 +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
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
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
Dianne Hackborn
2be3630e4d Merge "Fix issue #28817455: [NYC] [BullHead] Fatal Exception in CNEService" into nyc-dev am: 0fda52b92e am: fe061f1bcb 
am: a7cb651e8f

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

Change-Id: I8c7cb347ec8c339a5c85f4bf752bbea4b913e2df
 2016-05-18 00:10:27 +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
cc2b0989fe Merge "Make Recents activity invisible when it is behind a translucent activity" into nyc-dev am: cbc73decf1 am: db314a0aa1 
am: 7f1ecdd495

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

Change-Id: I5728c47e8fd4be8328e06a3a5c35922a15327e9e
 2016-05-18 00:01:26 +00: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
Chong Zhang
44ee0d8537 Merge "Fix wallpaper cropped too soon when unminimizing dock" into nyc-dev am: daa0d214dd am: d73883c7f8 
am: 47e1e14589

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

Change-Id: Ib4dd8ad19f9abbdc8daab4702b799321f322f832
 2016-05-17 23:47:40 +00:00
Ruben Brunk
4b1deabc24 Merge "Dismiss immersive mode overlay while in VR mode." into nyc-dev am: 8ecf66fc83 am: 2b699f0fe0 
am: aef12f4ffd

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

Change-Id: I4cf3ff728079e948220a50a6067d4333d072f3e6
 2016-05-17 23:47:36 +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
51e57f1d36 Merge "Merge "Use focused app\'s stack for IME adjustment" into nyc-dev am: 65ee55457d am: da107902d9" into nyc-mr1-dev-plus-aosp 
am: 3d99cd41e6

* commit '3d99cd41e6d6073ff77c790540753988560a34ed':

Change-Id: I3d0ad97442a6939a5c027f955dc9eef0d657651c
 2016-05-17 23:43:48 +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
Chong Zhang
6aa65afc25 Merge "Use focused app\'s stack for IME adjustment" into nyc-dev am: 65ee55457d am: e5bbbea494 
am: afe4482b4a

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

Change-Id: Iee5d2fe0bc9d1ec002f7d7fd7a11caf0e24cf290
 2016-05-17 23:43:42 +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
Android Build Merger (Role)
b77e9044fb Merge "Merge "Merge "Adjust wifi idle times to fit in system time period" into nyc-dev am: e1f6975ebc am: 73be9053b9" into nyc-mr1-dev-plus-aosp am: f3d09db6dd" 2016-05-17 23:35:43 +00:00
Jiaquan He
8cd8cf45ea Merge "Change some members in QSTileBaseView and QSTileView." 2016-05-17 23:35:32 +00:00