OSDN Git Service
Yorke Lee [Tue, 28 Oct 2014 22:13:43 +0000 (22:13 +0000)]
am
e398db4a: Merge "Add comment to TelecomManager.getCallState" into lmp-mr1-dev
* commit '
e398db4a45d4128af696a664e7c4cc48f7187a7f':
Add comment to TelecomManager.getCallState
Yorke Lee [Tue, 28 Oct 2014 22:08:50 +0000 (22:08 +0000)]
Merge "Add comment to TelecomManager.getCallState" into lmp-mr1-dev
Yorke Lee [Tue, 28 Oct 2014 21:12:02 +0000 (14:12 -0700)]
Add comment to TelecomManager.getCallState
Explain why READ_PHONE_STATE permission is not required so that
people don't try to add it in the future. Requiring the permission
causes stability crashes with legacy apps and system components
that don't have the permission.
Change-Id: Idf8766aa409d4a2c4ed3d6f81a398f4a0eb24615
Adrian Roos [Tue, 28 Oct 2014 20:31:12 +0000 (20:31 +0000)]
am
579a7f99: Merge "Close keyguard user switcher on tap outside" into lmp-mr1-dev
* commit '
579a7f99408a5d310ab8eb2e1b6bc938e1a74c4a':
Close keyguard user switcher on tap outside
Adrian Roos [Tue, 28 Oct 2014 20:27:39 +0000 (20:27 +0000)]
Merge "Close keyguard user switcher on tap outside" into lmp-mr1-dev
John Spurlock [Tue, 28 Oct 2014 20:10:27 +0000 (20:10 +0000)]
am
2896517b: Merge "Zen: Fix quantity format specifiers for quantity=1." into lmp-mr1-dev
* commit '
2896517ba13d9b670a749a626ea1270bb446017c':
Zen: Fix quantity format specifiers for quantity=1.
Santos Cordon [Tue, 28 Oct 2014 20:06:13 +0000 (20:06 +0000)]
am
ccbc3e5c: Merge "Update javadocs for Telecom APIs." into lmp-mr1-dev
* commit '
ccbc3e5c6617b30eabbd171b951bb74ae9108e8b':
Update javadocs for Telecom APIs.
Jeff Davidson [Tue, 28 Oct 2014 20:06:08 +0000 (20:06 +0000)]
am
f82b029c: Merge "Check UID instead of package name when preparing VPN." into lmp-mr1-dev
* commit '
f82b029c7c47568f75eb4a7e676baf2cb61c967f':
Check UID instead of package name when preparing VPN.
John Spurlock [Tue, 28 Oct 2014 20:04:19 +0000 (20:04 +0000)]
Merge "Zen: Fix quantity format specifiers for quantity=1." into lmp-mr1-dev
Santos Cordon [Tue, 28 Oct 2014 20:01:00 +0000 (20:01 +0000)]
Merge "Update javadocs for Telecom APIs." into lmp-mr1-dev
Jeff Davidson [Tue, 28 Oct 2014 20:00:31 +0000 (20:00 +0000)]
Merge "Check UID instead of package name when preparing VPN." into lmp-mr1-dev
John Spurlock [Tue, 28 Oct 2014 19:49:25 +0000 (15:49 -0400)]
Zen: Fix quantity format specifiers for quantity=1.
Bug:
16824863
Change-Id: I3c7fc5961cd65b0b8291b7d9aef6110e6dfe85f1
Joe Fernandez [Tue, 28 Oct 2014 19:35:03 +0000 (19:35 +0000)]
am
9513604c: am
5c0ed74b: am
40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs automerge:
56a8cb7
* commit '
9513604cdcfe56eaca70bd5c5a4f672a2b46d1a2':
docs: Update timing of Android Wear app review
David Friedman [Tue, 28 Oct 2014 19:34:58 +0000 (19:34 +0000)]
am
79c332a6: am
b2d582d9: am
3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs automerge:
b648cab
* commit '
79c332a694691cef131d049c9f6a8ad59df37000':
Updates Notifications screenshot for Android 5.0.
Eric Gilmore [Tue, 28 Oct 2014 19:29:43 +0000 (19:29 +0000)]
am
3fc61015: am
9a6aa0ff: am
d126294a: Docs: Adding Android Studio instructions for adding IAB service. automerge:
77760e7
* commit '
3fc61015f51a3f8ae8516b5e31d7f867f48b6d84':
Docs: Adding Android Studio instructions for adding IAB service.
Quddus Chong [Tue, 28 Oct 2014 19:29:36 +0000 (19:29 +0000)]
am
50631f97: am
6face8a0: am
2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce automerge:
eb07af2
* commit '
50631f97b499ad2fc904d5d1cc13ff4c964bee60':
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
Ricardo Cervera [Tue, 28 Oct 2014 19:29:28 +0000 (19:29 +0000)]
am
989f4bfd: am
f4e32145: am
61fcad92: docs: Add SearchXonY to Common Intents automerge:
be07f2a
* commit '
989f4bfd8d06a31dbe42050ea2ce0cbadeacfbfc':
docs: Add SearchXonY to Common Intents
Joe Fernandez [Tue, 28 Oct 2014 19:28:36 +0000 (19:28 +0000)]
am
5c0ed74b: am
40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs
automerge:
56a8cb7
* commit '
56a8cb7fd1eff26da30c4ebcb58eae71b9774b81':
docs: Update timing of Android Wear app review
David Friedman [Tue, 28 Oct 2014 19:27:37 +0000 (19:27 +0000)]
am
b2d582d9: am
3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
automerge:
b648cab
* commit '
b648cabadfd73bcd3fa8b88db48007f58739300e':
Updates Notifications screenshot for Android 5.0.
Eric Gilmore [Tue, 28 Oct 2014 19:26:43 +0000 (19:26 +0000)]
am
9a6aa0ff: am
d126294a: Docs: Adding Android Studio instructions for adding IAB service.
automerge:
77760e7
* commit '
77760e753eb9a6c533eb2b52f228149e49356f64':
Docs: Adding Android Studio instructions for adding IAB service.
Quddus Chong [Tue, 28 Oct 2014 19:25:57 +0000 (19:25 +0000)]
am
6face8a0: am
2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
automerge:
eb07af2
* commit '
eb07af2ced7aa438dca941fcde2e3ca0b338a620':
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
Ricardo Cervera [Tue, 28 Oct 2014 19:25:10 +0000 (19:25 +0000)]
am
f4e32145: am
61fcad92: docs: Add SearchXonY to Common Intents
automerge:
be07f2a
* commit '
be07f2a853cb2a69eeecbd7b0d68f455b55edae6':
docs: Add SearchXonY to Common Intents
Joe Fernandez [Tue, 28 Oct 2014 19:22:45 +0000 (19:22 +0000)]
am
5c0ed74b: am
40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs
* commit '
5c0ed74b3886c5765c576e9e427b93c76b37635a':
docs: Update timing of Android Wear app review
David Friedman [Tue, 28 Oct 2014 19:22:40 +0000 (19:22 +0000)]
am
b2d582d9: am
3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
* commit '
b2d582d995622cc8379603cfadae7ee6d4163b3e':
Updates Notifications screenshot for Android 5.0.
Eric Gilmore [Tue, 28 Oct 2014 19:22:37 +0000 (19:22 +0000)]
am
9a6aa0ff: am
d126294a: Docs: Adding Android Studio instructions for adding IAB service.
* commit '
9a6aa0ffa460aca1df9ef03501dd6b20b483198b':
Docs: Adding Android Studio instructions for adding IAB service.
Quddus Chong [Tue, 28 Oct 2014 19:22:15 +0000 (19:22 +0000)]
am
6face8a0: am
2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
* commit '
6face8a04c1aa695a744f12ee2ca0e18cdfb5ed0':
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
Ricardo Cervera [Tue, 28 Oct 2014 19:22:11 +0000 (19:22 +0000)]
am
f4e32145: am
61fcad92: docs: Add SearchXonY to Common Intents
* commit '
f4e32145a214b28522d67e748c0eff74aa915bf6':
docs: Add SearchXonY to Common Intents
Jason Monk [Tue, 28 Oct 2014 19:16:44 +0000 (19:16 +0000)]
Merge "QS: Bring back BT/Wi-Fi sub-panels" into lmp-mr1-dev
automerge:
8c01dfc
* commit '
8c01dfc5af599398c1c79f87619c302e000e3353':
QS: Bring back BT/Wi-Fi sub-panels
Jason Monk [Tue, 28 Oct 2014 19:15:45 +0000 (19:15 +0000)]
Merge "Add hotspot icon to status bar" into lmp-mr1-dev
automerge:
09895be
* commit '
09895be87e327a7e2090c88cb4a5fc997f33103c':
Add hotspot icon to status bar
Jason Monk [Tue, 28 Oct 2014 18:45:33 +0000 (18:45 +0000)]
Merge "QS: Bring back BT/Wi-Fi sub-panels" into lmp-mr1-dev
Jason Monk [Tue, 28 Oct 2014 18:27:04 +0000 (18:27 +0000)]
Merge "Add hotspot icon to status bar" into lmp-mr1-dev
Joe Fernandez [Tue, 28 Oct 2014 18:15:33 +0000 (18:15 +0000)]
am
40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs
* commit '
40bf63e0f04b336325c370fbe4c6a8563ba5e2b7':
docs: Update timing of Android Wear app review
David Friedman [Tue, 28 Oct 2014 18:15:28 +0000 (18:15 +0000)]
am
3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
* commit '
3c00bc01f9c6e82a0859201f74237998b24872da':
Updates Notifications screenshot for Android 5.0.
Eric Gilmore [Tue, 28 Oct 2014 18:15:24 +0000 (18:15 +0000)]
am
d126294a: Docs: Adding Android Studio instructions for adding IAB service.
* commit '
d126294a8f954fb758d3f67bc5271014748ba9e7':
Docs: Adding Android Studio instructions for adding IAB service.
Quddus Chong [Tue, 28 Oct 2014 18:15:20 +0000 (18:15 +0000)]
am
2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
* commit '
2b4b3d289bb26607c8db198dae4bcfbf6247b0c1':
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
Ricardo Cervera [Tue, 28 Oct 2014 18:15:17 +0000 (18:15 +0000)]
am
61fcad92: docs: Add SearchXonY to Common Intents
* commit '
61fcad92ab55e3f874eb8fddde39dbe64235c2e5':
docs: Add SearchXonY to Common Intents
Adam Lesinski [Tue, 28 Oct 2014 17:45:13 +0000 (17:45 +0000)]
am
31b76b66: Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev
* commit '
31b76b66b1678eb6483676aa2ef587e10b98d02a':
libandroidfw: Do not build device library when building SDK
Jason Monk [Mon, 27 Oct 2014 15:38:47 +0000 (11:38 -0400)]
QS: Bring back BT/Wi-Fi sub-panels
Bluetooth has stayed pretty much the same, just came back.
Wi-Fi now shows the currently available networks like settings does.
Networks that require extra steps are taken to Settings to complete
the process.
Bug:
17722817
Change-Id: Idfcfd92f557b20168693ced26d4001f3708f08a4
Adam Lesinski [Tue, 28 Oct 2014 17:41:10 +0000 (17:41 +0000)]
Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev
John Spurlock [Tue, 28 Oct 2014 17:17:03 +0000 (17:17 +0000)]
am
ee990413: Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev
* commit '
ee990413b51b41e4fe8940cba703bdfb56a12018':
Zen: Show "(until 4:56 PM)" in exit conditions.
John Spurlock [Tue, 28 Oct 2014 17:08:42 +0000 (17:08 +0000)]
Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev
George Mount [Tue, 28 Oct 2014 17:04:33 +0000 (17:04 +0000)]
am
95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev
* commit '
95d520f160db65f90da56610eee1a047fb60fc4e':
Fix NPE in moveSharedElementsToOverlay
George Mount [Tue, 28 Oct 2014 17:04:28 +0000 (17:04 +0000)]
am
45b70108: Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev
* commit '
45b701085b8507006c07f5eb86d9f29f4ee07457':
Fixed: Nested shared elements now transition separately.
Santos Cordon [Mon, 27 Oct 2014 21:57:49 +0000 (14:57 -0700)]
Update javadocs for Telecom APIs.
Bug:
18142177
Change-Id: I78461f3634d281a6927cec9c555825a1bdab7a24
George Mount [Tue, 28 Oct 2014 17:01:23 +0000 (17:01 +0000)]
Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev
George Mount [Tue, 28 Oct 2014 17:00:42 +0000 (17:00 +0000)]
Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev
John Spurlock [Tue, 28 Oct 2014 15:21:42 +0000 (11:21 -0400)]
Zen: Show "(until 4:56 PM)" in exit conditions.
Implement two-line exit conditions, display the duration + end
time on separate lines.
Bug:
16824863
Change-Id: I8dabc83042fce604ccb86b463b9bb547c7903c64
Adrian Roos [Fri, 24 Oct 2014 16:42:51 +0000 (18:42 +0200)]
Close keyguard user switcher on tap outside
Also closes when tapping the current user.
Also fixes a bug, where the background alpha was
not properly initialized. And while we're at it,
fixes a bug where the user switcher was closable
in simple mode by extending quick settings.
Bug:
17691134
Change-Id: I5444fe42a8a2887ab012ef6cbdcc57ba81a8c1c2
Nicolas Prevot [Tue, 28 Oct 2014 16:44:47 +0000 (16:44 +0000)]
am
ebee8a4d: Merge "Replace minimum with maximum in method description." into lmp-mr1-dev
* commit '
ebee8a4d92a8e80b49feb51e9c9621c79398457c':
Replace minimum with maximum in method description.
Benjamin Franz [Tue, 28 Oct 2014 16:44:42 +0000 (16:44 +0000)]
am
f5c00c1c: Merge "Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed." into lmp-mr1-dev
* commit '
f5c00c1c1136c9752b9c0157f9eca6385d7b9448':
Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed.
Jorim Jaggi [Tue, 28 Oct 2014 16:44:36 +0000 (16:44 +0000)]
am
4eedc1d9: Fix jank when launching something from lockscreen
* commit '
4eedc1d97e5aa3bfaa60af9894cd991f9e210fc2':
Fix jank when launching something from lockscreen
Adrian Roos [Tue, 28 Oct 2014 16:44:31 +0000 (16:44 +0000)]
am
288f65e3: Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev
* commit '
288f65e3811d17273085bc5c8b553f9ba8833dd4':
Fix NPE in FlashlightController
Fix stale unlock icon
Nicolas Prevot [Tue, 28 Oct 2014 16:33:32 +0000 (16:33 +0000)]
Merge "Replace minimum with maximum in method description." into lmp-mr1-dev
Nicolas Prevot [Mon, 1 Sep 2014 11:24:05 +0000 (12:24 +0100)]
Replace minimum with maximum in method description.
BUG:
18152344
Change-Id: If5d09051e8f74addf53018cfd3be214d96efb9e6
Benjamin Franz [Tue, 28 Oct 2014 16:13:03 +0000 (16:13 +0000)]
Merge "Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed." into lmp-mr1-dev
Jorim Jaggi [Mon, 27 Oct 2014 12:45:56 +0000 (13:45 +0100)]
Fix jank when launching something from lockscreen
Apparently, hideRecents blocks around 300ms so we avoid this as a
low-risk fix. In the longer term, we should investigate why it takes
so long.
Bug:
18133433
Change-Id: I3eae659d4720d3c95280e7f7a144e00f0c760388
Adrian Roos [Tue, 28 Oct 2014 15:23:12 +0000 (15:23 +0000)]
Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev
* changes:
Fix NPE in FlashlightController
Fix stale unlock icon
Adrian Roos [Tue, 28 Oct 2014 14:44:28 +0000 (14:44 +0000)]
am
bd6f4a81: Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev
* commit '
bd6f4a818ef36764eb69ef7308eb6a9bf3740138':
Ensure trust agents are disabled in safe-mode
Adrian Roos [Tue, 28 Oct 2014 14:37:37 +0000 (14:37 +0000)]
Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev
Craig Mautner [Tue, 28 Oct 2014 14:00:54 +0000 (14:00 +0000)]
am
74fe6ce7: Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev
* commit '
74fe6ce72dcbc7af501022e7617528c30a0983bb':
Do not go through a layout if visibility is GONE
Craig Mautner [Tue, 28 Oct 2014 13:56:06 +0000 (13:56 +0000)]
Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev
Jason Monk [Mon, 27 Oct 2014 19:28:22 +0000 (15:28 -0400)]
Add hotspot icon to status bar
Bug:
17318034
Change-Id: I291fe6bf7ac8c2faffd37cfda436ef050c1c5ca5
Christoph Studer [Tue, 28 Oct 2014 12:45:50 +0000 (12:45 +0000)]
Merge "NoMan: Add update bit to notification_enqueue log" into lmp-mr1-dev
automerge:
6857203
* commit '
685720309a582acc513454d674f82368479c5297':
NoMan: Add update bit to notification_enqueue log
Christoph Studer [Tue, 28 Oct 2014 12:41:32 +0000 (12:41 +0000)]
Merge "NoMan: Add update bit to notification_enqueue log" into lmp-mr1-dev
Ari Sachter-Zeltzer [Tue, 28 Oct 2014 09:01:39 +0000 (09:01 +0000)]
am
20edd053: Merge "fixed jank on activity close exit with better alpha interpolation" into lmp-mr1-dev
* commit '
20edd0532738e9df72da0a9b6d39d541b9cb1ca9':
fixed jank on activity close exit with better alpha interpolation
Ari Sachter-Zeltzer [Tue, 28 Oct 2014 08:58:21 +0000 (08:58 +0000)]
Merge "fixed jank on activity close exit with better alpha interpolation" into lmp-mr1-dev
Erik Kline [Tue, 28 Oct 2014 07:57:29 +0000 (07:57 +0000)]
Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev
automerge:
dd91fb4
* commit '
dd91fb44743f15ee308a4cfedeca6338b6912fdc':
(re)define the definition of "provisioned"
Erik Kline [Tue, 28 Oct 2014 07:53:36 +0000 (07:53 +0000)]
Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev
Lorenzo Colitti [Tue, 28 Oct 2014 07:13:09 +0000 (07:13 +0000)]
am
111cc9f5: Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev
* commit '
111cc9f511dc65006fc2972c9ecbf295619e09b9':
Change removeStackedLink to take an interface name.
Lorenzo Colitti [Tue, 28 Oct 2014 07:00:30 +0000 (07:00 +0000)]
Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev
Lorenzo Colitti [Mon, 20 Oct 2014 02:08:03 +0000 (11:08 +0900)]
Change removeStackedLink to take an interface name.
This simplifies callers.
Also remove all "implementations" of addStackedLink and
removeStackedLink except the one in LinkProperties, because they
are unused.
Bug:
12111730
Change-Id: Ie294b855facba4b1436299dcb3211b72d9ba448e
Erik Kline [Fri, 24 Oct 2014 12:50:20 +0000 (21:50 +0900)]
(re)define the definition of "provisioned"
Specifically:
[1] provide a hasIPv4(), and
[2] a hasIPv6()
each of which requires an IP address, a default route, and
address-family-specific DNS servers to evaluate to true.
Additionally:
[3] redefine isProvisioned() to return the logical OR
of [1] and [2] above.
Any external caller can still use any of the has*() methods to
construct its own, different definition of "provisioned".
Bug:
17769720
Change-Id: Ia692fb8508484ff403d3920c94d0e1db4563f807
Lajos Molnar [Tue, 28 Oct 2014 04:11:38 +0000 (04:11 +0000)]
Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev
automerge:
aab38b7
* commit '
aab38b7ea0b1774d158789772d0f6b1b99c1d3c9':
MediaCodec/Image: handle null cropRect correctly
Lajos Molnar [Tue, 28 Oct 2014 03:28:17 +0000 (03:28 +0000)]
Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev
Joe Fernandez [Tue, 28 Oct 2014 03:25:39 +0000 (03:25 +0000)]
Merge "docs: Update timing of Android Wear app review" into lmp-docs
Joe Fernandez [Tue, 28 Oct 2014 00:39:53 +0000 (17:39 -0700)]
docs: Update timing of Android Wear app review
Change-Id: If3d31a9828b5934a871964139b8abc6b12fe8586
Griff Hazen [Tue, 28 Oct 2014 03:08:11 +0000 (03:08 +0000)]
DO NOT MERGE Fix lmp-sprout-dev build for generics addition automerge:
732e4ec -s ours
automerge:
d1cbf9a -s ours
* commit '
d1cbf9a8703a0fa2eefd9ad0f565f99120b61c3b':
DO NOT MERGE Fix lmp-sprout-dev build for generics addition
Jason Monk [Tue, 28 Oct 2014 03:07:22 +0000 (03:07 +0000)]
Add missing passive discovery flag automerge:
4444c5b automerge:
07faf0e
automerge:
e585740
* commit '
e58574026b265b4773f1e9bc896ba53530c7a580':
Add missing passive discovery flag
Ying Wang [Tue, 28 Oct 2014 03:05:59 +0000 (03:05 +0000)]
Update current.txt with generics to field types. automerge:
79775d4 automerge:
475d739 -s ours
automerge:
bc66de0
* commit '
bc66de0df9421ea0ffc36a1a6f6d8fd8bd7dfcda':
Update current.txt with generics to field types.
David Friedman [Tue, 28 Oct 2014 02:51:30 +0000 (02:51 +0000)]
Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
David Friedman [Tue, 28 Oct 2014 00:16:44 +0000 (17:16 -0700)]
Updates Notifications screenshot for Android 5.0.
Change-Id: Ib5a3f88ef5d9e580550a18d83568913d6b5d3cef
Griff Hazen [Tue, 28 Oct 2014 02:23:34 +0000 (02:23 +0000)]
DO NOT MERGE Fix lmp-sprout-dev build for generics addition
automerge:
732e4ec -s ours
* commit '
732e4ecbee3168c19e49469934f0e1cd3268e001':
DO NOT MERGE Fix lmp-sprout-dev build for generics addition
Jason Monk [Tue, 28 Oct 2014 02:21:20 +0000 (02:21 +0000)]
Add missing passive discovery flag automerge:
4444c5b
automerge:
07faf0e
* commit '
07faf0e1a1d32408dfdc863a0996baa8522c5fdb':
Add missing passive discovery flag
Ying Wang [Tue, 28 Oct 2014 02:20:25 +0000 (02:20 +0000)]
Update current.txt with generics to field types. automerge:
79775d4
automerge:
475d739 -s ours
* commit '
475d7393bf0cbb80dd1911df30a6ba0292da09c3':
Update current.txt with generics to field types.
Griff Hazen [Tue, 28 Oct 2014 02:19:22 +0000 (19:19 -0700)]
DO NOT MERGE Fix lmp-sprout-dev build for generics addition
Change-Id: I66f10264476df5504086a7fbc24d729798187d05
Yuncheol Heo [Tue, 28 Oct 2014 01:57:50 +0000 (01:57 +0000)]
Merge "CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>." into lmp-mr1-dev
automerge:
571cc6b
* commit '
571cc6b19511b07d77418b1f0288eb467d367a9a':
CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>.
Alan Viverette [Tue, 28 Oct 2014 01:56:59 +0000 (01:56 +0000)]
Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev
automerge:
e5d27a2
* commit '
e5d27a22a6908026d346e86389cf414b5badeab6':
Play CLICK sound effect when compound buttons are clicked
Ying Wang [Tue, 28 Oct 2014 01:55:59 +0000 (01:55 +0000)]
Update current.txt with generics to field types.
automerge:
80c9fbe
* commit '
80c9fbe36fe8b1e298a70c465e85ee677fc12e12':
Update current.txt with generics to field types.
Yuncheol Heo [Tue, 28 Oct 2014 01:04:06 +0000 (01:04 +0000)]
Merge "CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>." into lmp-mr1-dev
Alan Viverette [Tue, 28 Oct 2014 00:57:10 +0000 (00:57 +0000)]
Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev
Jason Monk [Tue, 28 Oct 2014 00:52:56 +0000 (00:52 +0000)]
Add missing passive discovery flag
automerge:
4444c5b
* commit '
4444c5b27874866f18cd8f4abb8914cc17857ea7':
Add missing passive discovery flag
Alan Viverette [Tue, 28 Oct 2014 00:50:51 +0000 (17:50 -0700)]
Play CLICK sound effect when compound buttons are clicked
Also plays the sound effect when the switch changes state as a result
of dragging, since that's effectively the same as the click action.
BUG:
16308311
Change-Id: Ic187ece2a8190082617f5ac7aaf05c3511fa80b5
Ying Wang [Tue, 28 Oct 2014 00:42:04 +0000 (17:42 -0700)]
Update current.txt with generics to field types.
Bug:
17014855
Change-Id: I14672092f79374f6c5b2362bd3c2aaac84e0c2ae
Winson Chung [Mon, 27 Oct 2014 23:53:52 +0000 (23:53 +0000)]
Merge "Fixing potential crash when the task loader is stopped. (Bug
18135583)" into lmp-mr1-dev
automerge:
b55f7d7
* commit '
b55f7d79d19e8d8786fab8faabedb2f253bfacf8':
Fixing potential crash when the task loader is stopped. (Bug
18135583)
Jeff Sharkey [Mon, 27 Oct 2014 23:53:00 +0000 (23:53 +0000)]
Merge "Check upgrade certs before permissions." into lmp-mr1-dev
automerge:
e795533
* commit '
e79553355b10815be2cd44f7b84ae39c91a12bb1':
Check upgrade certs before permissions.
John Reck [Mon, 27 Oct 2014 23:42:35 +0000 (23:42 +0000)]
Merge "Cleanup debug options" into lmp-mr1-dev
automerge:
b0aeaad
* commit '
b0aeaad442e6cd4920d75a63d65a91267cf9199a':
Cleanup debug options
Alan Viverette [Mon, 27 Oct 2014 23:41:44 +0000 (23:41 +0000)]
Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev
automerge:
3847552
* commit '
384755230c52f0951820ba496f300959dcc84ead':
Fix min/max date range in DatePicker calendar mode
Wale Ogunwale [Mon, 27 Oct 2014 23:40:54 +0000 (23:40 +0000)]
Merge "Added documentation for various window frame types." into lmp-mr1-dev
automerge:
674f55e
* commit '
674f55e515d0895475d136f7793f6ce9929d859c':
Added documentation for various window frame types.
Winson Chung [Mon, 27 Oct 2014 23:39:09 +0000 (23:39 +0000)]
Merge "Fixing potential crash when the task loader is stopped. (Bug
18135583)" into lmp-mr1-dev
Alan Viverette [Mon, 27 Oct 2014 23:39:09 +0000 (23:39 +0000)]
Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev
automerge:
253626b
* commit '
253626b822b3b20fdb9727705593b4b5b55b8553':
Clean up some javadocs in Window.setFeature...()