Chris Craik
255fd80737
Merge "Simplify Z reordering logic"
2014-01-14 21:07:50 +00:00
Chris Craik
9f68c09626
Simplify Z reordering logic
...
Change-Id: I9e36f68d7be5cfd4d69a84a51824cb9a642fe18d
2014-01-14 12:52:41 -08:00
Matthew Xie
49da8370f6
am 91da5b68: Merge changes I86b3fa60,I7fa4e847 into klp-modular-dev
...
* commit '91da5b6830c4c26827c1dfac79e26785c16ecf32':
BLE peripheral mode (3/4): Add peripheral mode API.
NPE in BluetoothSocket.write()
2014-01-14 20:46:36 +00:00
quddusc
9c09d67536
am 84d5df5f: am f1809bae: am 65e3350c: am 916277e4: am e7eb5996: Merge "docs: Removed stray link. Bug: 11773486" into klp-docs
...
* commit '84d5df5fa6832aa89fae3f3f02cf6ee4e7a60b8b':
docs: Removed stray link. Bug: 11773486
2014-01-14 20:46:31 +00:00
quddusc
5913630869
am 0a17ad7a: am d689a06e: am 9bc3bde7: am 5e5c9833: am cec51d66: Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762" into klp-docs
...
* commit '0a17ad7a4b3e017b69b8639970368e8ce5f40003':
docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762
2014-01-14 20:46:25 +00:00
quddusc
fdba15bdcc
am 2bcc0782: am ee1b0bfd: am 9714cbdf: am 21627274: am cc29a170: Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515" into klp-docs
...
* commit '2bcc0782fda432035ed2e4e44ab723926a79e4b2':
docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515
2014-01-14 20:46:12 +00:00
quddusc
5cf5247261
am 876bd853: am 1746de33: am bcc83d01: am 7c865524: am 64231d01: Merge "docs: Fixed typo in IAB training doc. Bug: 10807741" into klp-docs
...
* commit '876bd853dc80d8e03afa11923edd11b05068c44c':
docs: Fixed typo in IAB training doc. Bug: 10807741
2014-01-14 20:46:07 +00:00
quddusc
18b7daf89f
am 2808073f: am 76a6dfaf: am e53c32a0: am c61e6bc6: am 72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251" into klp-docs
...
* commit '2808073f079e381d5c465bce454708972a7e8cd6':
docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251
2014-01-14 20:46:02 +00:00
Matthew Xie
91da5b6830
Merge changes I86b3fa60,I7fa4e847 into klp-modular-dev
...
* changes:
BLE peripheral mode (3/4): Add peripheral mode API.
NPE in BluetoothSocket.write()
2014-01-14 20:44:16 +00:00
quddusc
84d5df5fa6
am f1809bae: am 65e3350c: am 916277e4: am e7eb5996: Merge "docs: Removed stray link. Bug: 11773486" into klp-docs
...
* commit 'f1809bae546c8a6a435968b22527b0dcd325b4a1':
docs: Removed stray link. Bug: 11773486
2014-01-14 20:42:10 +00:00
quddusc
0a17ad7a4b
am d689a06e: am 9bc3bde7: am 5e5c9833: am cec51d66: Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762" into klp-docs
...
* commit 'd689a06eb7c3d16ecf057e3b355c7ae83f07af90':
docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762
2014-01-14 20:42:04 +00:00
quddusc
2bcc0782fd
am ee1b0bfd: am 9714cbdf: am 21627274: am cc29a170: Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515" into klp-docs
...
* commit 'ee1b0bfd640641c3b75f751568ead18720ddb60c':
docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515
2014-01-14 20:41:59 +00:00
quddusc
876bd853dc
am 1746de33: am bcc83d01: am 7c865524: am 64231d01: Merge "docs: Fixed typo in IAB training doc. Bug: 10807741" into klp-docs
...
* commit '1746de33894b8f9a20e14338908f82df9a699d82':
docs: Fixed typo in IAB training doc. Bug: 10807741
2014-01-14 20:41:54 +00:00
quddusc
2808073f07
am 76a6dfaf: am e53c32a0: am c61e6bc6: am 72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251" into klp-docs
...
* commit '76a6dfafa1c18078450f1af46d28636c74f8964c':
docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251
2014-01-14 20:41:49 +00:00
quddusc
f1809bae54
am 65e3350c: am 916277e4: am e7eb5996: Merge "docs: Removed stray link. Bug: 11773486" into klp-docs
...
* commit '65e3350cd241bb2e087459291051131bfe4c09ad':
docs: Removed stray link. Bug: 11773486
2014-01-14 20:39:28 +00:00
quddusc
d689a06eb7
am 9bc3bde7: am 5e5c9833: am cec51d66: Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762" into klp-docs
...
* commit '9bc3bde793f1e2413a222e9ca12f1049f3df87d4':
docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762
2014-01-14 20:39:24 +00:00
quddusc
ee1b0bfd64
am 9714cbdf: am 21627274: am cc29a170: Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515" into klp-docs
...
* commit '9714cbdf4aaa303e8b85faae022eefe83996e29e':
docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515
2014-01-14 20:39:19 +00:00
quddusc
1746de3389
am bcc83d01: am 7c865524: am 64231d01: Merge "docs: Fixed typo in IAB training doc. Bug: 10807741" into klp-docs
...
* commit 'bcc83d01966dac7fb1d9ac45ae119ad44ee2c471':
docs: Fixed typo in IAB training doc. Bug: 10807741
2014-01-14 20:39:14 +00:00
quddusc
76a6dfafa1
am e53c32a0: am c61e6bc6: am 72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251" into klp-docs
...
* commit 'e53c32a0aa6ccb1bd177ff3fa3335c5b58ca5919':
docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251
2014-01-14 20:39:09 +00:00
quddusc
65e3350cd2
am 916277e4: am e7eb5996: Merge "docs: Removed stray link. Bug: 11773486" into klp-docs
...
* commit '916277e415e6c8186b79dfe929114d36f80d9ee0':
docs: Removed stray link. Bug: 11773486
2014-01-14 12:35:29 -08:00
quddusc
9bc3bde793
am 5e5c9833: am cec51d66: Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762" into klp-docs
...
* commit '5e5c9833f533bb55964c7e981feacf191b63f09f':
docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762
2014-01-14 12:35:24 -08:00
quddusc
9714cbdf4a
am 21627274: am cc29a170: Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515" into klp-docs
...
* commit '21627274a0b1ddbf68599a3b5fe4bfa751885ddf':
docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515
2014-01-14 12:35:18 -08:00
quddusc
bcc83d0196
am 7c865524: am 64231d01: Merge "docs: Fixed typo in IAB training doc. Bug: 10807741" into klp-docs
...
* commit '7c865524048695f5dc471e6a357a142cf60495a7':
docs: Fixed typo in IAB training doc. Bug: 10807741
2014-01-14 12:35:14 -08:00
quddusc
e53c32a0aa
am c61e6bc6: am 72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251" into klp-docs
...
* commit 'c61e6bc613db3d0d5ce7661bda3fe51ecc2f9726':
docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251
2014-01-14 12:35:08 -08:00
quddusc
916277e415
am e7eb5996: Merge "docs: Removed stray link. Bug: 11773486" into klp-docs
...
* commit 'e7eb5996c2cca421eb7d28325918db18044fe4f7':
docs: Removed stray link. Bug: 11773486
2014-01-14 20:32:08 +00:00
quddusc
5e5c9833f5
am cec51d66: Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762" into klp-docs
...
* commit 'cec51d6620c1e46c8e4b52f492ff4ed6d75b85a6':
docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762
2014-01-14 20:32:04 +00:00
quddusc
21627274a0
am cc29a170: Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515" into klp-docs
...
* commit 'cc29a17056e4ae656182bf2fb36536b25ab4fcae':
docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515
2014-01-14 20:32:00 +00:00
quddusc
7c86552404
am 64231d01: Merge "docs: Fixed typo in IAB training doc. Bug: 10807741" into klp-docs
...
* commit '64231d01dead59752ff230570cbe07f206d5c9ec':
docs: Fixed typo in IAB training doc. Bug: 10807741
2014-01-14 20:31:55 +00:00
quddusc
c61e6bc613
am 72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251" into klp-docs
...
* commit '72159ab085c48f4451ccf44a436e8b2122716fd4':
docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251
2014-01-14 20:31:51 +00:00
quddusc
e7eb5996c2
Merge "docs: Removed stray link. Bug: 11773486" into klp-docs
2014-01-14 20:30:03 +00:00
quddusc
cec51d6620
Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762" into klp-docs
2014-01-14 20:29:46 +00:00
quddusc
cc29a17056
Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515" into klp-docs
2014-01-14 20:29:28 +00:00
quddusc
64231d01de
Merge "docs: Fixed typo in IAB training doc. Bug: 10807741" into klp-docs
2014-01-14 20:29:14 +00:00
John Spurlock
d29c609317
Merge "Allow lights-out + bar icon dimming on low-end devices."
2014-01-14 20:29:01 +00:00
quddusc
72159ab085
Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251" into klp-docs
2014-01-14 20:28:56 +00:00
John Spurlock
4f111f988d
Merge "Revert "Support lights-out + bar icon dimming on low-end devices.""
2014-01-14 20:28:36 +00:00
John Spurlock
3dfb10506b
Revert "Support lights-out + bar icon dimming on low-end devices."
...
This reverts commit 8351f348cb6ebdc2a48ad41a21db024bf96c91fa.
Change-Id: I0b24fa7d978a69581e294c53bddc50053fb574b7
2014-01-14 20:28:05 +00:00
John Spurlock
88926a5482
am 4b67b88e: am cce06eda: am b3436359: am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs
...
* commit '4b67b88e344a147317fc6b32e5364d4cfabf1e1d':
Docfixes: three typos and escape */*.
2014-01-14 20:04:25 +00:00
John Spurlock
4b67b88e34
am cce06eda: am b3436359: am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs
...
* commit 'cce06eda6bd6af957b261f66eb8ea3623fe09caf':
Docfixes: three typos and escape */*.
2014-01-14 20:00:42 +00:00
John Spurlock
cce06eda6b
am b3436359: am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs
...
* commit 'b34363590953e4efd70168cdf03386d1e469a548':
Docfixes: three typos and escape */*.
2014-01-14 19:57:02 +00:00
John Spurlock
b343635909
am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs
...
* commit 'e05190eae74be57dd517bb5afbccf901543329bf':
Docfixes: three typos and escape */*.
2014-01-14 11:54:25 -08:00
John Spurlock
fd0e6c0d6f
Allow lights-out + bar icon dimming on low-end devices.
...
Maintain fallback to OPAQUE mode on low-end devices in place of the
translucent modes.
Bug: 12546110
Change-Id: Ia3582c305cb09aadd56c6aa58b039a174675c79a
2014-01-14 14:51:23 -05:00
John Spurlock
e05190eae7
am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs
...
* commit '85f98508366e8422f71553d2a5e682eb804c7419':
Docfixes: three typos and escape */*.
2014-01-14 19:50:38 +00:00
John Spurlock
85f9850836
Merge "Docfixes: three typos and escape */*." into klp-docs
2014-01-14 19:48:13 +00:00
John Spurlock
8d45cdf387
Merge "Support lights-out + bar icon dimming on low-end devices."
2014-01-14 18:37:03 +00:00
Ying Wang
b114402f82
Merge "Fix SDK build."
2014-01-14 18:11:00 +00:00
Ying Wang
640f10bc4f
Fix SDK build.
...
Change-Id: I57b400d5cb8e03abdfd234e79e4698347228bfa0
2014-01-14 10:09:35 -08:00
John Spurlock
8351f348cb
Support lights-out + bar icon dimming on low-end devices.
...
Bug: 12546110
Change-Id: Ie2d2cc4acfee3f4a70542c5ebf9f2e9d69bffb33
2014-01-14 18:07:55 +00:00
Ricardo Cervera
e7844c60db
am ca2d8954: am 82ec0954: am afe90d80: am 7dde7879: am 1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs
...
* commit 'ca2d89548fa32740cb2dcf7745f0bec2fab970c7':
docs: Fixed typo in AlertDialog code snippet.
2014-01-14 17:49:43 +00:00
Ricardo Cervera
ca2d89548f
am 82ec0954: am afe90d80: am 7dde7879: am 1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs
...
* commit '82ec09547423f7166e271226825ddd686cbab8cb':
docs: Fixed typo in AlertDialog code snippet.
2014-01-14 17:47:04 +00:00