Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
249,922 Commits 3 Branches 0 Tags
6501ac3bf9cfd8d940d2c36ab2df72bda1cab52e
Commit Graph

249922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cheryl Potter
212fe6c071 Merge "docs: Fix card descriptions in Android Monitor Overview page b/2885829" into mnc-mr-docs am: d382293118 am: f2fa5cd702 
am: 0793d19267

* commit '0793d1926729cdfd6cd023e89e45b21c63c1d91d':
  docs: Fix card descriptions in Android Monitor Overview page b/2885829

Change-Id: I183e31bdf55e6e691785430d65d4cf2934a2f7ef
 2016-05-20 00:14:07 +00:00
smain@google.com
eaad66b697 Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs am: 486f792d44 am: 9ad92619dc 
am: ccf143ea10

* commit 'ccf143ea106de35de35d4829ade55ba78b7a3fee':
  fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246

Change-Id: I42306e09cb173642840ee29130bb80e9da347a81
 2016-05-20 00:14:02 +00:00
Cheryl Potter
0793d19267 Merge "docs: Fix card descriptions in Android Monitor Overview page b/2885829" into mnc-mr-docs am: d382293118 
am: f2fa5cd702

* commit 'f2fa5cd7022d450d4e0faa4c81db5207d1ec00d3':
  docs: Fix card descriptions in Android Monitor Overview page b/2885829

Change-Id: Iacbf1fca2c1d3189a39122e893ece5fcf033246a
 2016-05-20 00:11:13 +00:00
Cheryl Potter
f2fa5cd702 Merge "docs: Fix card descriptions in Android Monitor Overview page b/2885829" into mnc-mr-docs 
am: d382293118

* commit 'd382293118dad1337726986c1f2465d2ec25171b':
  docs: Fix card descriptions in Android Monitor Overview page b/2885829

Change-Id: Ieadb04df863e4f50db2b1b6168cc31f6501fa242
 2016-05-20 00:08:47 +00:00
Scott Main
ccf143ea10 Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs am: 486f792d44 
am: 9ad92619dc

* commit '9ad92619dc455a42c40e5b102e2fdf65c2787549':
  fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246

Change-Id: I52fc62f8f233682a6707a4c1e5ef67f42844551b
 2016-05-20 00:08:46 +00:00
smain@google.com
9ad92619dc Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs 
am: 486f792d44

* commit '486f792d4448819c47c7e18dfd4ccb40133df528':
  fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246

Change-Id: Iffb768397f425b34c1e297d40c9b1077d1e7ad5d
 2016-05-20 00:05:01 +00:00
Cheryl Potter
d382293118 Merge "docs: Fix card descriptions in Android Monitor Overview page b/2885829" into mnc-mr-docs 2016-05-20 00:03:07 +00:00
Christopher Tate
ea2d6e8e89 Back up / restore the 'mono audio' setting 
Bug 28437565

Change-Id: I6028886eb1aa424edabca65ad9d11d984b82d198
 2016-05-19 16:55:49 -07:00
Cheryl Potter
72686af4f6 docs: Fix card descriptions in Android Monitor Overview page 
b/2885829

Change-Id: I2c36d9889f685ea6f18859f5859d876da55ba034
 2016-05-19 16:55:49 -07:00
smain@google.com
0cd3a78a0d update links to studio docs am: 73cf8224cb am: f7304c8cc8 
am: 69428b4a0a

* commit '69428b4a0ad9b3bed3c31bbf3dff4d61548af77a':
  update links to studio docs

Change-Id: Ia2b3f1b7556c01c2bebed8d50a43a05def067b3b
 2016-05-19 23:55:01 +00:00
Scott Main
486f792d44 Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs 2016-05-19 23:54:20 +00:00
smain@google.com
69428b4a0a update links to studio docs am: 73cf8224cb 
am: f7304c8cc8

* commit 'f7304c8cc8aa947558be355fd0c547f418e44931':
  update links to studio docs

Change-Id: I9886a9618513c63f02add34b12761f8d35afb1da
 2016-05-19 23:47:54 +00:00
smain@google.com
f7304c8cc8 update links to studio docs 
am: 73cf8224cb

* commit '73cf8224cbd97918d6407aac79a97c6ef70b9a30':
  update links to studio docs

Change-Id: I79a52f27e9107b63c377e8783d129b93c2013c78
 2016-05-19 23:43:17 +00:00
Adam Lesinski
d5bb8487d5 Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." am: 6f4b566169 
am: f55c9f7aa6

* commit 'f55c9f7aa64660712242705d4e5e89e2191bbf69':
  Fix misc-macro-parentheses warnings in aapt and androidfw.

Change-Id: I23f28430cf242be3f77926016626ea3e5705d4ec
 2016-05-19 23:34:58 +00:00
Chih-Hung Hsieh
03df422689 Merge "Fix misc-macro-parentheses warnings in services jni." am: fe91d2a83d 
am: d05b6478d5

* commit 'd05b6478d5341f7d70e78fad031d2d426155f68a':
  Fix misc-macro-parentheses warnings in services jni.

Change-Id: Ibee251ace2e3f15b98a8f91da0d8450069500177
 2016-05-19 23:34:54 +00:00
smain@google.com
73cf8224cb update links to studio docs 
Change-Id: Ie4eccfcb19e690fff935e3a6064332d2e5a3323c
 2016-05-19 16:30:43 -07:00
Chih-Hung Hsieh
f55c9f7aa6 Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." 
am: 6f4b566169

* commit '6f4b5661696355d230c515a45aca2dddd8fe99b1':
  Fix misc-macro-parentheses warnings in aapt and androidfw.

Change-Id: I5333078964a57c20144acb6b538205bde2782c12
 2016-05-19 23:29:32 +00:00
Chih-Hung Hsieh
d05b6478d5 Merge "Fix misc-macro-parentheses warnings in services jni." 
am: fe91d2a83d

* commit 'fe91d2a83daee3604a49c1bae0744cdde6d14b46':
  Fix misc-macro-parentheses warnings in services jni.

Change-Id: I3ca66bf839e5a720e610657fc9afb6dbb8b853f8
 2016-05-19 23:29:28 +00:00
Android Build Merger (Role)
0cf5b8d0fe Merge "Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 am: 5fb577e6bc am: 8053c79246 am: f339170837" into nyc-dev-plus-aosp 2016-05-19 23:26:35 +00:00
Dirk Dougherty
21c24e63bf Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 am: 5fb577e6bc am: 8053c79246 
am: f339170837

* commit 'f3391708373758acac5d4c8daf3abe9ca2a38b97':
  Remove outdated google services links.

Change-Id: Ib4dd699dd767dac910af70eb32471570291af482
 2016-05-19 23:26:08 +00:00
Adam Lesinski
6f4b566169 Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." 2016-05-19 23:25:09 +00:00
Treehugger Robot
fe91d2a83d Merge "Fix misc-macro-parentheses warnings in services jni." 2016-05-19 23:24:03 +00:00
Chih-Hung Hsieh
0a87059452 resolve merge conflicts of 404e2b2 to nyc-dev-plus-aosp 
Change-Id: I3c486e83a3f2b27ee0e6bfe4e3bba3df3af758a5
 2016-05-19 16:22:09 -07:00
Dirk Dougherty
f339170837 Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 am: 5fb577e6bc 
am: 8053c79246

* commit '8053c79246f14a78158b6476169299999299d6d8':
  Remove outdated google services links.

Change-Id: I4c85952e4962381261e42d3ecf1c3408a57ab55e
 2016-05-19 23:19:12 +00:00
Dirk Dougherty
8053c79246 Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 
am: 5fb577e6bc

* commit '5fb577e6bc96cf38cc2395abe54ecb65a4e06936':
  Remove outdated google services links.

Change-Id: I439141d79ed51128e66533656095b3f70ff7a88b
 2016-05-19 23:13:57 +00:00
John Reck
93510f46e0 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours am: a7895725f8 am: 0f59d9b80c am: 08a4808197 am: 7298186769 -s ours 
am: 02b5805ba3

* commit '02b5805ba3f5567ef6eea5931f120fd261cd4a54':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I753de859a133ded85cb89fb914bbe29e195a3432
 2016-05-19 23:07:15 +00:00
Dirk Dougherty
5fb577e6bc Merge "Remove outdated google services links." into mnc-mr-docs 
am: dc40b80ae9

* commit 'dc40b80ae930ac80fd7067e7e9ecc78454e847c5':
  Remove outdated google services links.

Change-Id: I534cae19e16547cac3f34436f38f86ababcbeaca
 2016-05-19 23:07:10 +00:00
Chih-Hung Hsieh
404e2b21fc Merge "Fix misc-macro-parentheses warnings in hwui and graphic jni." 
am: e66235bf00

* commit 'e66235bf00a695cacb44b0bc1a241cabb7de3b96':
  Fix misc-macro-parentheses warnings in hwui and graphic jni.

Change-Id: I08ab0efc29e8b595f087a781d8a66a472f1f9797
 2016-05-19 23:07:09 +00:00
Treehugger Robot
e66235bf00 Merge "Fix misc-macro-parentheses warnings in hwui and graphic jni." 2016-05-19 23:02:55 +00:00
Dirk Dougherty
dc40b80ae9 Merge "Remove outdated google services links." into mnc-mr-docs 2016-05-19 23:01:54 +00:00
Dirk Dougherty
8b35261e90 Remove outdated google services links. 
Change-Id: Ie30c18940c2fd7fbbbfa737145cda36b8a2fc26e
 2016-05-19 16:00:56 -07:00
John Reck
02b5805ba3 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours am: a7895725f8 am: 0f59d9b80c am: 08a4808197 
am: 7298186769  -s ours

* commit '7298186769395978045ed2d35252cdf7f644d85b':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I93f337a4e85a4e20e91fbbf7bd7aeb48bd0df735
 2016-05-19 22:59:26 +00:00
Bert McMeen
bf5dd7b969 docs: Update to column widths for Complications table am: 76372f02fe am: 4cdad3212e 
am: 8386df9ea1

* commit '8386df9ea1a2e8bb9bdeb0da1d556b0cff0daf41':
  docs: Update to column widths for Complications table

Change-Id: Iacc8d86b622f2ecf46625fdf9d12b31dca78655e
 2016-05-19 22:56:34 +00:00
John Reck
7298186769 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours am: a7895725f8 am: 0f59d9b80c 
am: 08a4808197

* commit '08a480819763dd632fd8006a0ea57b8220ee121a':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Ia434422652e624aa5afc871857e7d8dac168912e
 2016-05-19 22:54:05 +00:00
John Reck
08a4808197 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours am: a7895725f8 
am: 0f59d9b80c

* commit '0f59d9b80c9f5daa321b683525ba8732add007c2':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Ieab233f8cc5b9a0c3468c551b4cd023532c5eff6
 2016-05-19 22:50:55 +00:00
Bert McMeen
8386df9ea1 docs: Update to column widths for Complications table am: 76372f02fe 
am: 4cdad3212e

* commit '4cdad3212e67fabbfe4ba68f7b214be5ff5c10af':
  docs: Update to column widths for Complications table

Change-Id: I22f82c2ca729b9d679fc077dbc9b54c85a70d6fc
 2016-05-19 22:50:53 +00:00
John Reck
0f59d9b80c DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours 
am: a7895725f8

* commit 'a7895725f8858465a404cbe4f6d5091e39423529':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Icc562bb47467e7d2d352b6c03498a471ec464e63
 2016-05-19 22:47:05 +00:00
Abhijith Shastry
99d1fd935e Merge "Update BlockedNumberContract javadocs." into nyc-dev 
am: 07abc7f813

* commit '07abc7f8139e012f8a92d74448db357446ab4664':
  Update BlockedNumberContract javadocs.

Change-Id: Id8d90f28d56223ab1d01be634e83df2ee4dd9e93
 2016-05-19 22:46:57 +00:00
Bert McMeen
4cdad3212e docs: Update to column widths for Complications table 
am: 76372f02fe

* commit '76372f02fe149aefccea502bf1ac0dca2693e84b':
  docs: Update to column widths for Complications table

Change-Id: I67578fd73f26af6ef2187e4e9823fb71e89f990e
 2016-05-19 22:44:13 +00:00
John Reck
a7895725f8 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 
am: 8238207ce6  -s ours

* commit '8238207ce6268422bcdb50d44f03e6a220081294':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Ia73f713a2c6f52357877e00e71f511044bb9ca58
 2016-05-19 22:43:14 +00:00
Abhijith Shastry
07abc7f813 Merge "Update BlockedNumberContract javadocs." into nyc-dev 2016-05-19 22:43:12 +00:00
John Reck
8238207ce6 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d 
am: 1da8c9baa2

* commit '1da8c9baa2d2da49e14224d34995337c4709b1ad':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Ibff7c25c48909cb77ee498f0fb3030d22a3eb381
 2016-05-19 22:37:04 +00:00
Hemal Patel
b40e1aa065 Docs: Fixed a typo 
Bug: 27583289
Change-Id: Ice0208182d98bb9e55343a915907c2b86a0bba65
 2016-05-19 15:36:09 -07:00
John Reck
1da8c9baa2 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours 
am: 1fae3b370d

* commit '1fae3b370dfd9536da166ef561df630cdff02b83':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I5015ea3a7926caf4cf2cf27feff0653507063ac3
 2016-05-19 22:32:47 +00:00
Chih-Hung Hsieh
6c89616c38 Fix misc-macro-parentheses warnings in services jni. 
Bug: 28705665
Change-Id: Iaf965875b667e45e1557e447de7988f729adfd52
 2016-05-19 15:29:38 -07:00
John Reck
1fae3b370d DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours 
am: bfa719f448  -s ours

* commit 'bfa719f448ab4d90368a3cdc556e515253528e17':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I6597a3a69b8037af401000ab0123ea6d050f58ed
 2016-05-19 22:28:23 +00:00
Chih-Hung Hsieh
cef190de85 Fix misc-macro-parentheses warnings in hwui and graphic jni. 
Bug: 28705665
Change-Id: I7d1eb38a713fe6cc7f41a3cc3f2f9d0aa0114b2c
 2016-05-19 15:25:50 -07:00
Miao Wang
35927794fc Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev 
am: 75445fd6a0

* commit '75445fd6a043a892bb7d7f18c1d62c5f72337413':
  [RenderScript] Fix ScriptIntrinsicBlur documentation.

Change-Id: I8ccd115fd6f92ef4b4ef7194a77fd01ffbda5916
 2016-05-19 22:24:27 +00:00
Miao Wang
7ae30e18a4 Merge "Update documentation about copyTo and copyFrom." into nyc-dev 
am: 1a523b7502

* commit '1a523b7502135a5cc0a94ea380263638b0ffdab1':
  Update documentation about copyTo and copyFrom.

Change-Id: I0aa87cd4bde408ba5395ae3f951d86e10ece58de
 2016-05-19 22:24:21 +00:00
John Reck
bfa719f448 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 
am: 5527fd1323  -s ours

* commit '5527fd1323cc1d6470576386c8298f45c3895d75':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I14fe8c28299ba6bb94cd51d1bc9c637be7766cbd
 2016-05-19 22:21:46 +00:00