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

Alan Viverette [Wed, 3 Dec 2014 00:31:33 +0000 (00:31 +0000)]

am 6c23ba0d: am a6779bc5: am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev

* commit '6c23ba0d8d39aed98197071c7cf9ffc0b6c633b5':
Deprecate one-arg getDrawableForDensity, update currents.txt

commit | commitdiff | tree

Svetoslav [Wed, 3 Dec 2014 00:31:23 +0000 (00:31 +0000)]

am 935702b6: am 95482c28: am cdd3356d: Merge "Allow more space for the printer spinner to avoid truncation." into lmp-mr1-dev

* commit '935702b6d5873d028c5f5c0e35e46a35b5e11a22':
Allow more space for the printer spinner to avoid truncation.

commit | commitdiff | tree

Alan Viverette [Wed, 3 Dec 2014 00:31:13 +0000 (00:31 +0000)]

am 0cd6296c: am 63c7a655: am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev

* commit '0cd6296c0afb92f63487247ef4c9c73715113926':
Deprecate Resources.getDrawable(int) in favor of the two-arg version

commit | commitdiff | tree

Ricardo Cervera [Wed, 3 Dec 2014 00:31:07 +0000 (00:31 +0000)]

am 24d40b30: am ce9936a8: am 152470a2: am 8c71df8d: am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne

* commit '24d40b302e5dabc6c435b6549ef5801540edfca8':
docs: Long press to dismiss fix by Wayne

commit | commitdiff | tree

Adam Lesinski [Wed, 3 Dec 2014 00:30:56 +0000 (00:30 +0000)]

am 9438ad15: am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c

* commit '9438ad1599716176fb6c593e77a2e93b265bbcb5':
RRO idmap: pad with 0xffffffff, not 0x00000000
RRO: reintroduce lost ResTable insert of assets

commit | commitdiff | tree

Chris Wren [Wed, 3 Dec 2014 00:30:44 +0000 (00:30 +0000)]

am 723bce8a: am 47a5cb12: am acd01ff0: Merge "Keep deleteIntent when copying Notification attributes"

* commit '723bce8a0d4fa900ca4344c03e5e82b5881fcf19':
Keep deleteIntent when copying Notification attributes

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 00:30:35 +0000 (00:30 +0000)]

am 97267def: (-s ours) am e3a16016: (-s ours) am 92ad4dd0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '97267def8219d6ad3d8a96449b08653ae1bd6832':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 00:30:30 +0000 (00:30 +0000)]

am 52632ad8: (-s ours) am 74724945: (-s ours) am fccaa58c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '52632ad881c96e785518e18fde1a72e6f6e25a42':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 00:30:26 +0000 (00:30 +0000)]

am 3b027a37: (-s ours) am 3bcc97e7: (-s ours) am 6774911e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '3b027a374e6e8ba084b6dcfcdbf81ee581e20517':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 00:30:22 +0000 (00:30 +0000)]

am e105a70a: (-s ours) am 261db4f3: (-s ours) am 30460ae3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'e105a70ae1dcfdbca15e188f27d7d3a1bea788d2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Jinsuk Kim [Wed, 3 Dec 2014 00:30:08 +0000 (00:30 +0000)]

am eb6c6d63: am 566d15f6: am fb020862: Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev

* commit 'eb6c6d634774d85eceac135a91fdeaf3a884152e':
CEC: Set the parameter of <System Audio Mode Request> right

commit | commitdiff | tree

Alan Viverette [Wed, 3 Dec 2014 00:29:46 +0000 (00:29 +0000)]

am 73d28900: resolved conflicts for merge of 850cdbe5 to lmp-mr1-dev-plus-aosp

* commit '73d28900e96b84b2833954669f1db95326f3d6e0':
Consider RTL layout in DPAD navigation in AbsSeekBar

commit | commitdiff | tree

Craig Mautner [Wed, 3 Dec 2014 00:29:30 +0000 (00:29 +0000)]

am 61a7b7cf: am e4e7d2cd: am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev

* commit '61a7b7cff57dc66a1f64c9d7519fc1f6844b6915':
Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED

commit | commitdiff | tree

Stuart Scott [Wed, 3 Dec 2014 00:29:21 +0000 (00:29 +0000)]

am cc4cd6e1: am 15b2d9ab: am 4e779ecd: Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev

* commit 'cc4cd6e1abe81d1edda7f1489dbd26298d38a699':
Subscription Info density-dependent text size and localized SIM slot index

commit | commitdiff | tree

Nick Kralevich [Wed, 3 Dec 2014 00:22:57 +0000 (16:22 -0800)]

resolved conflicts for merge of ef9b1643 to master

Change-Id: Ifcde272f882e55998b16e02cca1e827dec35ce6f

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:45:25 +0000 (23:45 +0000)]

am a6779bc5: am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev

* commit 'a6779bc51772aae2ba4cc94db2ae47b76a2cc972':
Deprecate one-arg getDrawableForDensity, update currents.txt

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:37:47 +0000 (23:37 +0000)]

am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev

* commit '9a888816de21c4e146acbd608fdea110a299f42d':
Deprecate one-arg getDrawableForDensity, update currents.txt

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:30:52 +0000 (23:30 +0000)]

Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev

commit | commitdiff | tree

Svetoslav [Tue, 2 Dec 2014 23:30:21 +0000 (23:30 +0000)]

am 95482c28: am cdd3356d: Merge "Allow more space for the printer spinner to avoid truncation." into lmp-mr1-dev

* commit '95482c28f5b6fba7427770212374c3c8d22b280e':
Allow more space for the printer spinner to avoid truncation.

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:26:33 +0000 (15:26 -0800)]

Deprecate one-arg getDrawableForDensity, update currents.txt

BUG: 18579576
Change-Id: I7df6ec2952ab121e2be8ae0a016ccf36f6fba2ff

commit | commitdiff | tree

Svetoslav [Tue, 2 Dec 2014 23:23:40 +0000 (23:23 +0000)]

am cdd3356d: Merge "Allow more space for the printer spinner to avoid truncation." into lmp-mr1-dev

* commit 'cdd3356da9386bff842d9a29fad09a1d5edc1e73':
Allow more space for the printer spinner to avoid truncation.

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:19:28 +0000 (23:19 +0000)]

am 63c7a655: am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev

* commit '63c7a655beab21da934d21bb4004889bfb6e4417':
Deprecate Resources.getDrawable(int) in favor of the two-arg version

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 23:19:23 +0000 (23:19 +0000)]

am ce9936a8: am 152470a2: am 8c71df8d: am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne

* commit 'ce9936a85e6b73b47e0c9a6b4c3495dffae4a079':
docs: Long press to dismiss fix by Wayne

commit | commitdiff | tree

Svetoslav [Tue, 2 Dec 2014 23:16:36 +0000 (23:16 +0000)]

Merge "Allow more space for the printer spinner to avoid truncation." into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:11:36 +0000 (23:11 +0000)]

am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev

* commit '1b33396ee4047e79777495a8682b9117e88bba5c':
Deprecate Resources.getDrawable(int) in favor of the two-arg version

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 23:11:30 +0000 (23:11 +0000)]

am 152470a2: am 8c71df8d: am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne

* commit '152470a29212479c8ccc9e2c1a9f26188a5b7411':
docs: Long press to dismiss fix by Wayne

commit | commitdiff | tree

Adam Lesinski [Tue, 2 Dec 2014 23:07:43 +0000 (23:07 +0000)]

am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c

* commit 'e580d6617f67a1db5eff7ffe5450684cfc7e1a2b':
RRO idmap: pad with 0xffffffff, not 0x00000000
RRO: reintroduce lost ResTable insert of assets

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:07:01 +0000 (23:07 +0000)]

Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 23:05:07 +0000 (23:05 +0000)]

am 8c71df8d: am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne

* commit '8c71df8dd89c68128e709eab60da8105772d6194':
docs: Long press to dismiss fix by Wayne

commit | commitdiff | tree

Adam Lesinski [Tue, 2 Dec 2014 23:00:06 +0000 (23:00 +0000)]

am e89a2865: Merge changes If2c7e09f,Ie21f227c

* commit 'e89a286541e242ad96705fcdd1fe2c6a9eafb4a0':
RRO idmap: pad with 0xffffffff, not 0x00000000
RRO: reintroduce lost ResTable insert of assets

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 22:58:08 +0000 (14:58 -0800)]

Deprecate Resources.getDrawable(int) in favor of the two-arg version

This is a landmine for developers. If they need to obtain an unthemed
drawable, they should be using an explicit null theme.

BUG: 18579576
Change-Id: Ibca6b4c3e8e50dca144571244e035caec6fa91f8

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 22:56:38 +0000 (22:56 +0000)]

am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne

* commit 'f9b8bd5e73cdb694eab1b158e7b313be60534820':
docs: Long press to dismiss fix by Wayne

commit | commitdiff | tree

Adam Lesinski [Tue, 2 Dec 2014 22:52:36 +0000 (22:52 +0000)]

Merge changes If2c7e09f,Ie21f227c

* changes:
RRO idmap: pad with 0xffffffff, not 0x00000000
RRO: reintroduce lost ResTable insert of assets

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 22:50:48 +0000 (22:50 +0000)]

am 6ee2ca2f: docs: Long press to dismiss fix by Wayne

* commit '6ee2ca2f1e24d27c7a1e2430ad0272ef9f921a4a':
docs: Long press to dismiss fix by Wayne

commit | commitdiff | tree

Chris Wren [Tue, 2 Dec 2014 22:45:22 +0000 (22:45 +0000)]

am 47a5cb12: am acd01ff0: Merge "Keep deleteIntent when copying Notification attributes"

* commit '47a5cb122ab495e8420c46d8f324bddcd38920af':
Keep deleteIntent when copying Notification attributes

commit | commitdiff | tree

Chris Wren [Tue, 2 Dec 2014 22:38:28 +0000 (22:38 +0000)]

am acd01ff0: Merge "Keep deleteIntent when copying Notification attributes"

* commit 'acd01ff07668a608cb4890a2ea1533a2397149c8':
Keep deleteIntent when copying Notification attributes

commit | commitdiff | tree

Chris Wren [Tue, 2 Dec 2014 22:31:06 +0000 (22:31 +0000)]

Merge "Keep deleteIntent when copying Notification attributes"

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:27:22 +0000 (22:27 +0000)]

am e3a16016: (-s ours) am 92ad4dd0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'e3a160169bc26bcac35d1759423ab4e98a18d063':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:27:16 +0000 (22:27 +0000)]

am 74724945: (-s ours) am fccaa58c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '747249454ed12b4def32f82c461d5590bec2f2f8':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:27:11 +0000 (22:27 +0000)]

am 3bcc97e7: (-s ours) am 6774911e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '3bcc97e7a1eab012d55fa85fa352a95f7c26f547':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:27:06 +0000 (22:27 +0000)]

am 261db4f3: (-s ours) am 30460ae3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '261db4f3a8709a0773d0932dd1052f526e59da3c':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:20:03 +0000 (22:20 +0000)]

am 92ad4dd0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '92ad4dd017a13364b4001bdb04911202932f81c2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:19:58 +0000 (22:19 +0000)]

am fccaa58c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'fccaa58c5e254c9fdbf1e90ebfa0d0e27fc33585':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:19:53 +0000 (22:19 +0000)]

am 6774911e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '6774911ee2954eebf2b2003e97b949be6bdbd836':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:19:48 +0000 (22:19 +0000)]

am 30460ae3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '30460ae37e2d4f8ffda646af471b7039b519d65a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:16:24 +0000 (22:16 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:14:50 +0000 (22:14 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:14:48 +0000 (22:14 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:14:46 +0000 (22:14 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:14:05 +0000 (14:14 -0800)]

Import translations. DO NOT MERGE

Change-Id: I6acd5c2437f73dcbeca9cf6746c0a7c23c98eebc
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:09:14 +0000 (14:09 -0800)]

Import translations. DO NOT MERGE

Change-Id: I59cdaeb46767c757f817f3e15b7794e7773aa41d
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:07:25 +0000 (14:07 -0800)]

Import translations. DO NOT MERGE

Change-Id: I1fa46bb80033e1eee5de30cbf0d0d5d07ae4147c
Auto-generated-cl: translation import

commit | commitdiff | tree

Jinsuk Kim [Tue, 2 Dec 2014 22:05:11 +0000 (22:05 +0000)]

am 566d15f6: am fb020862: Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev

* commit '566d15f653c2e2c8440090bb2cca1baaad658436':
CEC: Set the parameter of <System Audio Mode Request> right

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:04:01 +0000 (14:04 -0800)]

Import translations. DO NOT MERGE

Change-Id: I5bfbdcf0a1631d7a0d6c19acabaa89f454ac177e
Auto-generated-cl: translation import

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 21:58:27 +0000 (13:58 -0800)]

resolved conflicts for merge of 850cdbe5 to lmp-mr1-dev-plus-aosp

Change-Id: Icb394ddc92eb64732993ef345284e63c9844f76b

commit | commitdiff | tree

Jinsuk Kim [Tue, 2 Dec 2014 21:58:18 +0000 (21:58 +0000)]

am fb020862: Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev

* commit 'fb020862e0d8740d31ead217fd4d308450b4170d':
CEC: Set the parameter of <System Audio Mode Request> right

commit | commitdiff | tree

Jinsuk Kim [Tue, 2 Dec 2014 21:50:42 +0000 (21:50 +0000)]

Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev

commit | commitdiff | tree

Svetoslav [Tue, 2 Dec 2014 21:46:23 +0000 (13:46 -0800)]

Allow more space for the printer spinner to avoid truncation.

The save to PDF option is truncated in Russian. While the printer
name can be arbitrarily long, the Save to PDF printer should not
be truncated.

bug:18546218

Change-Id: Id35bd638c505783a2288c1602960e8d74ec3b882

commit | commitdiff | tree

Craig Mautner [Tue, 2 Dec 2014 21:27:23 +0000 (21:27 +0000)]

am e4e7d2cd: am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev

* commit 'e4e7d2cdf40407240d63ef4f0a3249e726a1d632':
Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED

commit | commitdiff | tree

Craig Mautner [Tue, 2 Dec 2014 21:20:17 +0000 (21:20 +0000)]

am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev

* commit '41ec0400056daa97d40bd4a8225b7d4f0d665598':
Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED

commit | commitdiff | tree

Stuart Scott [Tue, 2 Dec 2014 21:18:29 +0000 (21:18 +0000)]

am 15b2d9ab: am 4e779ecd: Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev

* commit '15b2d9ab44690156e067020e12b329997ef5bba6':
Subscription Info density-dependent text size and localized SIM slot index

commit | commitdiff | tree

Craig Mautner [Tue, 2 Dec 2014 21:13:58 +0000 (21:13 +0000)]

Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev

commit | commitdiff | tree

Stuart Scott [Tue, 2 Dec 2014 21:11:48 +0000 (21:11 +0000)]

am 4e779ecd: Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev

* commit '4e779ecd56faad5901854e030f593c5d4ad3dee8':
Subscription Info density-dependent text size and localized SIM slot index

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 21:08:10 +0000 (13:08 -0800)]

docs: Long press to dismiss fix by Wayne

Bug: 17924105

Change-Id: Ifbc26b923771e7389e4df6abe9005bc3f0269c1e

commit | commitdiff | tree

Stuart Scott [Tue, 2 Dec 2014 21:04:53 +0000 (21:04 +0000)]

Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev

commit | commitdiff | tree

Craig Mautner [Tue, 2 Dec 2014 20:25:14 +0000 (12:25 -0800)]

Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED

Windows that had FLAG_SHOW_WHEN_LOCKED and FLAG_DISMISS_KEYGUARD set
would ignore the FLAG_DISMISS_KEYGUARD if the lockscreen was
insecure. This change adds a test for insecure keyguards when the
two flags are set together.

Fixes bug 18563298.

Change-Id: I3027c7ec476d3ac15978f7e6a78b3c2050cbab02

commit | commitdiff | tree

Paul Lawrence [Tue, 2 Dec 2014 20:30:01 +0000 (20:30 +0000)]

am 1056d5a9: am 75f304f9: Merge changes Ibfb5c6ab,I712919ae into lmp-mr1-dev

* commit '1056d5a997e3f30230e1e4316310586dd15a4600':
Add mechanism for securely returning parameters though NativeDaemonConnector
Revert "DO NOT MERGE: Don't log passwords returned from vdc"

commit | commitdiff | tree

Paul Lawrence [Tue, 2 Dec 2014 20:22:18 +0000 (20:22 +0000)]

am 75f304f9: Merge changes Ibfb5c6ab,I712919ae into lmp-mr1-dev

* commit '75f304f922dcb27e57dcbea17a36d426f6b223a7':
Add mechanism for securely returning parameters though NativeDaemonConnector
Revert "DO NOT MERGE: Don't log passwords returned from vdc"

commit | commitdiff | tree

Paul Lawrence [Tue, 2 Dec 2014 20:17:32 +0000 (20:17 +0000)]

Merge changes Ibfb5c6ab,I712919ae into lmp-mr1-dev

* changes:
Add mechanism for securely returning parameters though NativeDaemonConnector
Revert "DO NOT MERGE: Don't log passwords returned from vdc"

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 20:07:53 +0000 (20:07 +0000)]

am 4c754150: am 0e8c7737: am affe4732: am aa59bf2d: am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class

* commit '4c75415055eb023d4f868a6f22a7f05a1115a8e0':
docs: Layout fixes for the Custom UI on Wear class

commit | commitdiff | tree

Jorim Jaggi [Tue, 2 Dec 2014 19:57:24 +0000 (19:57 +0000)]

am d6cdffd1: am 5c1459f5: am dad13577: Merge "Update dark mode on notifications when content is updated" into lmp-mr1-dev

* commit 'd6cdffd1b38df68efd9cd13827f365185f3ea86d':
Update dark mode on notifications when content is updated

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 19:57:08 +0000 (19:57 +0000)]

am 0e8c7737: am affe4732: am aa59bf2d: am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class

* commit '0e8c773775bf6d2ae9986a64b8aece332992c6d4':
docs: Layout fixes for the Custom UI on Wear class

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 19:49:54 +0000 (19:49 +0000)]

am affe4732: am aa59bf2d: am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class

* commit 'affe473213deb4b2d1b9354cc57e2f517840e21a':
docs: Layout fixes for the Custom UI on Wear class

commit | commitdiff | tree

Jorim Jaggi [Tue, 2 Dec 2014 19:49:32 +0000 (19:49 +0000)]

am 5c1459f5: am dad13577: Merge "Update dark mode on notifications when content is updated" into lmp-mr1-dev

* commit '5c1459f5e4ac9687a5fe602efa5f9ad4992c94a1':
Update dark mode on notifications when content is updated

commit | commitdiff | tree

Dianne Hackborn [Tue, 2 Dec 2014 19:45:34 +0000 (19:45 +0000)]

am 1c2f6ca1: am 2f58bab7: am 221b545c: Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev

* commit '1c2f6ca13672c5d3c33e7d18afa7b92b9a8f6d64':
Fix issue #18510117: Returning from an activity started with...

commit | commitdiff | tree

Kweku Adams [Tue, 2 Dec 2014 19:45:29 +0000 (19:45 +0000)]

am 51de927f: am fa99c345: am d537987b: Changing AUDIO_TURNED_ON constant.

* commit '51de927f5ae9b754c4b3927eb8c109ee4dfc602d':
Changing AUDIO_TURNED_ON constant.

commit | commitdiff | tree

Jorim Jaggi [Tue, 2 Dec 2014 19:41:43 +0000 (19:41 +0000)]

am dad13577: Merge "Update dark mode on notifications when content is updated" into lmp-mr1-dev

* commit 'dad13577e5c699ab34e4243204cf767de4a0f0cd':
Update dark mode on notifications when content is updated

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 19:41:30 +0000 (19:41 +0000)]

am aa59bf2d: am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class

* commit 'aa59bf2dd81e974c37eff8be3b529ed48b0b59c3':
docs: Layout fixes for the Custom UI on Wear class

commit | commitdiff | tree

Ricardo Cervera-Navarro [Tue, 2 Dec 2014 19:40:26 +0000 (19:40 +0000)]

am ab5a0c05: am b359f4a8: am fcae79f6: am d5412e35: am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs

* commit 'ab5a0c05e651779792aca7713c04113963a4694e':
Sensor documentation fixes.

commit | commitdiff | tree

Dianne Hackborn [Tue, 2 Dec 2014 19:40:10 +0000 (19:40 +0000)]

am 2f58bab7: am 221b545c: Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev

* commit '2f58bab7b026fbe010aad8ae777f3abda295dc66':
Fix issue #18510117: Returning from an activity started with...

commit | commitdiff | tree

Kweku Adams [Tue, 2 Dec 2014 19:40:04 +0000 (19:40 +0000)]

am fa99c345: am d537987b: Changing AUDIO_TURNED_ON constant.

* commit 'fa99c345c440a37ae0cc74cba6ffd6e88ab9ddb2':
Changing AUDIO_TURNED_ON constant.

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 19:36:03 +0000 (19:36 +0000)]

am 71c5d62d: Merge "Consider RTL layout in DPAD navigation in AbsSeekBar"

* commit '71c5d62d9680207c4d3d25ac3f590f3667b250eb':
Consider RTL layout in DPAD navigation in AbsSeekBar

commit | commitdiff | tree

Jorim Jaggi [Tue, 2 Dec 2014 19:35:39 +0000 (19:35 +0000)]

Merge "Update dark mode on notifications when content is updated" into lmp-mr1-dev

commit | commitdiff | tree

Craig Mautner [Tue, 2 Dec 2014 19:35:02 +0000 (19:35 +0000)]

am 240602f4: am 877d8939: am f6be7d17: Merge "[ActivityManager] Fix race condition in pss collection"

* commit '240602f43184b820ecff064d61e99017f849c0cf':
[ActivityManager] Fix race condition in pss collection

commit | commitdiff | tree

Dianne Hackborn [Tue, 2 Dec 2014 19:33:28 +0000 (19:33 +0000)]

am 221b545c: Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev

* commit '221b545cdaba2522fbb299428ac048641410c284':
Fix issue #18510117: Returning from an activity started with...

commit | commitdiff | tree

Kweku Adams [Tue, 2 Dec 2014 19:33:23 +0000 (19:33 +0000)]

am d537987b: Changing AUDIO_TURNED_ON constant.

* commit 'd537987b173f6b48f5196a2ae7d445af1a49e2bb':
Changing AUDIO_TURNED_ON constant.

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 19:32:49 +0000 (19:32 +0000)]

am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class

* commit 'a107b5150b38a8c6585631b1773d6c10f682f42b':
docs: Layout fixes for the Custom UI on Wear class

commit | commitdiff | tree

Ricardo Cervera-Navarro [Tue, 2 Dec 2014 19:31:32 +0000 (19:31 +0000)]

am b359f4a8: am fcae79f6: am d5412e35: am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs

* commit 'b359f4a871cbbeecafb3c9b310695ffb6e5280bd':
Sensor documentation fixes.

commit | commitdiff | tree

Dianne Hackborn [Tue, 2 Dec 2014 19:22:06 +0000 (19:22 +0000)]

Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 19:21:21 +0000 (19:21 +0000)]

Merge "Consider RTL layout in DPAD navigation in AbsSeekBar"

commit | commitdiff | tree

Kweku Adams [Tue, 25 Nov 2014 01:34:05 +0000 (17:34 -0800)]

Changing AUDIO_TURNED_ON constant.

Changed so that it's set to a different value from WIFI_MULTICAST_ENABLED.

Change-Id: Ied3a2c2bf891f887ec3c7b5249453af4524c099a

commit | commitdiff | tree

Andrew Lee [Tue, 2 Dec 2014 19:14:34 +0000 (19:14 +0000)]

am b4501f03: am 4cd124cf: am 4ef369fc: Merge "Rename VoLTE capability to HD audio." into lmp-mr1-dev

* commit 'b4501f03277b6bef3621d46d8360d057c905775a':
Rename VoLTE capability to HD audio.

commit | commitdiff | tree

Christoph Studer [Tue, 2 Dec 2014 19:14:29 +0000 (19:14 +0000)]

am 4b1cbaaf: am cd9eb9be: am 27ef0188: Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev

* commit '4b1cbaaf4ec9f3f58a389496faacf77ee46fa2ed':
NoMan/SysUI: Clear LEDs only when entering the shade

commit | commitdiff | tree

Craig Mautner [Tue, 2 Dec 2014 19:14:07 +0000 (19:14 +0000)]

am 877d8939: am f6be7d17: Merge "[ActivityManager] Fix race condition in pss collection"

* commit '877d89399af77a98dd940c034aa631029ed313cc':
[ActivityManager] Fix race condition in pss collection

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 19:13:54 +0000 (19:13 +0000)]

am 64f49162: docs: Layout fixes for the Custom UI on Wear class

* commit '64f49162460eaddf49f9d56c5dc6a01f472e790c':
docs: Layout fixes for the Custom UI on Wear class

commit | commitdiff | tree

Ricardo Cervera-Navarro [Tue, 2 Dec 2014 19:12:24 +0000 (19:12 +0000)]

am fcae79f6: am d5412e35: am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs

* commit 'fcae79f65d60069f75c4db92a68d56c9eb8b5213':
Sensor documentation fixes.

commit | commitdiff | tree

Svet Ganov [Tue, 2 Dec 2014 19:10:15 +0000 (19:10 +0000)]

am 66a12001: am f9c93ba2: am eaaf0512: Crash in print spooler when back pressed before content update complted.

* commit '66a1200156aa0d7b003ce6d7dacfa5c1a54dd0d7':
Crash in print spooler when back pressed before content update complted.

commit | commitdiff | tree

Andrew Lee [Tue, 2 Dec 2014 19:08:19 +0000 (19:08 +0000)]

am 4cd124cf: am 4ef369fc: Merge "Rename VoLTE capability to HD audio." into lmp-mr1-dev

* commit '4cd124cfcb9427465ad2bf206a66c0e10e4e330b':
Rename VoLTE capability to HD audio.

commit | commitdiff | tree

Christoph Studer [Tue, 2 Dec 2014 19:08:13 +0000 (19:08 +0000)]

am cd9eb9be: am 27ef0188: Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev

* commit 'cd9eb9bee788252cd6d6bcdb7fcdc5a5d0dcfe5c':
NoMan/SysUI: Clear LEDs only when entering the shade

commit | commitdiff | tree

Marvin Paul [Tue, 2 Dec 2014 19:05:25 +0000 (19:05 +0000)]

am e67cf731: am 364a8fe9: am 5aeed158: Merge "Added explicit sort order when fetching accounts." into lmp-mr1-dev

* commit 'e67cf73146cecce5be22264ca7c596b454ded08d':
Added explicit sort order when fetching accounts.