OSDN Git Service
Marco Nelissen [Wed, 18 Feb 2015 00:01:16 +0000 (00:01 +0000)]
am
ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev
* commit '
ffaee8bda9c8d22af17098fec0e6626301d91844':
Fix NPE
Marco Nelissen [Tue, 17 Feb 2015 23:54:29 +0000 (23:54 +0000)]
Merge "Fix NPE" into lmp-mr1-dev
Craig Mautner [Tue, 17 Feb 2015 23:36:35 +0000 (23:36 +0000)]
am
a94e4297: (-s ours) Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
* commit '
a94e42970d4e664e193cde0cf2700cb7e15961c9':
Do not make ActivityContainer available to apps. DO NOT MERGE
Craig Mautner [Tue, 17 Feb 2015 23:30:33 +0000 (23:30 +0000)]
Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
Alan Viverette [Tue, 17 Feb 2015 22:52:14 +0000 (22:52 +0000)]
am
d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev
* commit '
d5471a0b2bf938cf83f4abac66a18664d8ca5277':
Revert "Fixed accessibility for the pin input view on keyguard."
Alan Viverette [Tue, 17 Feb 2015 22:48:04 +0000 (22:48 +0000)]
Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev
Alan Viverette [Tue, 17 Feb 2015 22:36:00 +0000 (22:36 +0000)]
am
d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev
* commit '
d611fc4ea648e23ed3a6b311a07a5bd8b3e2927c':
Fix year picker initial range
Rich Slogar [Tue, 17 Feb 2015 22:35:56 +0000 (22:35 +0000)]
am
82510fa5: am
9c9a3afb: am
8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge:
fa40f00
* commit '
82510fa5a63114e75c0ed154120e0ca92d401524':
docs: studio proxy setting setup
docs: studio proxy setup
Marco Nelissen [Tue, 17 Feb 2015 22:31:33 +0000 (14:31 -0800)]
Fix NPE
Path can be null if sd card was ejected, and we shouldn't make a thumbnail
in that case.
Bug:
19380821
Change-Id: Iee69effdd321622de026ad7b57c74cf9da81a176
Alan Viverette [Tue, 17 Feb 2015 22:33:03 +0000 (22:33 +0000)]
Merge "Fix year picker initial range" into lmp-mr1-dev
Oliver Woodman [Tue, 17 Feb 2015 22:31:36 +0000 (22:31 +0000)]
am
2a6bf82e: am
533149d5: am
fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge:
a40eb5d
* commit '
2a6bf82e26f5099b6659055c9b5ffce09efaedfd':
Update ExoPlayer developer guide.
Rich Slogar [Tue, 17 Feb 2015 22:31:32 +0000 (22:31 +0000)]
am
dbb32faf: am
8c124744: am
76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge:
bff1545
* commit '
dbb32faf33c95b245d75c0dc8d4578a011378f78':
docs: studio revision 1-1
Rich Slogar [Tue, 17 Feb 2015 22:31:27 +0000 (22:31 +0000)]
am
2d43b730: am
d2856643: am
4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge:
cb73fb9
* commit '
2d43b7300dfad8bbf54d88e7b315d2ea38023131':
docs: android plugin for gradle revisions page
David Friedman [Tue, 17 Feb 2015 22:31:21 +0000 (22:31 +0000)]
am
a6614a12: am
53ec037f: am
03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge:
efb69b0
* commit '
a6614a12bbc6715af843d26f66fb32ae854323e6':
This file is misplaced, and serves no purpose. I am sending it to oblivion.
Rich Slogar [Tue, 17 Feb 2015 22:28:45 +0000 (22:28 +0000)]
am
9c9a3afb: am
8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
automerge:
fa40f00
* commit '
fa40f0072f4eb24d0e2b641bf7b4235e99362c1e':
docs: studio proxy setting setup
docs: studio proxy setup
Oliver Woodman [Tue, 17 Feb 2015 22:27:16 +0000 (22:27 +0000)]
am
533149d5: am
fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs
automerge:
a40eb5d
* commit '
a40eb5db455ebb225a7ff0afa244256079d8cf20':
Update ExoPlayer developer guide.
Rich Slogar [Tue, 17 Feb 2015 22:25:53 +0000 (22:25 +0000)]
am
8c124744: am
76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs
automerge:
bff1545
* commit '
bff1545a3e6a3c296a8ffcefb5f1141f9a21c5d1':
docs: studio revision 1-1
Rich Slogar [Tue, 17 Feb 2015 22:24:38 +0000 (22:24 +0000)]
am
d2856643: am
4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs
automerge:
cb73fb9
* commit '
cb73fb90443a3a3fee645aa3f01d38b19f108377':
docs: android plugin for gradle revisions page
Deepanshu Gupta [Tue, 17 Feb 2015 22:24:27 +0000 (22:24 +0000)]
am
0a300b89: am
ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge:
0684991
* commit '
0a300b897711bfa39e0d30e2fa61664f01fb58d8':
Add Asset management support for fonts.
Diego Perez [Tue, 17 Feb 2015 22:24:24 +0000 (22:24 +0000)]
am
a0fb87a3: am
98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge:
a912fed
* commit '
a0fb87a3b831e8eb4e4f7e03fc170cf8f93a2161':
Do not paint shadow if outside of the clip area
Deepanshu Gupta [Tue, 17 Feb 2015 22:24:20 +0000 (22:24 +0000)]
am
221d7320: am
12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge:
4e47416
* commit '
221d732005b04b5f979d2e03e8ebe00160e52ca3':
Changes made by intelliJ 14.1
David Friedman [Tue, 17 Feb 2015 22:22:50 +0000 (22:22 +0000)]
am
53ec037f: am
03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs
automerge:
efb69b0
* commit '
efb69b003e24757fbf04f219a61a4a71adada3a2':
This file is misplaced, and serves no purpose. I am sending it to oblivion.
Deepanshu Gupta [Tue, 17 Feb 2015 22:21:11 +0000 (22:21 +0000)]
am
ad879adb: Merge "Add Asset management support for fonts." into lmp-dev
automerge:
0684991
* commit '
068499111c173fdd9869e7dbe5b9de857aca1c2d':
Add Asset management support for fonts.
Diego Perez [Tue, 17 Feb 2015 22:19:43 +0000 (22:19 +0000)]
am
98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev
automerge:
a912fed
* commit '
a912fedbc5fba99fb75884a1941d58170822ceb4':
Do not paint shadow if outside of the clip area
Deepanshu Gupta [Tue, 17 Feb 2015 22:18:35 +0000 (22:18 +0000)]
am
12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev
automerge:
4e47416
* commit '
4e47416012b8cb88d564a04a29c0b79a28b9e529':
Changes made by intelliJ 14.1
Rich Slogar [Tue, 17 Feb 2015 22:13:37 +0000 (22:13 +0000)]
am
9c9a3afb: am
8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
* commit '
9c9a3afb95dcac7bf356edf25c8d86187ea59afd':
docs: studio proxy setting setup
docs: studio proxy setup
Rich Slogar [Tue, 17 Feb 2015 22:06:21 +0000 (22:06 +0000)]
am
8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
* commit '
8823b93d5c32bb7a8c757022ce055ca53b71171f':
docs: studio proxy setting setup
docs: studio proxy setup
Rich Slogar [Tue, 17 Feb 2015 22:02:44 +0000 (22:02 +0000)]
Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
* changes:
docs: studio proxy setting setup
docs: studio proxy setup
Alan Viverette [Tue, 17 Feb 2015 21:09:04 +0000 (13:09 -0800)]
Fix year picker initial range
BUG:
19410328
Change-Id: I2a2952eb58eb856f93b7af2f49e08abe71078aa9
Oliver Woodman [Tue, 17 Feb 2015 20:59:50 +0000 (20:59 +0000)]
am
533149d5: am
fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs
* commit '
533149d54f881e07f36c2fd62c861942542340fc':
Update ExoPlayer developer guide.
Oliver Woodman [Tue, 17 Feb 2015 20:53:13 +0000 (20:53 +0000)]
am
fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs
* commit '
fe3e71befacc5d0777eb0c7099dd910197cfb6b6':
Update ExoPlayer developer guide.
Rich Slogar [Tue, 17 Feb 2015 20:49:44 +0000 (20:49 +0000)]
am
8c124744: am
76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs
* commit '
8c124744b625f547a5ba15cbb442c605f109bae0':
docs: studio revision 1-1
Oliver Woodman [Tue, 17 Feb 2015 20:48:49 +0000 (20:48 +0000)]
Merge "Update ExoPlayer developer guide." into lmp-docs
Oliver Woodman [Mon, 16 Feb 2015 17:49:34 +0000 (17:49 +0000)]
Update ExoPlayer developer guide.
This is a minimal update, just to fix things that are broken
or no longer make sense as of the v1.2.0 release.
Change-Id: If519709c91c975d96b62e2dd28e18e2105735c2b
Rich Slogar [Tue, 17 Feb 2015 20:42:44 +0000 (20:42 +0000)]
am
76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs
* commit '
76dd6aa7f9d36183f44654eb45dc304abe8b7caf':
docs: studio revision 1-1
Craig Mautner [Tue, 17 Feb 2015 18:17:21 +0000 (10:17 -0800)]
Do not make ActivityContainer available to apps. DO NOT MERGE
A security leak was discovered whereby a malicious app could get the
IActivityContainer object from one app and use it to inject events
into another app. This fix removes the availability of the
IActivityContainer and replaces its one use with a method for
returning the information the IActivityContainer was used for.
Fixes bug
19394591.
Change-Id: Ib3cec25b25130cd8e098892c057742cfd575cfdd
Rich Slogar [Tue, 17 Feb 2015 20:37:51 +0000 (20:37 +0000)]
Merge "docs: studio revision 1-1" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 20:26:46 +0000 (20:26 +0000)]
am
d2856643: am
4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs
* commit '
d285664399f8f68750e75707a35046e3c9592a2d':
docs: android plugin for gradle revisions page
Rich Slogar [Tue, 17 Feb 2015 20:19:59 +0000 (20:19 +0000)]
am
4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs
* commit '
4abf87f134fa81460e018bb7130e88639281e1ce':
docs: android plugin for gradle revisions page
Rich Slogar [Tue, 17 Feb 2015 20:16:08 +0000 (20:16 +0000)]
Merge "docs: android plugin for gradle revisions page" into lmp-docs
Adrian Roos [Tue, 17 Feb 2015 19:46:01 +0000 (20:46 +0100)]
Revert "Fixed accessibility for the pin input view on keyguard."
Also removes the Klondike from the content description.
This reverts commit
c199ef37594b946cb295c29df321e74332ee5408
from change I3dd05fa1714da36795f448718fd70f1cdbfe2584
Bug:
18528774
Change-Id: I8a85076f939a8b78075b5a6322009ebfd78bf8d3
Adrian Roos [Tue, 17 Feb 2015 18:39:25 +0000 (18:39 +0000)]
am
024fd0c6: Disable color view animations when stable insets change
* commit '
024fd0c6051e01579018fad0c1a56e9e47b195df':
Disable color view animations when stable insets change
Adrian Roos [Tue, 17 Feb 2015 15:37:53 +0000 (16:37 +0100)]
Disable color view animations when stable insets change
Prevents color view from showing up on phones when
the orientation changes to landscape. Previously, the
animation was only prevented when the stable inset of a
bar became nonzero; now we disable animations whenever
the nonzeroness changes.
Bug:
19353466
Change-Id: I31b4103fe984d158a98cd446ac2ddbe15a408e49
David Friedman [Sat, 14 Feb 2015 02:50:49 +0000 (02:50 +0000)]
am
53ec037f: am
03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs
* commit '
53ec037f9eb0e29f958faa334cf23c35f079eb85':
This file is misplaced, and serves no purpose. I am sending it to oblivion.
David Friedman [Sat, 14 Feb 2015 02:42:44 +0000 (02:42 +0000)]
am
03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs
* commit '
03efba0e3a64cf4b0084bed056c24fbe8a2030c9':
This file is misplaced, and serves no purpose. I am sending it to oblivion.
David Friedman [Sat, 14 Feb 2015 02:36:33 +0000 (02:36 +0000)]
Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs
Rich Slogar [Mon, 26 Jan 2015 19:08:55 +0000 (11:08 -0800)]
docs: studio proxy setting setup
b/
18332702
Change-Id: If3a78fc7b906bb94cfa74fc07b95ef72a84cf825
Rich Slogar [Tue, 10 Feb 2015 20:56:46 +0000 (12:56 -0800)]
docs: studio revision 1-1
Change-Id: I7464ace70e9b9e430fd0f03329e20b64b1e1a56a
Rich Slogar [Thu, 15 Jan 2015 00:04:08 +0000 (16:04 -0800)]
docs: android plugin for gradle revisions page
Change-Id: I15750eb11f69f9286fdd542c8e5a5e702b1a1255
Deepanshu Gupta [Fri, 13 Feb 2015 22:38:23 +0000 (22:38 +0000)]
am
ad879adb: Merge "Add Asset management support for fonts." into lmp-dev
* commit '
ad879adb65ffa577844738522ab6d7d30aba2ead':
Add Asset management support for fonts.
Diego Perez [Fri, 13 Feb 2015 22:38:17 +0000 (22:38 +0000)]
am
98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev
* commit '
98c3461acd6699ab0448f1785909d0d39cd61b5a':
Do not paint shadow if outside of the clip area
Deepanshu Gupta [Fri, 13 Feb 2015 22:38:07 +0000 (22:38 +0000)]
am
12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev
* commit '
12c9e4980e889d1c72656a4062f9cee9a0e6f15a':
Changes made by intelliJ 14.1
Deepanshu Gupta [Fri, 13 Feb 2015 22:34:17 +0000 (22:34 +0000)]
Merge "Add Asset management support for fonts." into lmp-dev
Diego Perez [Fri, 13 Feb 2015 22:34:14 +0000 (22:34 +0000)]
Merge "Do not paint shadow if outside of the clip area" into lmp-dev
Deepanshu Gupta [Fri, 13 Feb 2015 22:33:47 +0000 (22:33 +0000)]
Merge "Changes made by intelliJ 14.1" into lmp-dev
David Friedman [Fri, 13 Feb 2015 05:30:59 +0000 (21:30 -0800)]
This file is misplaced, and serves no purpose. I am sending it to oblivion.
Change-Id: I91ed7bc228849f3181591357037b368b4b261eee
Svetoslav [Fri, 13 Feb 2015 03:41:55 +0000 (03:41 +0000)]
am
27ad2e95: Accessibility: Ensure fresh accessilbity focused and input focused nodes.
* commit '
27ad2e95b40fd0ca76de384695498ea114d627ca':
Accessibility: Ensure fresh accessilbity focused and input focused nodes.
Ruben Brunk [Fri, 13 Feb 2015 02:15:21 +0000 (02:15 +0000)]
am
d2ccbd43: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev
* commit '
d2ccbd43d24a79122e404206c528995600a6507d':
camera2: Fix legacy scaling factor application.
Svetoslav [Fri, 13 Feb 2015 01:54:15 +0000 (17:54 -0800)]
Accessibility: Ensure fresh accessilbity focused and input focused nodes.
Change-Id: Ia3c84284843a415cdbbc2b6a9b06d9ddffbe0e04
Ruben Brunk [Fri, 13 Feb 2015 01:22:24 +0000 (01:22 +0000)]
Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev
Luan Nguyen [Fri, 13 Feb 2015 00:20:07 +0000 (00:20 +0000)]
am
474746c7: am
2ea209ab: am
8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs automerge:
fe2c687
* commit '
474746c7b08842cefecc9c1408c7837d93cff823':
docs: Update device art generator to include Wear generic devices.
Luan Nguyen [Fri, 13 Feb 2015 00:20:03 +0000 (00:20 +0000)]
am
71cf2b6d: am
e726495a: am
fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs automerge:
e0306bb
* commit '
71cf2b6d5344a45413f0c77691d7e1efb18b398f':
docs: Fix issue with onCreate() method declaration in file backup section
Luan Nguyen [Fri, 13 Feb 2015 00:19:59 +0000 (00:19 +0000)]
am
b14aec1b: am
b6de0316: am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs automerge:
946bf2d
* commit '
b14aec1b954f6fea5fc3ead9a289c8896f372096':
docs: Fix notification api guide issues (
7461154,
12765600)
Luan Nguyen [Fri, 13 Feb 2015 00:16:48 +0000 (00:16 +0000)]
am
2ea209ab: am
8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
automerge:
fe2c687
* commit '
fe2c687b97f21b7dd5471279c1b2b9458dcd22bf':
docs: Update device art generator to include Wear generic devices.
Luan Nguyen [Fri, 13 Feb 2015 00:15:09 +0000 (00:15 +0000)]
am
e726495a: am
fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
automerge:
e0306bb
* commit '
e0306bbece4fd32d1e2f837dc515506180e04e8e':
docs: Fix issue with onCreate() method declaration in file backup section
Luan Nguyen [Fri, 13 Feb 2015 00:13:35 +0000 (00:13 +0000)]
am
b6de0316: am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
automerge:
946bf2d
* commit '
946bf2de30545a548022b8b8ba1b0ebc890ab08e':
docs: Fix notification api guide issues (
7461154,
12765600)
John Spurlock [Thu, 12 Feb 2015 22:58:14 +0000 (22:58 +0000)]
am
f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
* commit '
f45e5dbf599a0043d7f6576f20eafb2c1c157204':
NoMan: Initialize filter value reported to listeners.
John Spurlock [Thu, 12 Feb 2015 22:52:12 +0000 (22:52 +0000)]
Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
Jim Miller [Thu, 12 Feb 2015 21:55:32 +0000 (21:55 +0000)]
am
b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
* commit '
b2ff8d9a3e5f279e7a60a12f9192e43081e2eef9':
Fix accessibility focus bug in statusbar
Jim Miller [Thu, 12 Feb 2015 21:48:10 +0000 (21:48 +0000)]
Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
Ruben Brunk [Thu, 12 Feb 2015 20:16:44 +0000 (12:16 -0800)]
camera2: Fix legacy scaling factor application.
Bug:
19359916
Change-Id: I22204c50ac918b9be97b5d43efa73c7e87444cea
Luan Nguyen [Thu, 12 Feb 2015 19:13:47 +0000 (19:13 +0000)]
am
2ea209ab: am
8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
* commit '
2ea209ab4c0883696be9a34aee5f4c4bf39c1a23':
docs: Update device art generator to include Wear generic devices.
Luan Nguyen [Thu, 12 Feb 2015 19:07:47 +0000 (19:07 +0000)]
am
8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
* commit '
8d0df9b891aca1b4f9ec2e3002ec628807f31fdb':
docs: Update device art generator to include Wear generic devices.
Luan Nguyen [Thu, 12 Feb 2015 19:01:02 +0000 (19:01 +0000)]
Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
Jeremy Joslin [Thu, 12 Feb 2015 18:40:23 +0000 (18:40 +0000)]
am
20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
* commit '
20be0e25ba660a7555577988cefcfa36d84e7e2f':
Update Javadoc for EXTRA_NETWORK.
Jeremy Joslin [Thu, 12 Feb 2015 18:34:01 +0000 (18:34 +0000)]
Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
John Spurlock [Thu, 12 Feb 2015 18:29:37 +0000 (13:29 -0500)]
NoMan: Initialize filter value reported to listeners.
In addition to relying on change callbacks.
Bug:
19288429
Change-Id: Id54473e5fbb4eac3778781a2052ba0103076f8d1
Luan Nguyen [Thu, 12 Feb 2015 17:35:43 +0000 (17:35 +0000)]
am
e726495a: am
fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
* commit '
e726495a269b48f9b94fa9e545f84e79d587a282':
docs: Fix issue with onCreate() method declaration in file backup section
Luan Nguyen [Thu, 12 Feb 2015 17:35:38 +0000 (17:35 +0000)]
am
b6de0316: am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
* commit '
b6de0316a8f77b4425057eb4e75f7375c47fad65':
docs: Fix notification api guide issues (
7461154,
12765600)
Luan Nguyen [Thu, 12 Feb 2015 17:17:04 +0000 (17:17 +0000)]
am
fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
* commit '
fe5e7e92a1e4cf173c787e0ffe6d84d6f1e4c703':
docs: Fix issue with onCreate() method declaration in file backup section
Luan Nguyen [Thu, 12 Feb 2015 17:16:59 +0000 (17:16 +0000)]
am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
* commit '
e1f90b4e1e438c0086409ae0253a6452f2befbac':
docs: Fix notification api guide issues (
7461154,
12765600)
Luan Nguyen [Thu, 12 Feb 2015 17:11:27 +0000 (17:11 +0000)]
Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
Luan Nguyen [Thu, 12 Feb 2015 17:10:49 +0000 (17:10 +0000)]
Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
Benjamin Franz [Thu, 12 Feb 2015 16:46:50 +0000 (16:46 +0000)]
am
c70d0e71: Fix the javadocs for lock task mode intents.
* commit '
c70d0e71c09da0292958d748cedaa5fbacbec74a':
Fix the javadocs for lock task mode intents.
Benjamin Franz [Thu, 12 Feb 2015 16:12:58 +0000 (16:12 +0000)]
Fix the javadocs for lock task mode intents.
Bug:
19363651
Change-Id: Ia0da3ddad587ea842aad19818a62540889d6a9dd
Eino-Ville Talvala [Thu, 12 Feb 2015 05:41:31 +0000 (05:41 +0000)]
am
a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev
* commit '
a5f301c7fb048461197a6032f66b35772a3157f9':
Legacy: Only set user surface dimensions on output surfaces
Eino-Ville Talvala [Thu, 12 Feb 2015 05:33:27 +0000 (05:33 +0000)]
Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev
Jim Miller [Thu, 12 Feb 2015 03:51:05 +0000 (19:51 -0800)]
Fix accessibility focus bug in statusbar
The root view of the new uber statusbar should not be focusable.
Based on history, it looks like this was an oversight when this view
was refactored.
Fixes bug
19296202
Change-Id: Ib7f6908c30ab37384aa50f4fa4198c15593a96a4
Lorenzo Colitti [Thu, 12 Feb 2015 02:43:45 +0000 (02:43 +0000)]
am
c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev
* commit '
c7ccc393b470220710f566d447412d93f7f8d21b':
Make reportInetCondition revalidate if the report differs from our state
Lorenzo Colitti [Thu, 12 Feb 2015 02:30:55 +0000 (02:30 +0000)]
Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev
Jeremy Joslin [Thu, 12 Feb 2015 00:51:13 +0000 (16:51 -0800)]
Update Javadoc for EXTRA_NETWORK.
Bug:
19352840
Change-Id: Ib668bee0fb2c6f5bcd01a7908ebd20b9ec8a40ef
Adam Powell [Thu, 12 Feb 2015 02:13:40 +0000 (02:13 +0000)]
am
0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev
* commit '
0ec652cf72bd8b7f619462f172ac0152d4d6c83d':
Add DENSITY_280
Adam Powell [Thu, 12 Feb 2015 02:08:03 +0000 (02:08 +0000)]
Merge "Add DENSITY_280" into lmp-mr1-dev
Eino-Ville Talvala [Wed, 11 Feb 2015 23:41:12 +0000 (15:41 -0800)]
Legacy: Only set user surface dimensions on output surfaces
The GL layer gets exclusive use of the direct producer dimensions;
we should only set the user dimensions.
Bug:
16404608
Change-Id: Ie5b720104bdbee6b096b62520baa1c6b518c6c1c
Adam Powell [Wed, 11 Feb 2015 21:34:43 +0000 (13:34 -0800)]
Add DENSITY_280
Bug
19350604
Change-Id: I94f5162c31f9c8853908d7c4699974c236cc7fe7
Michael Wright [Wed, 11 Feb 2015 20:09:35 +0000 (20:09 +0000)]
am
3292c0e2: Merge "Stop active media projections on user switch." into lmp-mr1-dev
* commit '
3292c0e2640667e5ef78896653a41c85e7de06c5':
Stop active media projections on user switch.
Luan Nguyen [Tue, 10 Feb 2015 21:10:39 +0000 (13:10 -0800)]
docs: Fix issue with onCreate() method declaration in file backup section
bug:
3180881
Change-Id: I9616ec0d559bfbce669c5afc5b1742f6f5271fa5
Luan Nguyen [Mon, 2 Feb 2015 20:17:40 +0000 (12:17 -0800)]
docs: Update device art generator to include Wear generic devices.
bug:
14617426
Change-Id: I1f693a908c6e8c8cf8cf612fefd8553754978639
Michael Wright [Wed, 11 Feb 2015 18:23:54 +0000 (18:23 +0000)]
Merge "Stop active media projections on user switch." into lmp-mr1-dev
Jeff Davidson [Wed, 11 Feb 2015 08:32:01 +0000 (08:32 +0000)]
am
50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
* commit '
50996a12a8e859346d5eb3c4569c4e81c9b52a05':
Do not enforce CONTROL_VPN for calls from lockdown VPN.
OSDN Git Service
