drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
171,506 Commits 1 Branch 0 Tags
Commit Graph

171506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smain@google.com
a564f7bf94 am a004c2ec: am 9b00d795: am 0da6b005: revise helpouts tags to use just one on each page automerge: b2b3b37 automerge: 07c9807 
* commit 'a004c2ec06a5ba3d65786e50171d8cdbb80515c8':
  revise helpouts tags to use just one on each page
 2014-11-01 17:41:03 +00:00
Alex Klyubin
e55c4f43df am a409cdf1: am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs automerge: 2f1c76f automerge: 42340b9 
* commit 'a409cdf161664666e15f337ea5a0efd078667352':
  Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
 2014-11-01 17:40:58 +00:00
Ricardo Cervera
158183c79a am fd8184e4: am 84ca5ddb: am bdb1cf0c: Merge "docs: Add links to Wear UI training from Design pages." into lmp-dev automerge: 84a48b0 automerge: 721b1d3 
* commit 'fd8184e4247f81f6027ae3cc328e8a19869c2d5e':
  docs: Add links to Wear UI training from Design pages.
 2014-11-01 17:40:53 +00:00
Nick Kralevich
31a378efbf resolved conflicts for merge of 85118849 to master 
Change-Id: Ic4d98e2804dddf3a7fe58bea99f0a4b22ebd605d
 2014-11-01 10:35:47 -07:00
Scott Rowe
201805a49f am 8d262c3a: am 20ee9f12: am de740985: am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs 
automerge: 4e439d0

* commit '4e439d0312b753b1162519baa473e5358c842069':
  docs: b/15180738 - invalid urls in badge generator
 2014-11-01 16:54:34 +00:00
Scott Rowe
4e439d0312 am 8d262c3a: am 20ee9f12: am de740985: am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs 
* commit '8d262c3a033b9123f42a8ad1a3925684264b8450':
  docs: b/15180738 - invalid urls in badge generator
 2014-11-01 16:47:16 +00:00
Scott Rowe
8d262c3a03 am 20ee9f12: am de740985: am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs 
* commit '20ee9f122da1572ffb4e9a76eddc71180a4e608d':
  docs: b/15180738 - invalid urls in badge generator
 2014-11-01 16:42:02 +00:00
Scott Rowe
20ee9f122d am de740985: am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs 
* commit 'de7409859315de19f081325a82a9c3ef99f28f26':
  docs: b/15180738 - invalid urls in badge generator
 2014-11-01 16:33:50 +00:00
Scott Rowe
de74098593 am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs 
* commit 'aa275bf989f0bf9e968f0804bb57ec7b1a7c1f54':
  docs: b/15180738 - invalid urls in badge generator
 2014-11-01 16:28:23 +00:00
Scott Rowe
aa275bf989 Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs 2014-11-01 16:23:12 +00:00
Mark Renouf
ee4d868a27 am 2182bf5a: am 3d875f80: am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE automerge: 024bc87 -s ours automerge: 381dfa7 -s ours 
automerge: 1fc26a4  -s ours

* commit '1fc26a481c0b5465dc5adcb51040b81b59d7fdaf':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-11-01 15:24:48 +00:00
Scott Rowe
e19bf40fad am dfeb6055: am b31c2b07: am 397eb67f: Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs automerge: 0948545 automerge: c94ad35 
automerge: 3d6f449

* commit '3d6f449cd24056ecfab4300ef55fb8e20919c631':
  docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905
 2014-11-01 15:23:29 +00:00
Mark Renouf
efadfc0c20 am 6497dd73: am b5c5a0dc: am 7be03da0: (-s ours) Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: c26d97c -s ours automerge: dc9ea93 -s ours 
automerge: 8c8c62a  -s ours

* commit '8c8c62a1bcc85166aca74510cf1440a29835cbdb':
  Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
 2014-11-01 15:21:42 +00:00
David Friedman
5916862108 am 62b532c7: am d2d8c553: am e91c37de: Fixes wrongly nested braces. Bug: 17499985 automerge: cc7917d automerge: 4fc0aac 
automerge: ae4297e

* commit 'ae4297e2ef5e0713ecf78112b57b97444f20c818':
  Fixes wrongly nested braces. Bug: 17499985
 2014-11-01 15:20:46 +00:00
Jeff Brown
e05fb136cd am 13f00f07: Implement multi-press behavior for power key. automerge: a71601a 
automerge: 634ffc4

* commit '634ffc4211de6bfbc06d6f67084b2d664c2f4f2a':
  Implement multi-press behavior for power key.
 2014-11-01 15:05:45 +00:00
Jeff Brown
5177979bbd am e333e674: Add a function to boost screen brightness temporarily. automerge: 0ed053e 
automerge: a80162f

* commit 'a80162f0d124e7400e268440c864289a9a7be11e':
  Add a function to boost screen brightness temporarily.
 2014-11-01 15:04:52 +00:00
Joe Fernandez
ae59e01ccc am 84045506: am 20207a83: am e8ad737d: docs: multidex - building apps with over 65K method references automerge: f16f6d9 
automerge: 93a954b

* commit '93a954b46b1d07bf1ca50790a62893f7bc123aeb':
  docs: multidex - building apps with over 65K method references
 2014-11-01 15:03:56 +00:00
Joe Fernandez
12e76b995d am 0e4ef673: am 89e73a1c: am ea17fdec: Merge "docs:studio-updates-814v2" into lmp-docs automerge: a1caad9 
automerge: c312071

* commit 'c312071f4eab1906aab01ec91fdc65b84d57913f':
  docs:studio-updates-814v2
 2014-11-01 15:03:02 +00:00
smain@google.com
f1c86b51ca am 515daeea: am 307bcbe3: am 26bf2f7b: revise helpouts tags to use just one on each page automerge: f417409 
automerge: 8788850

* commit '87888502db298ad786254c63a2202001b47622b4':
  revise helpouts tags to use just one on each page
 2014-11-01 15:02:09 +00:00
smain@google.com
a004c2ec06 am 9b00d795: am 0da6b005: revise helpouts tags to use just one on each page automerge: b2b3b37 
automerge: 07c9807

* commit '07c98070fbd571e7b275ad54c3c918dd7c48d2cc':
  revise helpouts tags to use just one on each page
 2014-11-01 15:01:09 +00:00
Alex Klyubin
a409cdf161 am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs automerge: 2f1c76f 
automerge: 42340b9

* commit '42340b9de03fb2b27a0f915d827d729bce7fcda7':
  Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
 2014-11-01 15:00:10 +00:00
Ricardo Cervera
fd8184e424 am 84ca5ddb: am bdb1cf0c: Merge "docs: Add links to Wear UI training from Design pages." into lmp-dev automerge: 84a48b0 
automerge: 721b1d3

* commit '721b1d383f44caedcada436bed0db5e9d6b672e1':
  docs: Add links to Wear UI training from Design pages.
 2014-11-01 14:59:06 +00:00
Joe Fernandez
8511884919 am 43fda072: am 922e6b6a: am 81fcc85c: Merge "docs:studio-update-814" into lmp-docs automerge: ed47742 
automerge: 05827eb

* commit '05827eb8f77e26da75c09fbdb84bfb184f8667fd':
  docs:studio-update-814
 2014-11-01 14:58:06 +00:00
Mark Renouf
1fc26a481c am 2182bf5a: am 3d875f80: am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE automerge: 024bc87 -s ours 
automerge: 381dfa7  -s ours

* commit '381dfa704d68fa6219732f5e95c38c219ef097bd':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-11-01 14:57:05 +00:00
Scott Rowe
3d6f449cd2 am dfeb6055: am b31c2b07: am 397eb67f: Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs automerge: 0948545 
automerge: c94ad35

* commit 'c94ad35b4a37d5b2646a0ab6792c0815dcebf522':
  docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905
 2014-11-01 14:55:58 +00:00
Mark Renouf
8c8c62a1bc am 6497dd73: am b5c5a0dc: am 7be03da0: (-s ours) Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: c26d97c -s ours 
automerge: dc9ea93  -s ours

* commit 'dc9ea936d0f1ed88f7be6e0bfe09acf2dacd9200':
  Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
 2014-11-01 14:55:00 +00:00
David Friedman
ae4297e2ef am 62b532c7: am d2d8c553: am e91c37de: Fixes wrongly nested braces. Bug: 17499985 automerge: cc7917d 
automerge: 4fc0aac

* commit '4fc0aacb1add76df5fde2c9b24f96f8bc3e9dc1d':
  Fixes wrongly nested braces. Bug: 17499985
 2014-11-01 14:54:06 +00:00
Jeff Brown
634ffc4211 am 13f00f07: Implement multi-press behavior for power key. 
automerge: a71601a

* commit 'a71601a98c7f37004e1b86757cdbf552564a2e8c':
  Implement multi-press behavior for power key.
 2014-11-01 14:52:11 +00:00
Jeff Brown
a80162f0d1 am e333e674: Add a function to boost screen brightness temporarily. 
automerge: 0ed053e

* commit '0ed053ef537daa11659e70c91974cded7c9bddc6':
  Add a function to boost screen brightness temporarily.
 2014-11-01 14:51:15 +00:00
Joe Fernandez
93a954b46b am 84045506: am 20207a83: am e8ad737d: docs: multidex - building apps with over 65K method references 
automerge: f16f6d9

* commit 'f16f6d9ed25ee2abfa09b6a9448772b90112f0b4':
  docs: multidex - building apps with over 65K method references
 2014-11-01 14:50:23 +00:00
Joe Fernandez
c312071f4e am 0e4ef673: am 89e73a1c: am ea17fdec: Merge "docs:studio-updates-814v2" into lmp-docs 
automerge: a1caad9

* commit 'a1caad91c7b5d9a96fec68c014b4fdc6c0d56664':
  docs:studio-updates-814v2
 2014-11-01 14:46:29 +00:00
smain@google.com
87888502db am 515daeea: am 307bcbe3: am 26bf2f7b: revise helpouts tags to use just one on each page 
automerge: f417409

* commit 'f417409eb2f721b4336f0b3376b4aaa806fd4434':
  revise helpouts tags to use just one on each page
 2014-11-01 14:44:25 +00:00
smain@google.com
07c98070fb am 9b00d795: am 0da6b005: revise helpouts tags to use just one on each page 
automerge: b2b3b37

* commit 'b2b3b37e2f59b3a627b150acadbe90c31b41f9f4':
  revise helpouts tags to use just one on each page
 2014-11-01 14:43:30 +00:00
Alex Klyubin
42340b9de0 am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs 
automerge: 2f1c76f

* commit '2f1c76f074e2299b4d4327f160b5c83ed99e280a':
  Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
 2014-11-01 14:41:35 +00:00
Ricardo Cervera
721b1d383f am 84ca5ddb: am bdb1cf0c: Merge "docs: Add links to Wear UI training from Design pages." into lmp-dev 
automerge: 84a48b0

* commit '84a48b0a4a9e2fd006dbba4343a1edb652124ec5':
  docs: Add links to Wear UI training from Design pages.
 2014-11-01 14:40:15 +00:00
Joe Fernandez
05827eb8f7 am 43fda072: am 922e6b6a: am 81fcc85c: Merge "docs:studio-update-814" into lmp-docs 
automerge: ed47742

* commit 'ed47742ff057c0a687c666a7629128ab6ab69470':
  docs:studio-update-814
 2014-11-01 14:38:38 +00:00
Mark Renouf
381dfa704d am 2182bf5a: am 3d875f80: am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE 
automerge: 024bc87  -s ours

* commit '024bc87645210fba6d78d74c61f867f4776cf6e4':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-11-01 14:37:38 +00:00
Scott Rowe
c94ad35b4a am dfeb6055: am b31c2b07: am 397eb67f: Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs 
automerge: 0948545

* commit '0948545e304be3f23e0e9bcdfefa49895ce0c3c0':
  docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905
 2014-11-01 14:35:05 +00:00
Mark Renouf
dc9ea936d0 am 6497dd73: am b5c5a0dc: am 7be03da0: (-s ours) Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev 
automerge: c26d97c  -s ours

* commit 'c26d97c26484c01c3dde9ac8f47bf0b7848c1e15':
  Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
 2014-11-01 14:34:05 +00:00
David Friedman
4fc0aacb1a am 62b532c7: am d2d8c553: am e91c37de: Fixes wrongly nested braces. Bug: 17499985 
automerge: cc7917d

* commit 'cc7917d0ee984fca49fe18b280a9f42947736fbd':
  Fixes wrongly nested braces. Bug: 17499985
 2014-11-01 14:31:58 +00:00
Jeff Brown
a71601a98c am 13f00f07: Implement multi-press behavior for power key. 
* commit '13f00f07d69f087cf186c23ae6c6fc938e2be561':
  Implement multi-press behavior for power key.
 2014-11-01 14:10:50 +00:00
Jeff Brown
0ed053ef53 am e333e674: Add a function to boost screen brightness temporarily. 
* commit 'e333e674a758c39885d4d9779a1aad387fb0e6aa':
  Add a function to boost screen brightness temporarily.
 2014-11-01 14:10:46 +00:00
Joe Fernandez
f16f6d9ed2 am 84045506: am 20207a83: am e8ad737d: docs: multidex - building apps with over 65K method references 
* commit '84045506140d895aaf4fdc5a090e89d657add120':
  docs: multidex - building apps with over 65K method references
 2014-11-01 14:10:43 +00:00
Joe Fernandez
a1caad91c7 am 0e4ef673: am 89e73a1c: am ea17fdec: Merge "docs:studio-updates-814v2" into lmp-docs 
* commit '0e4ef673696c0a2c352379b325ed281478512da3':
  docs:studio-updates-814v2
 2014-11-01 14:09:34 +00:00
smain@google.com
f417409eb2 am 515daeea: am 307bcbe3: am 26bf2f7b: revise helpouts tags to use just one on each page 
* commit '515daeead864ba47e04a1ca4c41b8f1cacaef95b':
  revise helpouts tags to use just one on each page
 2014-11-01 14:09:09 +00:00
smain@google.com
b2b3b37e2f am 9b00d795: am 0da6b005: revise helpouts tags to use just one on each page 
* commit '9b00d795d18b8a52b54f919e53b094e689bfc92e':
  revise helpouts tags to use just one on each page
 2014-11-01 14:09:05 +00:00
Alex Klyubin
2f1c76f074 am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs 
* commit 'dcf5af38bfd306af77613aa051393bf7d8e8fb44':
  Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
 2014-11-01 14:08:40 +00:00
Ricardo Cervera
84a48b0a4a am 84ca5ddb: am bdb1cf0c: Merge "docs: Add links to Wear UI training from Design pages." into lmp-dev 
* commit '84ca5ddb0844146408e241e7022c78477d9c4a6f':
  docs: Add links to Wear UI training from Design pages.
 2014-11-01 14:08:31 +00:00
Joe Fernandez
ed47742ff0 am 43fda072: am 922e6b6a: am 81fcc85c: Merge "docs:studio-update-814" into lmp-docs 
* commit '43fda072c227e7a98dbcb993dc20fb391c1f11fc':
  docs:studio-update-814
 2014-11-01 14:08:18 +00:00
Mark Renouf
024bc87645 am 2182bf5a: am 3d875f80: am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE 
* commit '2182bf5ac836fcc740fd5c65e76890ca53dce1b7':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-11-01 14:08:13 +00:00