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
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
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
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
2014-11-01 15:20:46 +00:00
Jeff Brown
e05fb136cd
am 13f00f07: Implement multi-press behavior for power key. automerge: a71601a
...
automerge: 634ffc4
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
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
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
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
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
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
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
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
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
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
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
2014-11-01 14:54:06 +00:00
Jeff Brown
634ffc4211
am 13f00f07: Implement multi-press behavior for power key.
...
automerge: a71601a
2014-11-01 14:52:11 +00:00
Jeff Brown
a80162f0d1
am e333e674: Add a function to boost screen brightness temporarily.
...
automerge: 0ed053e
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
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
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
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
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
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
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
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
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
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
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
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
Scott Rowe
0948545e30
am dfeb6055: am b31c2b07: am 397eb67f: Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs
...
* commit 'dfeb60558e87879c9575b32281e9c22fec623198':
docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905
2014-11-01 14:07:41 +00:00
Mark Renouf
c26d97c264
am 6497dd73: am b5c5a0dc: am 7be03da0: (-s ours) Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev
...
* commit '6497dd732565f4cadfe0e808d3075de95ecff80e':
Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
2014-11-01 14:07:35 +00:00
David Friedman
cc7917d0ee
am 62b532c7: am d2d8c553: am e91c37de: Fixes wrongly nested braces. Bug: 17499985
...
* commit '62b532c7f4d7e6a868b8b007829dab9622ee5423':
Fixes wrongly nested braces. Bug: 17499985
2014-11-01 14:07:19 +00:00
Yohei Yukawa
e504335f7f
am f5051e9b: am 22cbf54c: Merge "Conditionally allow non-primay profiles to use TextServices" into lmp-mr1-dev automerge: b1f5643
...
* commit 'f5051e9b6771de3558d2b8adf7ef233721dad1d6':
Conditionally allow non-primay profiles to use TextServices
2014-11-01 03:24:18 +00:00
Yohei Yukawa
f5051e9b67
am 22cbf54c: Merge "Conditionally allow non-primay profiles to use TextServices" into lmp-mr1-dev
...
automerge: b1f5643
2014-11-01 02:19:02 +00:00
Yohei Yukawa
b1f56430d3
am 22cbf54c: Merge "Conditionally allow non-primay profiles to use TextServices" into lmp-mr1-dev
...
* commit '22cbf54ca0c64344cd28590446a02e521ca914f7':
Conditionally allow non-primay profiles to use TextServices
2014-11-01 02:15:47 +00:00
Jeff Brown
13f00f07d6
Implement multi-press behavior for power key.
...
Added support for brightness boost or setting theater
mode from the power key. This behavior is disabled by default and
must be enabled for specific products in a config.xml overlay.
Because the power key is already so overloaded, refactored the
code to split out handling of the similar ENDCALL button and
renamed all of the state that has to do with screenshot chord
detection to avoid confusion.
Bug: 17949215
Change-Id: Id282133188e3781472aabb64fabcee7b98d0c77d
2014-10-31 19:15:33 -07:00
