Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
254,514 Commits 3 Branches 0 Tags
4fe28da25a124fdb2f29edb95840dadee85872fd
Commit Graph

254514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
4fe28da25a Merge "Document that SurfaceView is synchronous in N" into nyc-dev am: 0cfbb7643e 
am: 1edc049919

* commit '1edc049919bacb850b6bdec030549f7011840c84':

Change-Id: Ica98c3c1b44084f40bb6d04bdeedcd20a108b872
 2016-05-18 02:59:05 +00:00
Andrii Kulian
80cbce0094 Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev am: 47aa3f61ac 
am: 88a2a7be72

* commit '88a2a7be727a7fe8c862a88632df2c5418c1f854':

Change-Id: Ic375e5a7c4388ca8b02dace48802dc257f7c02e1
 2016-05-18 02:58:41 +00:00
Joe Onorato
c7df9842a2 Merge changes If51568c3,Idd434c19 into nyc-dev am: 45165c9373 
am: 6f04fef272

* commit '6f04fef272c538ca433e53afc9031d634af36732':

Change-Id: I389f296199dfb262850330af40658c0c62bce3ac
 2016-05-18 02:58:10 +00:00
Hangyu Kuang
5d88bd61a5 Merge "Hide HdrCapabilities constructor." into nyc-dev am: c189934573 
am: 8f3e14bc92

* commit '8f3e14bc926d0eabd304f6712e6041e74e908a75':

Change-Id: I133a5ea827691aa35f2e0101d3b55f7126ec9869
 2016-05-18 02:57:11 +00:00
Jorim Jaggi
2faaec939a Merge "Fix threading problems with drawables" into nyc-dev am: 1e09e9826b 
am: eae7928b34

* commit 'eae7928b34af07f45bf585d2f789db9abc3e38f9':

Change-Id: I7626d2f101935f7c06e3b74aa6b7dd33665db0be
 2016-05-18 02:56:39 +00:00
Adrian Roos
a84b6fac05 Merge "Adjust Notification APIs per API council" into nyc-dev am: 718ba309cf 
am: 6cb72ee2eb

* commit '6cb72ee2eb05d95fbf4697f9dab6ba9c33a2121d':

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

* commit '3269d29083f3ff8c16eb092a6c754aaa6e56889b':

Change-Id: I0bfef839c851d4fa08346e881c29c738ba74a75d
 2016-05-18 02:55:24 +00:00
Wale Ogunwale
8ad0262ae7 Merge "Make Recents activity invisible when it is behind a translucent activity" into nyc-dev am: cbc73decf1 
am: 9951b883fe

* commit '9951b883fe1ddfd9aad16d3260b1ecd05ed514a8':

Change-Id: Ie2c89ac28e1ae891b517b31ad58ed3fecaca54e4
 2016-05-18 02:54:25 +00:00
Chong Zhang
d38ec04f07 Merge "Fix wallpaper cropped too soon when unminimizing dock" into nyc-dev am: daa0d214dd 
am: 832dd49a1f

* commit '832dd49a1f35ab8be9be34e0756a67da56e1d828':

Change-Id: Ibe9c352de6578199a14968126fcfef64937298a0
 2016-05-18 02:53:47 +00:00
Ruben Brunk
62920542af Merge "Dismiss immersive mode overlay while in VR mode." into nyc-dev am: 8ecf66fc83 
am: f4907f747c

* commit 'f4907f747c8d2618ff0d8a592cda30135a8a207e':

Change-Id: I316d48b530d476efde3ea274171ca5be34b42193
 2016-05-18 02:53:09 +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
Hemal Patel
aba029933f Merge "Docs: Fixed a wrong adb command example" into mnc-io-docs am: 473ef93497 am: 5967692ce1 am: bc56f279fa 
am: ca5fd7ca91

* commit 'ca5fd7ca91f2604d9cfd6ce726cae5d64cb19e3d':
  Docs: Fixed a wrong adb command example

Change-Id: I27de7f0c8f8e2894d19906fb76fb510f3bf71ea7
 2016-05-18 02:15:14 +00:00
Yohei Yukawa
31884efd13 Merge "Move LocaleList to avoid layering violation." into nyc-dev 2016-05-18 02:14:26 +00:00
Hemal Patel
ca5fd7ca91 Merge "Docs: Fixed a wrong adb command example" into mnc-io-docs am: 473ef93497 am: 5967692ce1 
am: bc56f279fa

* commit 'bc56f279fa11e37fda24d5555522135a9c4120ca':
  Docs: Fixed a wrong adb command example

Change-Id: Ia3f26a9ff86f71abf2ed54a30fdf502b9f821bb5
 2016-05-18 02:12:22 +00:00
Hemal Patel
bc56f279fa Merge "Docs: Fixed a wrong adb command example" into mnc-io-docs am: 473ef93497 
am: 5967692ce1

* commit '5967692ce1f5b36b411dcf90995b16b2b67b01e1':
  Docs: Fixed a wrong adb command example

Change-Id: Ia2bee3ea8f66ef9a86006aed00534944979985b4
 2016-05-18 02:06:54 +00:00
Hemal Patel
5967692ce1 Merge "Docs: Fixed a wrong adb command example" into mnc-io-docs 
am: 473ef93497

* commit '473ef93497256f5c985f88b56c884dc89a72487d':
  Docs: Fixed a wrong adb command example

Change-Id: Id44b8226104fabd0395c21e7d1fd716ade1a88d4
 2016-05-18 02:04:19 +00:00
Bert McMeen
cff031369d docs: Iterating on Wear docs - Complications am: dcab4687db am: 0f95b8dc36 am: f42a132de6 
am: 3285e34a54

* commit '3285e34a54580d7c2e8b691ac4d0e0f4fbbc1ff5':
  docs: Iterating on Wear docs - Complications

Change-Id: I9b16f2a4b99d4b162aa6b5c7a4b050a36569f63e
 2016-05-18 02:02:03 +00:00
Bert McMeen
3285e34a54 docs: Iterating on Wear docs - Complications am: dcab4687db am: 0f95b8dc36 
am: f42a132de6

* commit 'f42a132de63e29dc8b1da6eda0468b2d876104c9':
  docs: Iterating on Wear docs - Complications

Change-Id: I48654e607f17c086b9ddc242c689aa17b3e9f426
 2016-05-18 01:59:01 +00:00
Hemal Patel
473ef93497 Merge "Docs: Fixed a wrong adb command example" into mnc-io-docs 2016-05-18 01:58:52 +00:00
Bert McMeen
f42a132de6 docs: Iterating on Wear docs - Complications am: dcab4687db 
am: 0f95b8dc36

* commit '0f95b8dc3604f0ec3cb36de2c6184743099512ba':
  docs: Iterating on Wear docs - Complications

Change-Id: I10ff0c7aeef775fa790c66b3843ab9b8f5b19634
 2016-05-18 01:53:58 +00:00
Bert McMeen
0f95b8dc36 docs: Iterating on Wear docs - Complications 
am: dcab4687db

* commit 'dcab4687db1be19367c8a83853876092f9aad767':
  docs: Iterating on Wear docs - Complications

Change-Id: Ia6503fa4e160eb2657d5feb9564005abd75ff6ac
 2016-05-18 01:51:16 +00:00
Andrew Solovay
22aa35304b Merge "docs: Updating N Preview downloads page for DP3" into mnc-io-docs am: bd57a67b8f am: 71edb581a2 am: c13d7a2fa0 
am: 4ae03e689c

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

Change-Id: I539f5110a6cc6fbdff18180362f394c8c99f78b8
 2016-05-18 01:22:17 +00:00
Billy Lamberta
6076d9a3b5 Merge "docs: Wear 2 Preview - improve visibility and look of pages" into mnc-io-docs am: 2b3870cd94 am: 73836a0e20 am: 72d43069eb 
am: 60111f4775

* commit '60111f477541184eeb42c15dadf2d6fed81cf1cc':
  docs: work - Update devhub url

Change-Id: I5a5bda1a932bd9f95786e7fb0a5e6bf139df0d22
 2016-05-18 01:22:14 +00:00
Joe Fernandez
916118f708 Merge "Updated documentation for Input Method Framework Wear 2.0" into mnc-io-docs am: 2015256ccc am: a590325a98 am: 60e02f9c39 
am: e2147051a8

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

Change-Id: I416b7a35479867529a42862f2072b9480d88f971
 2016-05-18 01:22:10 +00:00
Sreevani Sreejith
e86082a417 Merge "Docs: Iterating on Wear docs - Bridger API" into mnc-io-docs am: 1e2739e635 am: cb62df2b44 am: 30de7979e4 
am: 93ddca0963

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

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

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

Change-Id: I14717573aa0f199cf167fab84f42f77b13ea74ba
 2016-05-18 01:21:55 +00:00
Bert McMeen
60df407613 Merge "Updated app pattern documentation." into mnc-io-docs am: 5d0f016f4b am: 40ee002949 am: 11002beae9 
am: 6d621fc6fd

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

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

* commit 'bbeff9633c7e2dc3f596839d39385736ed52c36a':
  Updated app pattern documentation.

Change-Id: I44581f48a4265191172e7ba4edfebba37e2109e2
 2016-05-18 01:21:20 +00:00
Sreevani Sreejith
728dcfc7aa Merge "API Overview page for Wear 2.0 preview." into mnc-io-docs am: 14981cbe35 am: fd249ffc45 am: b71d84ee1f 
am: 1baf0f5c3f

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

Change-Id: I6d64abfca690ba20b5935d29a317e1c195e76773
 2016-05-18 01:20:44 +00:00
Sreevani Sreejith
0286b53510 Merge "docs: Creating new support library revision history page" into mnc-mr-docs am: e780c62462 am: f62ae36a96 am: c48a127662 am: 5037f03440 
am: 8a79f6bd0f

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

Change-Id: If4a6327f9257ad700c6f063c1adfe07a43a535b1
 2016-05-18 01:20:26 +00:00
Bert McMeen
dcab4687db docs: Iterating on Wear docs - Complications 
Bug: 28425614

Change-Id: I1313f80ae28efdd6d2677399a23acb10e4dbf7da
 2016-05-17 18:16:17 -07:00
Andrew Solovay
4ae03e689c Merge "docs: Updating N Preview downloads page for DP3" into mnc-io-docs am: bd57a67b8f am: 71edb581a2 
am: c13d7a2fa0

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

Change-Id: Ic62e7137e2614b46db798ba3b94b6699fbafe762
 2016-05-18 01:14:04 +00:00
Joe Fernandez
60111f4775 Merge "docs: Wear 2 Preview - improve visibility and look of pages" into mnc-io-docs am: 2b3870cd94 am: 73836a0e20 
am: 72d43069eb

* commit '72d43069ebb5010ab52d0c1d111a3512ea420ffb':
  docs: work - Update devhub url

Change-Id: Iff8cee1f441a8fa76a1133dbabdf6b1938ec3615
 2016-05-18 01:14:00 +00:00
sreevanis
e2147051a8 Merge "Updated documentation for Input Method Framework Wear 2.0" into mnc-io-docs am: 2015256ccc am: a590325a98 
am: 60e02f9c39

* commit '60e02f9c39242f8e8033fd5eae02271ae391e236':
  docs: Wear 2 Preview - improve visibility and look of pages

Change-Id: I03b0c9e8b88c87f89dff4c7d063f123b12e11def
 2016-05-18 01:13:55 +00:00
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
Andrew Solovay
c8cab0fcb2 Merge "resolve merge conflicts of bd96855 to nyc-dev" into nyc-dev am: f3f5d79210 
am: 794d9a2e91

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

Change-Id: I43b02066f642eac7eb6656c7b587b6cf26cc37f3
 2016-05-18 01:10:41 +00:00
Andrew Solovay
c13d7a2fa0 Merge "docs: Updating N Preview downloads page for DP3" into mnc-io-docs am: bd57a67b8f 
am: 71edb581a2

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

Change-Id: Icb88562605f909db011819489e40f4763eea76f9
 2016-05-18 01:06:41 +00:00
Billy Lamberta
72d43069eb Merge "docs: Wear 2 Preview - improve visibility and look of pages" into mnc-io-docs am: 2b3870cd94 
am: 73836a0e20

* commit '73836a0e20533dcedc1120d54e3134fe713a5a9a':
  docs: work - Update devhub url

Change-Id: Iae6f0f62e756ebb334fcb1833b4eb46f9f607814
 2016-05-18 01:06:36 +00:00
Joe Fernandez
60e02f9c39 Merge "Updated documentation for Input Method Framework Wear 2.0" into mnc-io-docs am: 2015256ccc 
am: a590325a98

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

Change-Id: I88902d559f960902a02ae43fc9f921a5f11b0140
 2016-05-18 01:06:30 +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