OSDN Git Service
Robert Ly [Wed, 25 Jun 2014 00:27:21 +0000 (00:27 +0000)]
am
7320eeac: am
93c5d262: Merge "docs: fix auto footer" into klp-modular-dev
* commit '
7320eeac12843cd31081e184d1e235fb59fef258':
docs: fix auto footer
Robert Ly [Wed, 25 Jun 2014 00:27:16 +0000 (00:27 +0000)]
am
a0d06584: am
3db26d9d: docs: add correct arm image
* commit '
a0d06584f7284ee2fbea56e1ba2dbfaec849b12a':
docs: add correct arm image
Robert Ly [Wed, 25 Jun 2014 00:27:11 +0000 (00:27 +0000)]
am
c7dc9d5d: am
17f1b0a6: Merge "docs: fix blog post link, add arm image, fix ecosystem text" into klp-modular-dev
* commit '
c7dc9d5d20f62915375a7debc3c74400b5a60e38':
docs: fix blog post link, add arm image, fix ecosystem text
Robert Ly [Wed, 25 Jun 2014 00:27:06 +0000 (00:27 +0000)]
am
d1c8a3eb: am
7395c0db: Merge "docs: Updates to the L Preview Highlights." into klp-modular-dev
* commit '
d1c8a3eb721a1c789897dcd560006b68d3ef931c':
docs: Updates to the L Preview Highlights.
Robert Ly [Wed, 25 Jun 2014 00:27:00 +0000 (00:27 +0000)]
am
a5314536: am
0ebf5c7f: Merge "docs: Updates for L Preview Support page." into klp-modular-dev
* commit '
a5314536f6f98dbbc5452802bc9a14eb8d6300a1':
docs: Updates for L Preview Support page.
Ricardo Cervera [Wed, 25 Jun 2014 00:26:55 +0000 (00:26 +0000)]
am
9fa541bd: am
7e81aab5: docs: Removed para based on copy review from Auto landing page.
* commit '
9fa541bd4e4e00524b826c6afb2d8a4a81a91f36':
docs: Removed para based on copy review from Auto landing page.
Ricardo Cervera [Wed, 25 Jun 2014 00:26:48 +0000 (00:26 +0000)]
am
6c370114: am
5b225bf4: Merge "docs: Added three columns on the Auto SDK." into klp-modular-dev
* commit '
6c370114c27e784ee6aa1b23c1762c9285727dea':
docs: Added three columns on the Auto SDK.
Brian Carlstrom [Wed, 25 Jun 2014 00:26:43 +0000 (00:26 +0000)]
am
4074abed: (-s ours) am
c38c0472: Add missing class to preloaded-classes for ART build
* commit '
4074abedf641d00eca4247a56dafd037f1cd7dd0':
Add missing class to preloaded-classes for ART build
Michael Wright [Wed, 4 Jun 2014 21:51:58 +0000 (14:51 -0700)]
Global keys should wake the device if they're wake keys.
Bug:
15430207
Bug:
15434710
Change-Id: I98083e1389079f00b612ae4fae3ecab5a2a51b0d
Christopher Tate [Tue, 24 Jun 2014 23:28:48 +0000 (16:28 -0700)]
Add 'fullbackup' to bmgr's usage statement
Also make it handle the list of packages to be backed up as a single
multiple-app argument to fullTransportBackup() rather than N calls
each backing up one app.
Change-Id: I9fe4d5caca54fafef70ffe9af4c26e3941dc5d26
Robert Ly [Tue, 24 Jun 2014 21:14:15 +0000 (21:14 +0000)]
am
93c5d262: Merge "docs: fix auto footer" into klp-modular-dev
* commit '
93c5d262f99dbf271de79e7093c65c9f272f6136':
docs: fix auto footer
Robert Ly [Tue, 24 Jun 2014 21:14:11 +0000 (21:14 +0000)]
am
3db26d9d: docs: add correct arm image
* commit '
3db26d9d08bfed43b356c7462dbd0439ddd59c29':
docs: add correct arm image
Robert Ly [Tue, 24 Jun 2014 21:13:55 +0000 (21:13 +0000)]
am
17f1b0a6: Merge "docs: fix blog post link, add arm image, fix ecosystem text" into klp-modular-dev
* commit '
17f1b0a6705be74a373fe31bd999d2696a5b7cf6':
docs: fix blog post link, add arm image, fix ecosystem text
Robert Ly [Tue, 24 Jun 2014 21:13:51 +0000 (21:13 +0000)]
am
7395c0db: Merge "docs: Updates to the L Preview Highlights." into klp-modular-dev
* commit '
7395c0dbf37c536c37521bfabde90c1a6e9b7e9b':
docs: Updates to the L Preview Highlights.
Robert Ly [Tue, 24 Jun 2014 21:13:47 +0000 (21:13 +0000)]
am
0ebf5c7f: Merge "docs: Updates for L Preview Support page." into klp-modular-dev
* commit '
0ebf5c7f4dee231bd71fb98ee6ab4e0cb943685f':
docs: Updates for L Preview Support page.
Ricardo Cervera [Tue, 24 Jun 2014 21:13:43 +0000 (21:13 +0000)]
am
7e81aab5: docs: Removed para based on copy review from Auto landing page.
* commit '
7e81aab55ae941800b90cb2a5af3da488ddebbe7':
docs: Removed para based on copy review from Auto landing page.
Ricardo Cervera [Tue, 24 Jun 2014 21:13:39 +0000 (21:13 +0000)]
am
5b225bf4: Merge "docs: Added three columns on the Auto SDK." into klp-modular-dev
* commit '
5b225bf474cbec860988348d2698ad5b632348ca':
docs: Added three columns on the Auto SDK.
Brian Carlstrom [Tue, 24 Jun 2014 21:13:35 +0000 (21:13 +0000)]
am
c38c0472: Add missing class to preloaded-classes for ART build
* commit '
c38c0472cb6ed6ff642fea81da3cc9af5a0f1d52':
Add missing class to preloaded-classes for ART build
Quddus Chong [Tue, 24 Jun 2014 21:13:31 +0000 (21:13 +0000)]
am
a93744bd: Merge "docs: Updated L Preview Support page." into klp-modular-dev
* commit '
a93744bde3103613a834ffee3626fb72e223a17d':
docs: Updated L Preview Support page.
Katie McCormick [Tue, 24 Jun 2014 21:13:27 +0000 (21:13 +0000)]
am
e89c6ebe: Doc update: GCM changes for I/O.
* commit '
e89c6ebeceb2a04d8ee05e73e15a899b686f811a':
Doc update: GCM changes for I/O.
Robert Ly [Tue, 24 Jun 2014 21:00:16 +0000 (21:00 +0000)]
am
7cfd2e03: Merge "docs: fix lmp and index pages" into klp-modular-dev
* commit '
7cfd2e03c474cccb413522b663cf08b9bbbc0cca':
docs: fix lmp and index pages
Robert Ly [Tue, 24 Jun 2014 21:00:08 +0000 (21:00 +0000)]
am
0ceb16d9: Merge "docs: Fix auto site css for screenshot frames." into klp-modular-dev
* commit '
0ceb16d96059d8769a296af8c5ca916198a2cda6':
docs: Fix auto site css for screenshot frames.
Robert Ly [Tue, 24 Jun 2014 21:00:04 +0000 (21:00 +0000)]
am
3158e1a6: Merge "docs: Addressed reviews and fixes for Auto dev overview" into klp-modular-dev
* commit '
3158e1a6a36c97508179d727302ca73201eb0b0d':
docs: Addressed reviews and fixes for Auto dev overview
Andrew Solovay [Tue, 24 Jun 2014 20:59:59 +0000 (20:59 +0000)]
am
619c8961: Merge "docs: Added table for the L device images." into klp-modular-dev
* commit '
619c8961fdab6cd991c5dc956e36bdcbe79bda11':
docs: Added table for the L device images.
Narayan Kamath [Tue, 24 Jun 2014 14:26:45 +0000 (14:26 +0000)]
am
b20b0629: am
71dfc7e9: Merge "Memory leak in parsePackage"
* commit '
b20b0629c2ea6a8e1f7bebd0791dd21e545a4605':
Memory leak in parsePackage
Narayan Kamath [Tue, 24 Jun 2014 14:21:14 +0000 (14:21 +0000)]
am
71dfc7e9: Merge "Memory leak in parsePackage"
* commit '
71dfc7e9accc1ca3cda52bdf475b03fa2a334e78':
Memory leak in parsePackage
Quddus Chong [Tue, 24 Jun 2014 13:55:09 +0000 (13:55 +0000)]
am
300caefb: Merge "docs: Removing note for app-indexing developer early adopters from training class, since this feature is going to be publically accessible starting in GMS Longhorn." into klp-modular-dev
* commit '
300caefb0ca877f45f48d4e76bc086672a6f59b6':
docs: Removing note for app-indexing developer early adopters from training class, since this feature is going to be publically accessible starting in GMS Longhorn.
Robert Ly [Tue, 24 Jun 2014 13:55:05 +0000 (13:55 +0000)]
am
387891fd: fix resources js bug
* commit '
387891fde61a63c98ac3a81a5a0d1d7151a95d1f':
fix resources js bug
smain@google.com [Tue, 24 Jun 2014 13:55:01 +0000 (13:55 +0000)]
am
f98b816b: update landing page gif frame to use new style
* commit '
f98b816b936ee0beb07a66caee2cf0e3e3bed9ce':
update landing page gif frame to use new style
Narayan Kamath [Tue, 24 Jun 2014 12:19:10 +0000 (12:19 +0000)]
am
22a32d88: am
2a0f9e6a: Merge "Explicitly list out the list of cache subdirs to prune."
* commit '
22a32d883794a7a96ff5ffb4830ea59065b3ebda':
Explicitly list out the list of cache subdirs to prune.
Narayan Kamath [Tue, 24 Jun 2014 12:14:12 +0000 (12:14 +0000)]
am
2a0f9e6a: Merge "Explicitly list out the list of cache subdirs to prune."
* commit '
2a0f9e6a523abc28bdbc249010f5ddd184a27730':
Explicitly list out the list of cache subdirs to prune.
Narayan Kamath [Tue, 24 Jun 2014 10:18:23 +0000 (10:18 +0000)]
am
c141ae54: am
989ab6d3: Merge "Update javadoc for android.os.Bundle."
* commit '
c141ae547e9b295ce9013591a6fbb902b0e40073':
Update javadoc for android.os.Bundle.
Narayan Kamath [Tue, 24 Jun 2014 10:08:52 +0000 (10:08 +0000)]
am
989ab6d3: Merge "Update javadoc for android.os.Bundle."
* commit '
989ab6d38d77c0a1f7dc5e648e1950410d5d01d4':
Update javadoc for android.os.Bundle.
Stephen Hines [Tue, 24 Jun 2014 09:26:31 +0000 (09:26 +0000)]
am
db3bcfb8: am
44023a4f: Merge "We need to update mPos when we copy a FieldPacker via its data[] member."
* commit '
db3bcfb8f7c1f148bc89eea663ba5aa6fc0ece2f':
We need to update mPos when we copy a FieldPacker via its data[] member.
Jason Monk [Tue, 24 Jun 2014 22:55:51 +0000 (22:55 +0000)]
Merge "The profile owner shouldn't control lock task"
Jason Monk [Tue, 24 Jun 2014 15:12:42 +0000 (11:12 -0400)]
The profile owner shouldn't control lock task
Since managed profiles are started on bootup, the managed profile
would be allowed to set an app (possibly itself) as a lock task
app and then run itself on bootup and constantly control the
device. This privelege should be restricted to device owners.
Change-Id: I4a93aabd6054cbe75076ef0517fce03ffa74dc93
Dianne Hackborn [Tue, 24 Jun 2014 22:53:20 +0000 (22:53 +0000)]
Merge "Fix some problems with proc stats collection."
Dianne Hackborn [Tue, 24 Jun 2014 22:41:03 +0000 (15:41 -0700)]
Fix some problems with proc stats collection.
Also start debugging why we aren't being able to open
/proc files.
Change-Id: I4655904691ac22108c29858cbd01153a251ccbf5
Stephen Hines [Tue, 24 Jun 2014 06:53:18 +0000 (06:53 +0000)]
am
44023a4f: Merge "We need to update mPos when we copy a FieldPacker via its data[] member."
* commit '
44023a4f20a38ed892a6181765337635d77b1de8':
We need to update mPos when we copy a FieldPacker via its data[] member.
Robert Ly [Tue, 24 Jun 2014 06:51:39 +0000 (23:51 -0700)]
docs: add correct arm image
Change-Id: Icea04e2c07ed1f5b757abe5a92bec74304238e3e
Christoph Studer [Tue, 24 Jun 2014 15:09:48 +0000 (15:09 +0000)]
Merge "Remove notification APIs from StatusBar service"
Christoph Studer [Tue, 24 Jun 2014 14:16:49 +0000 (16:16 +0200)]
Remove notification APIs from StatusBar service
Bug:
15324972
Bug:
15436573
Change-Id: I838370a23fb07cb876e08c41ef11653f2658719e
Narayan Kamath [Tue, 24 Jun 2014 14:38:39 +0000 (14:38 +0000)]
am
70bf0698: (-s ours) am
b20b0629: am
71dfc7e9: Merge "Memory leak in parsePackage"
* commit '
70bf06986a90c21137fc4836aa0e56d68a2ab588':
Memory leak in parsePackage
Derek Sollenberger [Mon, 23 Jun 2014 18:17:06 +0000 (14:17 -0400)]
Cleanup unused includes in the hwui library.
Change-Id: I94c188403f5fa541e47a03a3bd1c7cf00c29bf4e
Quddus Chong [Tue, 24 Jun 2014 14:00:37 +0000 (14:00 +0000)]
am
ed8b77e6: am
300caefb: Merge "docs: Removing note for app-indexing developer early adopters from training class, since this feature is going to be publically accessible starting in GMS Longhorn." into klp-modular-dev
* commit '
ed8b77e668dbc8aa4a8c2a108dce98f2900cc5b3':
docs: Removing note for app-indexing developer early adopters from training class, since this feature is going to be publically accessible starting in GMS Longhorn.
Robert Ly [Tue, 24 Jun 2014 14:00:32 +0000 (14:00 +0000)]
am
a5dc5869: am
387891fd: fix resources js bug
* commit '
a5dc5869ee15607072b402ab65f8accacf4ed4c8':
fix resources js bug
smain@google.com [Tue, 24 Jun 2014 14:00:27 +0000 (14:00 +0000)]
am
071894a2: am
f98b816b: update landing page gif frame to use new style
* commit '
071894a2108780199cd912cccdfe10cda5212be6':
update landing page gif frame to use new style
Narayan Kamath [Tue, 24 Jun 2014 12:07:45 +0000 (12:07 +0000)]
Merge "Explicitly list out the list of cache subdirs to prune."
Narayan Kamath [Tue, 24 Jun 2014 14:16:04 +0000 (14:16 +0000)]
Merge "Memory leak in parsePackage"
Narayan Kamath [Tue, 24 Jun 2014 10:03:08 +0000 (10:03 +0000)]
Merge "Update javadoc for android.os.Bundle."
Ricardo Cervera [Tue, 24 Jun 2014 00:49:14 +0000 (17:49 -0700)]
docs: Removed para based on copy review from Auto landing page.
Change-Id: I4bbc3d1d8997b6675efb631081edec2537b2141d
Stephen Hines [Tue, 24 Jun 2014 00:57:44 +0000 (00:57 +0000)]
Merge "We need to update mPos when we copy a FieldPacker via its data[] member."
Stephen Hines [Tue, 24 Jun 2014 00:35:04 +0000 (17:35 -0700)]
We need to update mPos when we copy a FieldPacker via its data[] member.
Bug:
15756600
This change also adds a TODO/FIXME related to subAlign() and our tracking
mechanism for it. We need to further investigate how to make subAlign() work
properly if a user copies their FieldPacker.
Change-Id: I861e529abd11e378f7c73b510d7f418b940fe480
Robert Ly [Tue, 24 Jun 2014 16:02:03 +0000 (16:02 +0000)]
Merge "docs: fix auto footer" into klp-modular-dev
Robert Ly [Tue, 24 Jun 2014 05:21:20 +0000 (22:21 -0700)]
docs: fix auto footer
Change-Id: I84db14897bbcece07d5597b7e09bb5c23fb47ba1
Robert Ly [Tue, 24 Jun 2014 01:38:44 +0000 (01:38 +0000)]
Merge "docs: Updates to the L Preview Highlights." into klp-modular-dev
Robert Ly [Tue, 24 Jun 2014 01:36:37 +0000 (01:36 +0000)]
Merge "docs: Updates for L Preview Support page." into klp-modular-dev
Quddus Chong [Tue, 24 Jun 2014 01:07:02 +0000 (18:07 -0700)]
docs: Updates for L Preview Support page.
Change-Id: Ib620eb547d34042864b5f9b9af11a5dbd8507e8c
Quddus Chong [Mon, 23 Jun 2014 19:34:59 +0000 (12:34 -0700)]
docs: Updates to the L Preview Highlights.
Change-Id: I085174255e3b45fcdb320fe94a091c7975e80b61
Brian Carlstrom [Fri, 13 Jun 2014 22:19:10 +0000 (15:19 -0700)]
Add missing class to preloaded-classes for ART build
Change-Id: I391dcd9b3f88f5733c28498055f23801ff10948b
Katie McCormick [Thu, 29 May 2014 00:31:23 +0000 (17:31 -0700)]
Doc update: GCM changes for I/O.
Fixes for:
b/
15348323
b/
15349955
b/
15330953
Change-Id: Ie256a76ea83cf16256cded858531dd78b8da0558
Robert Greenwalt [Mon, 23 Jun 2014 22:10:37 +0000 (22:10 +0000)]
am
a77d0ef4: (-s ours) am
0b572896: (-s ours) Merge "DO NOT MERGE refactor wifi p2p\'s startDhcpServer function"
* commit '
a77d0ef49e8c4b53e1cd794c0739584914bd6eda':
DO NOT MERGE refactor wifi p2p's startDhcpServer function
Robert Greenwalt [Mon, 23 Jun 2014 22:02:12 +0000 (22:02 +0000)]
am
0b572896: (-s ours) Merge "DO NOT MERGE refactor wifi p2p\'s startDhcpServer function"
* commit '
0b57289678a4dc82fefa4894901af1be7f5cc3c6':
DO NOT MERGE refactor wifi p2p's startDhcpServer function
Robert Greenwalt [Mon, 23 Jun 2014 21:56:52 +0000 (21:56 +0000)]
Merge "DO NOT MERGE refactor wifi p2p's startDhcpServer function"
Quddus Chong [Mon, 23 Jun 2014 23:02:40 +0000 (23:02 +0000)]
Merge "docs: Updated L Preview Support page." into klp-modular-dev
Marco Nelissen [Mon, 23 Jun 2014 21:51:38 +0000 (21:51 +0000)]
am
c4d37f58: am
0eee8ac2: Merge "Fix thumbnail bug"
* commit '
c4d37f58a1b5405812eaf96b4bd3a051d86884eb':
Fix thumbnail bug
Robert Ly [Tue, 24 Jun 2014 03:01:57 +0000 (03:01 +0000)]
Merge "docs: fix blog post link, add arm image, fix ecosystem text" into klp-modular-dev
Robert Ly [Mon, 23 Jun 2014 22:39:15 +0000 (15:39 -0700)]
docs: fix blog post link, add arm image, fix ecosystem text
Change-Id: I1fab7f67d99ca787a6057c89b90e2892241df1d3
Ricardo Cervera [Tue, 24 Jun 2014 00:39:59 +0000 (00:39 +0000)]
Merge "docs: Added three columns on the Auto SDK." into klp-modular-dev
Ricardo Cervera [Tue, 24 Jun 2014 00:04:53 +0000 (17:04 -0700)]
docs: Added three columns on the Auto SDK.
Also updated the images from the design guys.
Change-Id: Idca893d461dd8a1d8374774c9eac670f1bc78d49
Robert Ly [Mon, 23 Jun 2014 22:06:39 +0000 (22:06 +0000)]
Merge "docs: fix lmp and index pages" into klp-modular-dev
Winson Chung [Tue, 24 Jun 2014 22:32:22 +0000 (22:32 +0000)]
Merge "Refactoring RecentsActivity and TaskStackViewTouchHandler."
Adam Lesinski [Fri, 25 Apr 2014 18:01:43 +0000 (11:01 -0700)]
Dump more info about behaviors an APK offers
Behaviors include things like print services,
custom launchers, camera apps, etc.
Bug:
13748429
Change-Id: I9fb83bac95b1be61fc630c1e74daf0f4a8b9b27f
Quddus Chong [Tue, 24 Jun 2014 21:20:33 +0000 (21:20 +0000)]
am
ab93c42c: am
a93744bd: Merge "docs: Updated L Preview Support page." into klp-modular-dev
* commit '
ab93c42cd5c23706da3dace9a9d9a8abdf14fce8':
docs: Updated L Preview Support page.
Katie McCormick [Tue, 24 Jun 2014 21:20:28 +0000 (21:20 +0000)]
am
4c64e2e5: am
e89c6ebe: Doc update: GCM changes for I/O.
* commit '
4c64e2e50fb9fa9c110d559c140e430f0f23718c':
Doc update: GCM changes for I/O.
Robert Ly [Tue, 24 Jun 2014 21:05:11 +0000 (21:05 +0000)]
am
a1a9efeb: am
7cfd2e03: Merge "docs: fix lmp and index pages" into klp-modular-dev
* commit '
a1a9efeb4985af409a1676d179082b4dcd20da30':
docs: fix lmp and index pages
Robert Ly [Tue, 24 Jun 2014 21:05:06 +0000 (21:05 +0000)]
am
2402c9d1: am
0ceb16d9: Merge "docs: Fix auto site css for screenshot frames." into klp-modular-dev
* commit '
2402c9d13307284d12cc2443a913e8e7fb5373ca':
docs: Fix auto site css for screenshot frames.
Robert Ly [Tue, 24 Jun 2014 21:05:01 +0000 (21:05 +0000)]
am
06da0121: am
3158e1a6: Merge "docs: Addressed reviews and fixes for Auto dev overview" into klp-modular-dev
* commit '
06da01216cac173777a11460b6f9f1414cf03056':
docs: Addressed reviews and fixes for Auto dev overview
Andrew Solovay [Tue, 24 Jun 2014 21:04:55 +0000 (21:04 +0000)]
am
dd46444e: am
619c8961: Merge "docs: Added table for the L device images." into klp-modular-dev
* commit '
dd46444e5471a4bbda28b74ae30ab3d6e2f75030':
docs: Added table for the L device images.
Winson Chung [Tue, 24 Jun 2014 19:11:49 +0000 (12:11 -0700)]
Refactoring RecentsActivity and TaskStackViewTouchHandler.
- Pulling out logic related to system bar scrims, and touch handlers to their own classes
- Pulling out shadow reflection code out of RecentsActivity
- Ensuring that we poke the doze trigger when scrolling
Chong Zhang [Tue, 24 Jun 2014 18:54:56 +0000 (18:54 +0000)]
Merge "don't select default track if subtitle controller is not present"
Igor Murashkin [Tue, 24 Jun 2014 17:49:11 +0000 (10:49 -0700)]
camera2: (legacy) Write the JPEG size as part of the blob transport
This fixes StillCaptureTest#testStillPreviewCombination
Change-Id: Ifbaae7828b2efcc1a768c77ce50718abd7f691d0
Chong Zhang [Tue, 24 Jun 2014 17:53:26 +0000 (10:53 -0700)]
don't select default track if subtitle controller is not present
subtitle controller won't be there if app is not using VideoView.
Bug:
15470448
Change-Id: If6724928220a8906bd2199ebc0916a4493092abb
Igor Murashkin [Mon, 23 Jun 2014 21:44:09 +0000 (14:44 -0700)]
camera2: Fix cts test StillCaptureTest#testTakePicture
* Introduce 'fake' metadata for 3A+flash (hardcoded to support nothing)
(will be removed in a later release)
* Open the camera1 device in its own thread, so that the looper it
captures is also our own (and not the main looper)
* Set the picture size based on the size of the JPEG surface outputs
Change-Id: Iaeb5031c6b352115b73d2261a39d65347d75fdc8
Adam Powell [Tue, 24 Jun 2014 19:48:34 +0000 (19:48 +0000)]
Merge "Inflate fragments from layout into child FragmentManagers"
Adam Powell [Fri, 20 Jun 2014 19:51:12 +0000 (12:51 -0700)]
Inflate fragments from layout into child FragmentManagers
Previously, if an app inflated a layout in a Fragment's onCreateView
that itself had fragments included, those fragments would be added to
the Activity-level FragmentManager and would not share the same
lifecycle with the fragment it was inflated for. This led to some
nasty management headaches.
If an app targets L or above, add the fragment to the child
FragmentManager of the current fragment when inflated using the
LayoutInflater passed to the parent fragment.
Bug
12763389
Change-Id: Iad4ed7d5df602aea9579bf1503e206fa894630c1
Craig Mautner [Tue, 24 Jun 2014 17:44:35 +0000 (17:44 +0000)]
Merge "Don't set return to recents on every resume"
Craig Mautner [Tue, 24 Jun 2014 16:05:43 +0000 (09:05 -0700)]
Don't set return to recents on every resume
Checking for previous task to be the Recents activity every time
through resumeTopActivityLocked() leads to missetting the
mTaskToReturnTo to Recents for Recents. Instead check for
Recents launching a task in moveTaskToFront and startActivity.
Fixes bug
15832448.
Change-Id: Ib64fe26f3fd3fdcd878edafb041928ec02757e63
Marco Nelissen [Mon, 23 Jun 2014 21:45:30 +0000 (21:45 +0000)]
am
0eee8ac2: Merge "Fix thumbnail bug"
* commit '
0eee8ac275927264f766bb18023365e83d4bfe5a':
Fix thumbnail bug
Robert Greenwalt [Tue, 24 Jun 2014 00:41:10 +0000 (00:41 +0000)]
Merge "Clean up and add some Network logging."
Robert Greenwalt [Mon, 23 Jun 2014 23:07:43 +0000 (16:07 -0700)]
Clean up and add some Network logging.
Dumps the netid for the Network and adds that to the NetworkAgentInfo.
Change-Id: Id9fbcc55ca55bf1a020f747f0c44902efb1b5f87
RoboErik [Fri, 20 Jun 2014 21:59:58 +0000 (14:59 -0700)]
b/
15757378 Expose APIs for listening to active sessions
This allows apps that are registered notification listeners to
listen to the set of active sessions.
Change-Id: I1e108951a5049d138208e88b155c0ec9b95fbdb0
Bo Liu [Mon, 23 Jun 2014 23:11:08 +0000 (23:11 +0000)]
Merge "Remove View.executeHardwareAction"
Bo Liu [Mon, 23 Jun 2014 18:43:00 +0000 (11:43 -0700)]
Remove View.executeHardwareAction
Webview does not need this anymore.
BUG:
13961296
Change-Id: Ia0681dea35155513b916844ecf83faf6d544a2e3
George Mount [Tue, 24 Jun 2014 13:50:51 +0000 (13:50 +0000)]
Merge "Use Property for ofFloat with Path."
Narayan Kamath [Tue, 24 Jun 2014 12:32:50 +0000 (12:32 +0000)]
am
152d5cd3: am
22a32d88: am
2a0f9e6a: Merge "Explicitly list out the list of cache subdirs to prune."
* commit '
152d5cd30bdfd88b0903b205d38c6966cbded5a8':
Explicitly list out the list of cache subdirs to prune.
Narayan Kamath [Tue, 24 Jun 2014 12:02:49 +0000 (13:02 +0100)]
resolved conflicts for merge of
816cff12 to master
Change-Id: I33990232771138dcf91f55c7cde6bbfe40612b8f
Stephen Hines [Tue, 24 Jun 2014 10:38:45 +0000 (10:38 +0000)]
am
ed24d3f2: am
db3bcfb8: am
44023a4f: Merge "We need to update mPos when we copy a FieldPacker via its data[] member."
* commit '
ed24d3f2e991906973afce8aa6a3fa54f4a3e4df':
We need to update mPos when we copy a FieldPacker via its data[] member.
Deepanshu Gupta [Tue, 24 Jun 2014 10:33:55 +0000 (10:33 +0000)]
am
699f7221: Merge "Temporarily change PorterDuff mode MULTIPLY to SRC_IN" into lmp-preview-dev
* commit '
699f7221dc0719b1ceb03a03183dc742a5bcdf3c':
Temporarily change PorterDuff mode MULTIPLY to SRC_IN
Deepanshu Gupta [Tue, 24 Jun 2014 10:33:49 +0000 (10:33 +0000)]
am
91977396: Merge "Fix bug to render status bar icons" into lmp-preview-dev
* commit '
9197739603eb34df6cbc85c6a7fa0ea359e4776b':
Fix bug to render status bar icons