git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Zhijun He [Wed, 15 Jan 2014 02:19:38 +0000 (18:19 -0800)]

am 78146ecb: Camera2: Update AF mode related javadoc specs

* commit '78146ecb24871302a4c4dc0a7341044a06d29ee8':
Camera2: Update AF mode related javadoc specs

commit | commitdiff | tree

Zhijun He [Wed, 15 Jan 2014 02:12:13 +0000 (18:12 -0800)]

Camera2: Update AF mode related javadoc specs

Change-Id: If7a0de76f660ade25d9fdb92458fbe7e9752d0dd

commit | commitdiff | tree

Zhijun He [Wed, 15 Jan 2014 02:03:18 +0000 (18:03 -0800)]

am fb46c644: Camera2: metadata tag javadoc update

* commit 'fb46c644ceffdd476268c35c7992c4e445bde0a5':
Camera2: metadata tag javadoc update

commit | commitdiff | tree

Zhijun He [Wed, 15 Jan 2014 01:57:23 +0000 (17:57 -0800)]

Camera2: metadata tag javadoc update

Change-Id: I66700340780f3185796f25c054487f439f24a6fb

commit | commitdiff | tree

Alan Viverette [Wed, 15 Jan 2014 01:33:47 +0000 (17:33 -0800)]

am 0ae6a7a2: Merge "Cache display lists for Drawables"

* commit '0ae6a7a2cc7b11087b823f1e41ecc77b14a5e472':
Cache display lists for Drawables

commit | commitdiff | tree

Alan Viverette [Wed, 15 Jan 2014 01:31:00 +0000 (01:31 +0000)]

Merge "Cache display lists for Drawables"

commit | commitdiff | tree

Glenn Kasten [Wed, 15 Jan 2014 01:30:14 +0000 (17:30 -0800)]

am 4896cb59: Merge "Use AUDIO_SESSION_ALLOCATE instead of hard-coded 0"

* commit '4896cb59a443370252d230793ee030021f719821':
Use AUDIO_SESSION_ALLOCATE instead of hard-coded 0

commit | commitdiff | tree

Glenn Kasten [Wed, 15 Jan 2014 01:27:58 +0000 (01:27 +0000)]

Merge "Use AUDIO_SESSION_ALLOCATE instead of hard-coded 0"

commit | commitdiff | tree

Jason Sams [Wed, 15 Jan 2014 01:26:45 +0000 (17:26 -0800)]

am bdc223a7: Merge "Check that bound allocations are 1D"

* commit 'bdc223a7f2b84ecacac0487b48d8005a24739668':
Check that bound allocations are 1D

commit | commitdiff | tree

Jason Sams [Wed, 15 Jan 2014 01:23:50 +0000 (01:23 +0000)]

Merge "Check that bound allocations are 1D"

commit | commitdiff | tree

Alan Viverette [Wed, 15 Jan 2014 01:16:29 +0000 (17:16 -0800)]

Cache display lists for Drawables

Change-Id: I86e2dd4cd4ac8871f4131450cb9082c2b8de2eed

commit | commitdiff | tree

Craig Mautner [Wed, 15 Jan 2014 01:13:45 +0000 (17:13 -0800)]

am 3a43aa9c: am 9cfb2e5f: Merge "Retain stacks even if they are empty." into klp-modular-dev

* commit '3a43aa9cef79324dd149a47c5a73ce1fa8ed95b3':
Retain stacks even if they are empty.

commit | commitdiff | tree

Adrian Roos [Wed, 15 Jan 2014 01:13:37 +0000 (17:13 -0800)]

am a3fa8bf1: Merge "Make brightness panel behave like volume panel."

* commit 'a3fa8bf1594435e7db4a57df05527bca6edde0df':
Make brightness panel behave like volume panel.

commit | commitdiff | tree

Craig Mautner [Wed, 15 Jan 2014 01:10:51 +0000 (01:10 +0000)]

am 9cfb2e5f: Merge "Retain stacks even if they are empty." into klp-modular-dev

* commit '9cfb2e5f4c95c16d8ca531808f60486f214f9039':
Retain stacks even if they are empty.

commit | commitdiff | tree

Adrian Roos [Wed, 15 Jan 2014 01:10:32 +0000 (01:10 +0000)]

Merge "Make brightness panel behave like volume panel."

commit | commitdiff | tree

Craig Mautner [Wed, 15 Jan 2014 01:07:15 +0000 (01:07 +0000)]

Merge "Retain stacks even if they are empty." into klp-modular-dev

commit | commitdiff | tree

Alan Viverette [Wed, 15 Jan 2014 01:01:42 +0000 (17:01 -0800)]

am 4b95cc7e: Quick fix for updating the FastScroller long list property

* commit '4b95cc7ef7f1364799eba3bfa8830515282dcab7':
Quick fix for updating the FastScroller long list property

commit | commitdiff | tree

Alan Viverette [Wed, 15 Jan 2014 00:54:02 +0000 (16:54 -0800)]

Quick fix for updating the FastScroller long list property

BUG: 12553181
Change-Id: I5305b0ec4ae8e069fc98d45dc3d5daaa0628ca79

commit | commitdiff | tree

Jason Sams [Wed, 15 Jan 2014 00:18:14 +0000 (16:18 -0800)]

Check that bound allocations are 1D

We do not support higher order bound allocations. The
stride is not available to the script so they cannot
walk the allocation correctly.

Change-Id: I9447a5d43c3ae1b88fc9522628a17bd5a317ffc6

commit | commitdiff | tree

Adrian Roos [Sat, 11 Jan 2014 01:42:51 +0000 (17:42 -0800)]

Make brightness panel behave like volume panel.

Moves the brightness panel to the same spot as the volume panel. To avoid a conflict with the volume panel, brightness is dismissed when the volume keys are pressed.

Bug: 7217009
Bug: 7217154
Change-Id: Ib8331a1e390cbedca40fa237243ea2cfd088e521

commit | commitdiff | tree

John Spurlock [Tue, 14 Jan 2014 21:33:24 +0000 (13:33 -0800)]

am 4a5eb8fe: Merge "Add demo-mode command to hide notification icons."

* commit '4a5eb8fe18337597ece6ca1cedbbb56a0b309c39':
Add demo-mode command to hide notification icons.

commit | commitdiff | tree

John Spurlock [Tue, 14 Jan 2014 21:29:57 +0000 (21:29 +0000)]

Merge "Add demo-mode command to hide notification icons."

commit | commitdiff | tree

John Spurlock [Tue, 14 Jan 2014 21:20:39 +0000 (16:20 -0500)]

Add demo-mode command to hide notification icons.

Bug:11285517
Change-Id: I341feadbf164afd34fef192a541f14a2ff67e8e2

commit | commitdiff | tree

Chris Craik [Tue, 14 Jan 2014 21:09:52 +0000 (13:09 -0800)]

am 255fd807: Merge "Simplify Z reordering logic"

* commit '255fd80737432fb1d9d0590206f7c103176dcd2c':
Simplify Z reordering logic

commit | commitdiff | tree

Chris Craik [Tue, 14 Jan 2014 21:07:49 +0000 (21:07 +0000)]

Merge "Simplify Z reordering logic"

commit | commitdiff | tree

Chris Craik [Fri, 10 Jan 2014 18:30:57 +0000 (10:30 -0800)]

Simplify Z reordering logic

Change-Id: I9e36f68d7be5cfd4d69a84a51824cb9a642fe18d

commit | commitdiff | tree

Matthew Xie [Tue, 14 Jan 2014 20:49:09 +0000 (12:49 -0800)]

am 49da8370: am 91da5b68: Merge changes I86b3fa60,I7fa4e847 into klp-modular-dev

* commit '49da8370f67da818e1fb072e73268b1f456530c3':
BLE peripheral mode (3/4): Add peripheral mode API.
NPE in BluetoothSocket.write()

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:49:07 +0000 (12:49 -0800)]

am 9c09d675: am 84d5df5f: am f1809bae: am 65e3350c: am 916277e4: am e7eb5996: Merge "docs: Removed stray link. Bug: 11773486" into klp-docs

* commit '9c09d6753624f858b526123dd4ee3d40a5582eea':
docs: Removed stray link. Bug: 11773486

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:49:04 +0000 (12:49 -0800)]

am 59136308: 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" in

* commit '59136308695e20bf57b78552a1a57de20460756e':
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

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:49:01 +0000 (12:49 -0800)]

am fdba15bd: 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 'fdba15bdcc8363b3a790fb6fcb6903cab9a60c52':
docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:48:59 +0000 (12:48 -0800)]

am 5cf52472: am 876bd853: am 1746de33: am bcc83d01: am 7c865524: am 64231d01: Merge "docs: Fixed typo in IAB training doc. Bug: 10807741" into klp-docs

* commit '5cf52472610e80293a7ef92378844a5aed6c1af5':
docs: Fixed typo in IAB training doc. Bug: 10807741

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:48:56 +0000 (12:48 -0800)]

am 18b7daf8: 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 '18b7daf89fce7cdd18554727809b3835e8e1e916':
docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251

commit | commitdiff | tree

Matthew Xie [Tue, 14 Jan 2014 20:46:36 +0000 (20:46 +0000)]

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()

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:46:31 +0000 (20:46 +0000)]

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

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:46:25 +0000 (20:46 +0000)]

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

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:46:12 +0000 (20:46 +0000)]

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

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:46:07 +0000 (20:46 +0000)]

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

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:46:02 +0000 (20:46 +0000)]

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

commit | commitdiff | tree

Matthew Xie [Tue, 14 Jan 2014 20:44:16 +0000 (20:44 +0000)]

Merge changes I86b3fa60,I7fa4e847 into klp-modular-dev

* changes:
BLE peripheral mode (3/4): Add peripheral mode API.
NPE in BluetoothSocket.write()

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:42:10 +0000 (20:42 +0000)]

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

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:42:04 +0000 (20:42 +0000)]

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

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:41:59 +0000 (20:41 +0000)]

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

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:41:54 +0000 (20:41 +0000)]

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

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:41:49 +0000 (20:41 +0000)]

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

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:39:28 +0000 (20:39 +0000)]

am 65e3350c: am 916277e4: am e7eb5996: Merge "docs: Removed stray link. Bug: 11773486" into klp-docs

* commit '65e3350cd241bb2e087459291051131bfe4c09ad':
docs: Removed stray link. Bug: 11773486

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:39:24 +0000 (20:39 +0000)]

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

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:39:19 +0000 (20:39 +0000)]

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

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:39:14 +0000 (20:39 +0000)]

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

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:39:09 +0000 (20:39 +0000)]

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

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:35:29 +0000 (12:35 -0800)]

am 916277e4: am e7eb5996: Merge "docs: Removed stray link. Bug: 11773486" into klp-docs

* commit '916277e415e6c8186b79dfe929114d36f80d9ee0':
docs: Removed stray link. Bug: 11773486

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:35:24 +0000 (12:35 -0800)]

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

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:35:18 +0000 (12:35 -0800)]

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

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:35:14 +0000 (12:35 -0800)]

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

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:35:08 +0000 (12:35 -0800)]

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

commit | commitdiff | tree

John Spurlock [Tue, 14 Jan 2014 20:32:19 +0000 (12:32 -0800)]

am d29c6093: Merge "Allow lights-out + bar icon dimming on low-end devices."

* commit 'd29c6093177ed08ecc9e9691f5594ec73ffc8828':
Allow lights-out + bar icon dimming on low-end devices.

commit | commitdiff | tree

John Spurlock [Tue, 14 Jan 2014 20:32:17 +0000 (12:32 -0800)]

am 4f111f98: Merge "Revert "Support lights-out + bar icon dimming on low-end devices.""

* commit '4f111f988db5a8b5fed6eb465891ed848a4ad65d':
Revert "Support lights-out + bar icon dimming on low-end devices."

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:32:08 +0000 (20:32 +0000)]

am e7eb5996: Merge "docs: Removed stray link. Bug: 11773486" into klp-docs

* commit 'e7eb5996c2cca421eb7d28325918db18044fe4f7':
docs: Removed stray link. Bug: 11773486

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:32:04 +0000 (20:32 +0000)]

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

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:32:00 +0000 (20:32 +0000)]

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

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:31:55 +0000 (20:31 +0000)]

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

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:31:51 +0000 (20:31 +0000)]

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

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:30:03 +0000 (20:30 +0000)]

Merge "docs: Removed stray link. Bug: 11773486" into klp-docs

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:29:46 +0000 (20:29 +0000)]

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 | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:29:28 +0000 (20:29 +0000)]

Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515" into klp-docs

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:29:13 +0000 (20:29 +0000)]

Merge "docs: Fixed typo in IAB training doc. Bug: 10807741" into klp-docs

commit | commitdiff | tree

John Spurlock [Tue, 14 Jan 2014 20:29:01 +0000 (20:29 +0000)]

Merge "Allow lights-out + bar icon dimming on low-end devices."

commit | commitdiff | tree

quddusc [Tue, 14 Jan 2014 20:28:55 +0000 (20:28 +0000)]

Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251" into klp-docs

commit | commitdiff | tree

John Spurlock [Tue, 14 Jan 2014 20:28:35 +0000 (20:28 +0000)]

Merge "Revert "Support lights-out + bar icon dimming on low-end devices.""

commit | commitdiff | tree

John Spurlock [Tue, 14 Jan 2014 20:28:05 +0000 (20:28 +0000)]

Revert "Support lights-out + bar icon dimming on low-end devices."

This reverts commit 8351f348cb6ebdc2a48ad41a21db024bf96c91fa.

Change-Id: I0b24fa7d978a69581e294c53bddc50053fb574b7

commit | commitdiff | tree

John Spurlock [Tue, 14 Jan 2014 20:07:23 +0000 (12:07 -0800)]

am 88926a54: am 4b67b88e: am cce06eda: am b3436359: am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs

* commit '88926a5482552ddf2f4906df581bbbf1cc9d03aa':
Docfixes: three typos and escape */*.

commit | commitdiff | tree

John Spurlock [Tue, 14 Jan 2014 20:04:25 +0000 (20:04 +0000)]

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 */*.

commit | commitdiff | tree

John Spurlock [Tue, 14 Jan 2014 20:00:42 +0000 (20:00 +0000)]

am cce06eda: am b3436359: am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs

* commit 'cce06eda6bd6af957b261f66eb8ea3623fe09caf':
Docfixes: three typos and escape */*.

commit | commitdiff | tree

John Spurlock [Tue, 14 Jan 2014 19:57:02 +0000 (19:57 +0000)]

am b3436359: am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs

* commit 'b34363590953e4efd70168cdf03386d1e469a548':
Docfixes: three typos and escape */*.

commit | commitdiff | tree

John Spurlock [Tue, 14 Jan 2014 19:54:25 +0000 (11:54 -0800)]

am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs

* commit 'e05190eae74be57dd517bb5afbccf901543329bf':
Docfixes: three typos and escape */*.

commit | commitdiff | tree

John Spurlock [Tue, 14 Jan 2014 19:51:23 +0000 (14:51 -0500)]

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

commit | commitdiff | tree

John Spurlock [Tue, 14 Jan 2014 19:50:38 +0000 (19:50 +0000)]

am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs

* commit '85f98508366e8422f71553d2a5e682eb804c7419':
Docfixes: three typos and escape */*.

commit | commitdiff | tree

John Spurlock [Tue, 14 Jan 2014 19:48:12 +0000 (19:48 +0000)]

Merge "Docfixes: three typos and escape */*." into klp-docs

commit | commitdiff | tree

John Spurlock [Tue, 14 Jan 2014 18:39:12 +0000 (10:39 -0800)]

am 8d45cdf3: Merge "Support lights-out + bar icon dimming on low-end devices."

* commit '8d45cdf3879594383da54de648cc2a72f6138e3c':
Support lights-out + bar icon dimming on low-end devices.

commit | commitdiff | tree

John Spurlock [Tue, 14 Jan 2014 18:37:03 +0000 (18:37 +0000)]

Merge "Support lights-out + bar icon dimming on low-end devices."

commit | commitdiff | tree

Ying Wang [Tue, 14 Jan 2014 18:13:27 +0000 (10:13 -0800)]

am b114402f: Merge "Fix SDK build."

* commit 'b114402f8279b1215d4f8572cb94ed063b240624':
Fix SDK build.

commit | commitdiff | tree

Ying Wang [Tue, 14 Jan 2014 18:11:00 +0000 (18:11 +0000)]

Merge "Fix SDK build."

commit | commitdiff | tree

Ying Wang [Tue, 14 Jan 2014 18:09:35 +0000 (10:09 -0800)]

Fix SDK build.

Change-Id: I57b400d5cb8e03abdfd234e79e4698347228bfa0

commit | commitdiff | tree

John Spurlock [Tue, 14 Jan 2014 17:48:02 +0000 (12:48 -0500)]

Support lights-out + bar icon dimming on low-end devices.

Bug: 12546110
Change-Id: Ie2d2cc4acfee3f4a70542c5ebf9f2e9d69bffb33

commit | commitdiff | tree

Ricardo Cervera [Tue, 14 Jan 2014 17:53:49 +0000 (09:53 -0800)]

am e7844c60: am ca2d8954: am 82ec0954: am afe90d80: am 7dde7879: am 1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs

* commit 'e7844c60dbd9d57246ba83b9776959525972ef92':
docs: Fixed typo in AlertDialog code snippet.

commit | commitdiff | tree

Ricardo Cervera [Tue, 14 Jan 2014 17:49:43 +0000 (17:49 +0000)]

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.

commit | commitdiff | tree

Ricardo Cervera [Tue, 14 Jan 2014 17:47:04 +0000 (17:47 +0000)]

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.

commit | commitdiff | tree

Ricardo Cervera [Tue, 14 Jan 2014 17:43:25 +0000 (17:43 +0000)]

am afe90d80: am 7dde7879: am 1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs

* commit 'afe90d80563bf6e236f7be6d6312f269a1919cb8':
docs: Fixed typo in AlertDialog code snippet.

commit | commitdiff | tree

Ricardo Cervera [Tue, 14 Jan 2014 17:39:29 +0000 (09:39 -0800)]

am 7dde7879: am 1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs

* commit '7dde7879a4561a3ec9ffc48921a4d074e40aa74e':
docs: Fixed typo in AlertDialog code snippet.

commit | commitdiff | tree

Ricardo Cervera [Tue, 14 Jan 2014 17:36:07 +0000 (17:36 +0000)]

am 1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs

* commit '1a21c16b2bd74c022d6b83177027b78992dc42b5':
docs: Fixed typo in AlertDialog code snippet.

commit | commitdiff | tree

Ricardo Cervera [Tue, 14 Jan 2014 17:34:21 +0000 (17:34 +0000)]

Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs

commit | commitdiff | tree

Marco Nelissen [Tue, 14 Jan 2014 16:28:44 +0000 (08:28 -0800)]

am 633f8c22: am 28f032e6: am e2c046fe: am 13249411: am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig"

* commit '633f8c227bfbc8962d516a7fae4a8bf306d0aa53':
Add NULL check in updateProxyConfig

commit | commitdiff | tree

Marco Nelissen [Tue, 14 Jan 2014 16:25:18 +0000 (16:25 +0000)]

am 28f032e6: am e2c046fe: am 13249411: am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig"

* commit '28f032e6a66d74d570b36672939000707455acb1':
Add NULL check in updateProxyConfig

commit | commitdiff | tree

Marco Nelissen [Tue, 14 Jan 2014 16:21:43 +0000 (16:21 +0000)]

am e2c046fe: am 13249411: am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig"

* commit 'e2c046fe7c5eefb49f710bc417d54448c133cc93':
Add NULL check in updateProxyConfig

commit | commitdiff | tree

Marco Nelissen [Tue, 14 Jan 2014 16:18:02 +0000 (16:18 +0000)]

am 13249411: am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig"

* commit '13249411b1c7dd4a476eec6905998217636a9344':
Add NULL check in updateProxyConfig

commit | commitdiff | tree

Marco Nelissen [Tue, 14 Jan 2014 16:15:13 +0000 (08:15 -0800)]

am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig"

* commit 'a9045d24a73faa6aa1e8ad204a1e14a53711a824':
Add NULL check in updateProxyConfig

commit | commitdiff | tree

Marco Nelissen [Tue, 14 Jan 2014 16:11:39 +0000 (08:11 -0800)]

am 337aa376: Merge "Add NULL check in updateProxyConfig"

* commit '337aa376c09bb97a48afe075b4018f030445534f':
Add NULL check in updateProxyConfig

commit | commitdiff | tree

Marco Nelissen [Tue, 14 Jan 2014 16:08:18 +0000 (16:08 +0000)]

Merge "Add NULL check in updateProxyConfig"

commit | commitdiff | tree

Michael Jurka [Tue, 14 Jan 2014 13:50:33 +0000 (05:50 -0800)]

am 35f922d1: Update system wallpaper cropper with latest changes from Launcher3 cropper

* commit '35f922d1d038d14f94b584baae324513610f7813':
Update system wallpaper cropper with latest changes from Launcher3 cropper

commit | commitdiff | tree

Michael Jurka [Tue, 14 Jan 2014 13:08:07 +0000 (14:08 +0100)]

Update system wallpaper cropper with latest changes from Launcher3 cropper

commit | commitdiff | tree

Narayan Kamath [Tue, 14 Jan 2014 10:29:32 +0000 (02:29 -0800)]

am 3a248a14: am ec70f809: am d34950cf: am 80b0496a: am 2db26788: am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""

* commit '3a248a14938cc723942e68fc06ed2589efb53a4b':
Revert "Hide AssetInputStream.getAssetInt."

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help