Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
248,717 Commits 3 Branches 0 Tags
93ddca0963bbd42d84db8850f16b67d033884777
Commit Graph

248717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bert McMeen
93ddca0963 Merge "Docs: Iterating on Wear docs - Bridger API" into mnc-io-docs am: 1e2739e635 am: cb62df2b44 
am: 30de7979e4

* commit '30de7979e4d1aa5a5d4c90bf1235e587c709e69f':
  Updated documentation for Input Method Framework Wear 2.0

Change-Id: I39fe9cf96de6a28f5655fecf2c6bc1dd98539824
 2016-05-18 01:13:49 +00:00
Bert McMeen
24812bdc12 Merge "docs: Iterating on Wear docs - Get Started, Download/Test, Program Overview" into mnc-io-docs am: ba803db9a6 am: f097e00a2a 
am: 94a5231f28

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

Change-Id: I915b5f60949d6786114d826da3c7229155ab42c0
 2016-05-18 01:13:40 +00:00
sreevanis
6d621fc6fd Merge "Updated app pattern documentation." into mnc-io-docs am: 5d0f016f4b am: 40ee002949 
am: 11002beae9

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

Change-Id: Ica32e2e017e3dcb88c064a0a5d69f945d3742d73
 2016-05-18 01:13:25 +00:00
sreevanis
bbeff9633c Merge "Notification changes for Wear 2.0 and Release notes." into mnc-io-docs am: abe5e7e366 am: 6bfb873c0f 
am: 959f038c3d

* commit '959f038c3da2d7498caa219d547ac394d5a073c9':
  Updated app pattern documentation.

Change-Id: I48a83b1f7f7767e34499a3bf689ab4ecfc80aec7
 2016-05-18 01:12:48 +00:00
sreevanis
1baf0f5c3f Merge "API Overview page for Wear 2.0 preview." into mnc-io-docs am: 14981cbe35 am: fd249ffc45 
am: b71d84ee1f

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

Change-Id: I9aa7abbb0cf64fe519f2e8a27400e89ccc5433ab
 2016-05-18 01:12:24 +00:00
Andrew Solovay
8a79f6bd0f Merge "docs: Creating new support library revision history page" into mnc-mr-docs am: e780c62462 am: f62ae36a96 am: c48a127662 
am: 5037f03440

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

Change-Id: Ie8a8a22641cb7d4c5b9f57f5ddca5d6e089ce4f6
 2016-05-18 01:12:12 +00:00
Sreevani Sreejith
30de7979e4 Merge "Docs: Iterating on Wear docs - Bridger API" into mnc-io-docs am: 1e2739e635 
am: cb62df2b44

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

Change-Id: I96c597ad9e68e33927c0d20a1943447b6e264243
 2016-05-18 01:06:24 +00:00
Bert McMeen
94a5231f28 Merge "docs: Iterating on Wear docs - Get Started, Download/Test, Program Overview" into mnc-io-docs am: ba803db9a6 
am: f097e00a2a

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

Change-Id: Id0656f935b4bccc49a76df1efea02b9ffa5826d1
 2016-05-18 01:06:17 +00:00
Bert McMeen
11002beae9 Merge "Updated app pattern documentation." into mnc-io-docs am: 5d0f016f4b 
am: 40ee002949

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

Change-Id: I91ec11bdbfa062840643a3bdfa967ec439a52dd5
 2016-05-18 01:06:10 +00:00
Sreevani Sreejith
959f038c3d Merge "Notification changes for Wear 2.0 and Release notes." into mnc-io-docs am: abe5e7e366 
am: 6bfb873c0f

* commit '6bfb873c0fa59e5533fdd1cb0ad761acbefd2960':
  Updated app pattern documentation.

Change-Id: Idb43de93e35465258a18cab21f5601b996a10a73
 2016-05-18 01:06:02 +00:00
Sreevani Sreejith
b71d84ee1f Merge "API Overview page for Wear 2.0 preview." into mnc-io-docs am: 14981cbe35 
am: fd249ffc45

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

Change-Id: I4adb024effd8fafdc5e32ac040ce40d829b08795
 2016-05-18 01:05:53 +00:00
Sreevani Sreejith
5037f03440 Merge "docs: Creating new support library revision history page" into mnc-mr-docs am: e780c62462 am: f62ae36a96 
am: c48a127662

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

Change-Id: I8b267adb22b24ac0c098b8945e7dfc3e6c17abdf
 2016-05-18 01:05:43 +00:00
Andrew Solovay
794d9a2e91 Merge "resolve merge conflicts of bd96855 to nyc-dev" into nyc-dev 
am: f3f5d79210

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

Change-Id: I1895793d67d6910c7750439f7d4486fc52fc32c1
 2016-05-18 01:03:55 +00:00
Andrew Solovay
f3f5d79210 Merge "resolve merge conflicts of bd96855 to nyc-dev" into nyc-dev 2016-05-18 01:00:13 +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
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
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
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
c189934573 Merge "Hide HdrCapabilities constructor." into nyc-dev 2016-05-18 00:42:55 +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
TreeHugger Robot
1e09e9826b Merge "Fix threading problems with drawables" into nyc-dev 2016-05-18 00:24:04 +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
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
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
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
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
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
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
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
Ruben Brunk
8ecf66fc83 Merge "Dismiss immersive mode overlay while in VR mode." into nyc-dev 2016-05-17 23:29:53 +00:00
Chong Zhang
65ee55457d Merge "Use focused app's stack for IME adjustment" into nyc-dev 2016-05-17 23:27:19 +00:00
Roshan Pius
73be9053b9 Merge "Adjust wifi idle times to fit in system time period" into nyc-dev 
am: e1f6975ebc

* commit 'e1f6975ebc1499ddcb493666f884ef0d8e042255':
  Adjust wifi idle times to fit in system time period

Change-Id: Id3dd41bab8096452d3f806304e2127cf1cc970c2
 2016-05-17 23:20:04 +00:00
Chris Craik
6ee192f4e9 Document that SurfaceView is synchronous in N 
bug:28821062

Change-Id: I1c17949d93de3d1f89c504fc061f7d20dd451a4d
 2016-05-17 16:17:25 -07:00
Sreevani Sreejith
1e2739e635 Merge "Updated documentation for Input Method Framework Wear 2.0" into mnc-io-docs 2016-05-17 23:09:28 +00:00
Andrew Solovay
bd96855929 resolve merge conflicts of 33d83db to mnc-ub-dev 
Change-Id: I8c148af6eec071ac076882a53c5ba2929cf0c9d2
 2016-05-17 16:09:03 -07:00
TreeHugger Robot
e1f6975ebc Merge "Adjust wifi idle times to fit in system time period" into nyc-dev 2016-05-17 23:07:58 +00:00
Jorim Jaggi
ca0cf0f529 Fix threading problems with drawables 
We can't use the same instance on both the main and the background
thread, as this will lead to problems.

Change-Id: Ieec525f028df2d0596667126d8f5004773461517
Fixes: 28745682
 2016-05-17 23:05:38 +00:00
Bert McMeen
ba803db9a6 Merge "Docs: Iterating on Wear docs - Bridger API" into mnc-io-docs 2016-05-17 23:05:21 +00:00