OSDN Git Service
Ben Gruver [Thu, 8 Aug 2013 22:54:21 +0000 (15:54 -0700)]
am
e64ff1b3: Merge "Improve the logic for determining whether the caller is a system app"
* commit '
e64ff1b31a72162a9179eb13f917b3bf67ae9142':
Improve the logic for determining whether the caller is a system app
Jeff Sharkey [Thu, 8 Aug 2013 22:54:19 +0000 (15:54 -0700)]
am
72bd0620: Merge "Settings, replace files, sorting by size, tweaks."
* commit '
72bd06204406e93abc236b91bfafd7d2be368221':
Settings, replace files, sorting by size, tweaks.
Romain Guy [Thu, 8 Aug 2013 22:54:16 +0000 (15:54 -0700)]
am
0b451b3a: Merge "Only destroy remote graphic buffers Bug #
9795157"
* commit '
0b451b3aaeef3afe15fcc22b1f008c8650446753':
Only destroy remote graphic buffers Bug #
9795157
Alan Viverette [Thu, 8 Aug 2013 22:54:14 +0000 (15:54 -0700)]
am
d53e376c: Merge "Fix FastScroller regression for non-UI threads"
* commit '
d53e376ce344db02a0e000114f7d7290980c6cd0':
Fix FastScroller regression for non-UI threads
Victoria Lease [Thu, 8 Aug 2013 22:54:11 +0000 (15:54 -0700)]
am
250d3c27: Merge "prototype colour emoji font"
* commit '
250d3c27a678e410b346a2602afef17170ee431a':
prototype colour emoji font
David Christie [Thu, 8 Aug 2013 22:54:09 +0000 (15:54 -0700)]
am
eb2e139b: Merge "Unhide Context.APP_OPS_SERVICE"
* commit '
eb2e139b38eb740e06b691a6a8b690251377095e':
Unhide Context.APP_OPS_SERVICE
Jeff Brown [Thu, 8 Aug 2013 22:54:07 +0000 (15:54 -0700)]
am
18ec40c4: Merge "Destroy surfaces when display is removed."
* commit '
18ec40c44c936fd5146133ccc7446a4cd860b527':
Destroy surfaces when display is removed.
Mathias Agopian [Thu, 8 Aug 2013 22:54:04 +0000 (15:54 -0700)]
am
9fb9a1c5: Merge "Fix a bug where window animation could be janky"
* commit '
9fb9a1c5c1f7921309380476e1c99724663b214f':
Fix a bug where window animation could be janky
Alan Viverette [Thu, 8 Aug 2013 22:54:01 +0000 (15:54 -0700)]
am
93e095b7: Merge "Add copy constructors for all widget-specific LayoutParams"
* commit '
93e095b731f81e8ae410b605a5ffa955b8711edd':
Add copy constructors for all widget-specific LayoutParams
Dirk Dougherty [Thu, 8 Aug 2013 22:53:59 +0000 (15:53 -0700)]
am
6e4cc12a: am
ec997806: am
1153eb46: am
4e847bd1: Doc change: fix federated urls.
* commit '
6e4cc12a6c7487583dd1e5432fe9ee81c8aa2458':
Doc change: fix federated urls.
Alan Viverette [Thu, 8 Aug 2013 22:53:56 +0000 (15:53 -0700)]
am
7a2de061: Merge "Add API for scrolling AbsListView by a pixel amount"
* commit '
7a2de0615f50ed40021cc1e931ea072b539719b8':
Add API for scrolling AbsListView by a pixel amount
Todd Poynor [Thu, 8 Aug 2013 22:53:53 +0000 (15:53 -0700)]
am
df89ca33: batteryservice: add battery current now and charge counter data
* commit '
df89ca3308544cfdd1ca12b22eac4a1d16e04410':
batteryservice: add battery current now and charge counter data
Craig Mautner [Thu, 8 Aug 2013 22:53:51 +0000 (15:53 -0700)]
am
9a04435e: Merge "Compare tasks not activities."
* commit '
9a04435e5fb7c5869d81184736c97097e24fd881':
Compare tasks not activities.
Amith Yamasani [Thu, 8 Aug 2013 22:53:48 +0000 (15:53 -0700)]
am
d8e97493: Merge "Try again to cleanup all blocked apps"
* commit '
d8e974931ede2344e49416f1586279dab8107cab':
Try again to cleanup all blocked apps
Brian Williammee [Thu, 8 Aug 2013 22:53:46 +0000 (15:53 -0700)]
am
e2b1b8e2: Merge "Track latency of captive portal checks"
* commit '
e2b1b8e2adcc212f8505bf77a5d7e098d7c12c2f':
Track latency of captive portal checks
Glenn Kasten [Thu, 8 Aug 2013 22:53:43 +0000 (15:53 -0700)]
am
d8405261: Merge "Update audio comments"
* commit '
d840526196108956c9e62e880b3f749cec11a5ec':
Update audio comments
Dianne Hackborn [Thu, 8 Aug 2013 22:53:41 +0000 (15:53 -0700)]
am
feca78f7: Merge "Start adding IPC calls to retrieve proc stat data."
* commit '
feca78f7af973cbe68ffdeb8acb871820cf6458b':
Start adding IPC calls to retrieve proc stat data.
Baligh Uddin [Thu, 8 Aug 2013 22:53:38 +0000 (15:53 -0700)]
am
b83f6223: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
b83f62236c8ca879f826941fd605a2f123262239':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 8 Aug 2013 22:53:36 +0000 (15:53 -0700)]
am
85ba45dd: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
85ba45dd62d1687473bc64728770a048fdea0a37':
Import translations. DO NOT MERGE
Ben Gruver [Thu, 8 Aug 2013 00:09:23 +0000 (00:09 +0000)]
Merge "Improve the logic for determining whether the caller is a system app"
Jeff Sharkey [Wed, 7 Aug 2013 23:34:44 +0000 (23:34 +0000)]
Merge "Settings, replace files, sorting by size, tweaks."
Jeff Sharkey [Wed, 7 Aug 2013 23:22:02 +0000 (16:22 -0700)]
Settings, replace files, sorting by size, tweaks.
Add settings to show file sizes and advanced storage devices, both
disabled by default. Add sorting by size when enabled in settings.
Always show all documents, but only allow selection when they match
MIME filter. When creating, select entire filename on focus. When
creating, treat selected documents as replacement targets using that
exact Uri unless display name is changed.
Show available bytes for device roots. Show empty text label in
empty directories. Split grid backend and details into two separate
lines. Fix path label ordering when rendering recent directories.
Change-Id: I44c62e8adb8ca7d4355510a13d1ba975196a2d29
Romain Guy [Wed, 7 Aug 2013 23:23:46 +0000 (23:23 +0000)]
Merge "Only destroy remote graphic buffers Bug #
9795157"
Alan Viverette [Wed, 7 Aug 2013 22:59:17 +0000 (22:59 +0000)]
Merge "Fix FastScroller regression for non-UI threads"
Victoria Lease [Wed, 7 Aug 2013 22:51:22 +0000 (22:51 +0000)]
Merge "prototype colour emoji font"
Alan Viverette [Wed, 7 Aug 2013 22:47:04 +0000 (15:47 -0700)]
Fix FastScroller regression for non-UI threads
Previously it was safe to call setFastScrollEnabled() and
setFastScrollAlwaysVisible() off the UI thread. After switching
FastScroller to use an Overlay, these methods stopped working.
This change ensures that all direct interaction with FastScroller
happens on the thread that created the host AbsListView.
BUG:
10210504
Change-Id: Ib6d9bd9212965420c0de39546652e3bc2d32ff8b
Victoria Lease [Wed, 7 Aug 2013 22:43:55 +0000 (15:43 -0700)]
prototype colour emoji font
Bug:
9577689
Change-Id: Ia92460280fa00fc6849cfa8aa41ca06ae5866b4a
David Christie [Wed, 7 Aug 2013 22:44:36 +0000 (22:44 +0000)]
Merge "Unhide Context.APP_OPS_SERVICE"
Romain Guy [Wed, 7 Aug 2013 22:03:40 +0000 (15:03 -0700)]
Only destroy remote graphic buffers
Bug #
9795157
Change-Id: Ia7a39d3ef40994fede185482a5b4ca5500249b34
Jeff Brown [Wed, 7 Aug 2013 21:32:32 +0000 (21:32 +0000)]
Merge "Destroy surfaces when display is removed."
Ben Gruver [Tue, 6 Aug 2013 19:34:17 +0000 (12:34 -0700)]
Improve the logic for determining whether the caller is a system app
Bug:
10024554
Change-Id: I742e918840a98dd83d713bdf7a43a919674e65fe
Mathias Agopian [Wed, 7 Aug 2013 20:36:26 +0000 (20:36 +0000)]
Merge "Fix a bug where window animation could be janky"
Alan Viverette [Wed, 7 Aug 2013 20:31:45 +0000 (20:31 +0000)]
Merge "Add copy constructors for all widget-specific LayoutParams"
Alan Viverette [Wed, 7 Aug 2013 20:24:09 +0000 (13:24 -0700)]
Add copy constructors for all widget-specific LayoutParams
BUG:
10215589
Change-Id: I4c040091e216c87f851d6b617107f43729e55b0c
Dirk Dougherty [Wed, 7 Aug 2013 20:18:34 +0000 (13:18 -0700)]
am
ec997806: am
1153eb46: am
4e847bd1: Doc change: fix federated urls.
* commit '
ec9978063794317b9934e2fc9ae4eb2de8c9b7a4':
Doc change: fix federated urls.
Craig Mautner [Wed, 7 Aug 2013 20:13:35 +0000 (13:13 -0700)]
Destroy surfaces when display is removed.
Fixes bug
10226153.
Change-Id: I4eb8b14258985768d36745260ad4e62ba6c78844
Mathias Agopian [Wed, 7 Aug 2013 06:48:07 +0000 (23:48 -0700)]
Fix a bug where window animation could be janky
SurfaceControl.closeTransaction() will block until the transaction
takes effect and this happens at the next vsync -- in practice
it means this call blocks for ~15ms.
Immediately after that we ask the choreographer to schedule the
next frame, which will happen at the next vsync. depending the
timing, this would cause the window manager to animate at 30 fps
instead of 60.
This is fixed here by calling the choreographer before we
call closeTransaction().
In the near future, we should be able to fix this by using
an offseted vsync for the window manager and it won't need
closeTransaction() to block at all.
Bug:
10209014
Change-Id: I33d0c5ecfc25154b2859f3023a8cda6e641826bf
David Christie [Wed, 7 Aug 2013 18:25:12 +0000 (11:25 -0700)]
Unhide Context.APP_OPS_SERVICE
Change-Id: Iab3e3fb2a32c3407c61abb694e21d84b50579d4f
Alan Viverette [Wed, 7 Aug 2013 18:38:14 +0000 (18:38 +0000)]
Merge "Add API for scrolling AbsListView by a pixel amount"
Todd Poynor [Wed, 31 Jul 2013 03:33:27 +0000 (20:33 -0700)]
batteryservice: add battery current now and charge counter data
Available for retrieval via future APIs if desired. Dumped by dumpsys.
Not added to batterystats or ACTION_BATTERY_CHANGED intents at this point.
Also fixes a formatting problem in the existing dumpsys output for voltage.
Change-Id: I5320b19035914256fb872c13095c09c648dd522a
Craig Mautner [Wed, 7 Aug 2013 18:26:48 +0000 (18:26 +0000)]
Merge "Compare tasks not activities."
Craig Mautner [Wed, 7 Aug 2013 18:16:33 +0000 (11:16 -0700)]
Compare tasks not activities.
In order to determine if the topmost activity needs to be moved out
of the way, compare its task to the task of the source activity
rather than compare the activities themeselves.
Fixes bug
10182783.
Change-Id: Idd4542d7ddce8b7586ee47f100366bc47e07d54f
Amith Yamasani [Wed, 7 Aug 2013 18:10:23 +0000 (18:10 +0000)]
Merge "Try again to cleanup all blocked apps"
Amith Yamasani [Wed, 7 Aug 2013 18:06:44 +0000 (11:06 -0700)]
Try again to cleanup all blocked apps
Since the Restrictions feature was removed, some cleanup code was
added to unblock apps. But the cleanup is causing some runtime exceptions
due to happening too early in the boot up sequence. Moved the cleanup
to after boot_completed broadcast is received.
Bug:
10212758
Change-Id: Id42eff16b54c24ea48cf8b3a81f77ea801264edd
Brian Williammee [Wed, 7 Aug 2013 17:34:50 +0000 (17:34 +0000)]
Merge "Track latency of captive portal checks"
Glenn Kasten [Wed, 7 Aug 2013 17:17:56 +0000 (17:17 +0000)]
Merge "Update audio comments"
Dianne Hackborn [Wed, 7 Aug 2013 17:15:04 +0000 (17:15 +0000)]
Merge "Start adding IPC calls to retrieve proc stat data."
Baligh Uddin [Wed, 7 Aug 2013 17:06:24 +0000 (17:06 +0000)]
Merge "Import translations. DO NOT MERGE"
Dianne Hackborn [Wed, 7 Aug 2013 17:08:22 +0000 (10:08 -0700)]
Start adding IPC calls to retrieve proc stat data.
Also fix a bug where we were not correctly unparcelling service
duration data.
Change-Id: Ie9113b2e3a747622441b1939ffc45edb5803a10f
Baligh Uddin [Wed, 7 Aug 2013 16:32:41 +0000 (16:32 +0000)]
Merge "Import translations. DO NOT MERGE"
Craig Mautner [Wed, 7 Aug 2013 16:27:20 +0000 (16:27 +0000)]
Merge "Create SurfaceSession before creating DimLayer."
Craig Mautner [Wed, 7 Aug 2013 16:24:11 +0000 (09:24 -0700)]
Create SurfaceSession before creating DimLayer.
Fixes "java.lang.IllegalArgumentException: session must not be null"
Change-Id: Id7e77a44e59e5169ed8944682ab79783631182dd
Ken Wakasa [Wed, 7 Aug 2013 15:03:24 +0000 (15:03 +0000)]
Revert "Reduce the transaction fee of getEnabledInputMethodSubtypeList"
This reverts commit
e9a6f9713ca48aab9a6c87e0645cb0a0af946a11.
Change-Id: I611d31086d4f02aae5c7021ac92975bd92a59f34
Satoshi Kataoka [Wed, 7 Aug 2013 06:43:29 +0000 (15:43 +0900)]
Reduce the transaction fee of getEnabledInputMethodSubtypeList
Bug:
8467480
Change-Id: Ic1fddfe433e097041fcb09d1fd341d77d7d8b13b
Svetoslav Ganov [Wed, 7 Aug 2013 06:49:25 +0000 (23:49 -0700)]
Update the print job dialog and added notification assets.
1. Update the transition between the print job edit dialog and the
generating print job dialog. Now the former shrinks into the
latter.
2. Added most of the notification assets.
Change-Id: I84f35df5cb4f71b86a103c16ab87fd4d108b055b
Mathias Agopian [Wed, 7 Aug 2013 04:37:29 +0000 (21:37 -0700)]
attempt to fix build. public api wasn't updated
Change-Id: I5afa7f20d60c1754e4d12318219af5a5861a85e0
Craig Mautner [Wed, 7 Aug 2013 04:00:57 +0000 (04:00 +0000)]
Merge "Add home StackBox to all DisplayContent."
Mathias Agopian [Wed, 7 Aug 2013 03:19:23 +0000 (03:19 +0000)]
Merge "put TextureView back to async mode"
Mathias Agopian [Wed, 7 Aug 2013 03:16:12 +0000 (20:16 -0700)]
put TextureView back to async mode
it's probably not strictly needed, but it guarantees
that the app won't deadlock itself while using a
TextureView -- this could happen if it blocked
in View.onDraw() waiting for the producer
this mimics the behavior TextureView always had.
Change-Id: I453339237a48dea91a10840b8cc0f5d2d84d1520
Jeff Tinker [Wed, 7 Aug 2013 01:44:09 +0000 (01:44 +0000)]
Merge "Define error codes for MediaCodec.CryptoException"
Romain Guy [Wed, 7 Aug 2013 01:36:24 +0000 (01:36 +0000)]
Merge "Split assets atlas batches Bug #
10185769"
Romain Guy [Tue, 6 Aug 2013 20:49:28 +0000 (13:49 -0700)]
Split assets atlas batches
Bug #
10185769
The assets atlas contains assets that need to be blended and assets
that do not need to be blended. With a single merge id, currently
set to be the pointer to the atlas itself, draw ops merging could
generate batches of commands containing both opaque and translucent
assets. The blend state was chosen from only one of the assets in
the batch, leading either to inefficiencies (blending large opaque
assets) or incorrect behaviors (not blending translucent assets.)
This change introduces two new merge ids in the atlas: an opaque
key and a blend key. These keys are simple booleans set to false
and true respectively (the values do not matter really.) Their
memory addresses are used as the merge ids when createing draw ops
batches, allowing all opaque ops to be batched together and all
translucent ops to be batched together.
Change-Id: I114dba0533c44987e53864b471ccb28c811f2025
Alan Viverette [Wed, 7 Aug 2013 01:19:48 +0000 (18:19 -0700)]
Add API for scrolling AbsListView by a pixel amount
Change-Id: Ib0fc48879991fd467242d8dc337db419edb12acf
Jeff Sharkey [Wed, 7 Aug 2013 01:18:02 +0000 (01:18 +0000)]
Merge "Recents in create, uniform item layouts."
Jeff Sharkey [Tue, 6 Aug 2013 23:26:14 +0000 (16:26 -0700)]
Recents in create, uniform item layouts.
Show recent directories in a separate fragment, and save as serialized
versions of new DirectoryStack. Cleaner behavior around recents and
search, instead of treating them as pseudo-Documents.
More uniform item layouts between list and grid, including both date
and size information, and originating storage root in recents. Avoid
clashing directory loaders by assigning unique numbers. Promote
list/grid switching up into activity.
Change-Id: I9a93460b896067ca036d7e772eeabde31face2e1
Craig Mautner [Wed, 7 Aug 2013 01:00:25 +0000 (18:00 -0700)]
Add home StackBox to all DisplayContent.
Each display needs a stack and a stack box to contain windows.
Fixes bug
10161525.
Change-Id: Ic617cdf5a082ae68f0589e826ecbb37d8fba52ac
Ben Gruver [Wed, 31 Jul 2013 22:41:24 +0000 (15:41 -0700)]
Add the inadvertently missing SCHEME string value provider
Change-Id: I70ce104efac23c3776596571e48ee195be958373
Brian Williammee [Thu, 1 Aug 2013 00:07:33 +0000 (17:07 -0700)]
Track latency of captive portal checks
When captive portal check occurs, track its latency, whether or not
we received a response, and whether or not the response was a captive
portal. Pair with information identifying the access point / base
station, and broadcast it (with a system|signature-protected
permission).
Broadcast only occurs if user has consented to
Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE.
Change-Id: I6fd59954a7ee2cc7acedf064a1465882653b2173
Amith Yamasani [Tue, 6 Aug 2013 23:21:23 +0000 (23:21 +0000)]
Merge "Use more styles for preferences to allow single pane 10""
Martijn Coenen [Tue, 6 Aug 2013 22:46:48 +0000 (22:46 +0000)]
Merge "NFC: @hide some APIs, add setDefaultForNextTap API."
Jean-Michel Trivi [Tue, 6 Aug 2013 22:37:45 +0000 (22:37 +0000)]
Merge "Event handler should be private in MediaFocusControl"
Martijn Coenen [Tue, 6 Aug 2013 22:34:03 +0000 (15:34 -0700)]
NFC: @hide some APIs, add setDefaultForNextTap API.
Change-Id: I31efe4c96a62e6c3dcb984a885214e6df045c6c6
John Spurlock [Tue, 6 Aug 2013 22:29:16 +0000 (22:29 +0000)]
Merge "Introduce new transparent bars sysui flags."
Amith Yamasani [Mon, 5 Aug 2013 17:26:18 +0000 (10:26 -0700)]
Use more styles for preferences to allow single pane 10"
Change-Id: Ib3b1032ca45f22bca08546eb65b2c42bc1975bdf
Svetoslav Ganov [Tue, 6 Aug 2013 21:40:46 +0000 (14:40 -0700)]
Print UI polish (a.k.a. just the next iteration))
1. Added a dialog to show a spinner while the app is writing the
printed content.
2. Fixed print job config acitivity leaking.
3. Updated the notifications a bit.
Change-Id: I8314390135a49605ee11ab4ed14b210a29566745
Dianne Hackborn [Tue, 6 Aug 2013 21:32:41 +0000 (21:32 +0000)]
Merge "Refactor ProcessStats, ProcessTracker."
Dianne Hackborn [Tue, 6 Aug 2013 01:18:42 +0000 (18:18 -0700)]
Refactor ProcessStats, ProcessTracker.
ProcessStats is now called ProcessCpuTracker.
ProcessTracker is now ProcessStatsService, and its inner State
class is broken out into a separate top-level ProcessStats class.
This ProcessStats is moved to the framework, so we will be able
to use it elsewhere.
Change-Id: I6a127bcb835b6b474b72647c0b99b82c2137e5c5
Glenn Kasten [Thu, 21 Jun 2012 23:21:36 +0000 (16:21 -0700)]
Update audio comments
Change-Id: If470efd77ed886da8d83a1b427c132bad77e668b
Mathias Agopian [Fri, 2 Aug 2013 08:38:38 +0000 (01:38 -0700)]
Clearly separate consumer and producer interfaces
Bug:
9265647
Change-Id: Ic68e91788d0a05251e1d2fb9f9d4de403c7099bf
Ben Gruver [Tue, 6 Aug 2013 20:02:30 +0000 (20:02 +0000)]
Merge "Read intent firewall rules from any xml file in the ifw directory"
Craig Mautner [Tue, 6 Aug 2013 19:56:50 +0000 (19:56 +0000)]
Merge "Extend clearing of mLastPausedActivity."
Jeff Brown [Tue, 6 Aug 2013 19:31:22 +0000 (19:31 +0000)]
Merge "Minor style cleanups."
Jean-Michel Trivi [Tue, 6 Aug 2013 18:41:29 +0000 (11:41 -0700)]
Event handler should be private in MediaFocusControl
Change-Id: I034224d42a3cfed8c49bfee55b332068796f9977
Jeff Sharkey [Tue, 6 Aug 2013 18:42:17 +0000 (18:42 +0000)]
Merge "Storage roots in fragment, sectioned."
Jean-Michel Trivi [Tue, 6 Aug 2013 18:40:55 +0000 (18:40 +0000)]
Merge "Reorder and comment MediaFocusControl code"
Jeff Sharkey [Tue, 6 Aug 2013 18:26:10 +0000 (11:26 -0700)]
Storage roots in fragment, sectioned.
Move storage roots into a fragment, since it's not a drawer on
tablets. Cluster and sort roots when displaying. SectionedListAdapter
to make clustered roots easier to manage. Add docs for root types.
Move roots cache into separate class to make it easier to share.
Change-Id: Ia0b92eade059e816324641f600c08026c0e268c9
Amith Yamasani [Tue, 6 Aug 2013 18:20:55 +0000 (18:20 +0000)]
Merge "Remove restrictions PIN for all users"
Amith Yamasani [Tue, 6 Aug 2013 18:18:53 +0000 (11:18 -0700)]
Remove restrictions PIN for all users
Bug:
10200097
Change-Id: I4d95cd49a21e8f4f6b2c141d1205f81622c395b5
Alan Viverette [Tue, 6 Aug 2013 18:18:05 +0000 (18:18 +0000)]
Merge "Avoid creating new objects when DateView updates time"
John Spurlock [Mon, 5 Aug 2013 16:22:40 +0000 (12:22 -0400)]
Introduce new transparent bars sysui flags.
Two new public sysui flags for views to request transparent
bars:
View.SYSTEM_UI_FLAG_TRANSPARENT_STATUS
View.SYSTEM_UI_FLAG_TRANSPARENT_NAVIGATION
This first change simply introduces the flags at the framework
level, and makes the requisite layout tweaks to WM.
As part of this change, expunge the term "hideybars" from the
codebase. The flag to declare support for transient bars is called:
View.SYSTEM_UI_FLAG_ALLOW_TRANSIENT
Final visuals/transitions between opaque/transparent bars will be
done as a subsequent change. Right now the transparent style is
identical to the transient bars.
Change-Id: I5ead9c5e7b77f212df5b2a5f6e770596cd2226f3
Dirk Dougherty [Tue, 6 Aug 2013 17:48:48 +0000 (10:48 -0700)]
am
1153eb46: am
4e847bd1: Doc change: fix federated urls.
* commit '
1153eb46b3aa0226f6d1eac7a196052bd5d818f0':
Doc change: fix federated urls.
Dirk Dougherty [Tue, 6 Aug 2013 17:46:37 +0000 (10:46 -0700)]
am
4e847bd1: Doc change: fix federated urls.
* commit '
4e847bd1f0c4e09f169603fde129e4433a3fe5bc':
Doc change: fix federated urls.
Jean-Michel Trivi [Tue, 6 Aug 2013 17:42:45 +0000 (10:42 -0700)]
Reorder and comment MediaFocusControl code
Change-Id: Iacc03a7233789bd1588e9f7d2ca5df10a756fb0d
Dirk Dougherty [Tue, 6 Aug 2013 17:37:14 +0000 (10:37 -0700)]
am
c5663c9f: am
8154d293: am
58c68d77: Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs
* commit '
c5663c9f7cdd33e163f745bf4e65e141ca233537':
Doc change: Updated reference docs for Google Play Services 3.2.
David Christie [Tue, 6 Aug 2013 17:28:49 +0000 (17:28 +0000)]
Merge "Revert "Fix broken unit test""
David Christie [Tue, 6 Aug 2013 17:28:03 +0000 (17:28 +0000)]
Revert "Fix broken unit test"
This reverts commit
0ca981fe42c43a4b7c345f4a0a2b3b2a519be5da.
Change-Id: I67f5e7227a8a874158c4f0954e62a77a317f1edd
Dirk Dougherty [Tue, 6 Aug 2013 16:59:51 +0000 (09:59 -0700)]
Doc change: fix federated urls.
Change-Id: I29758362e81361a58d85ff8ec9e19d5c8da8da7d
David Christie [Tue, 6 Aug 2013 16:56:16 +0000 (16:56 +0000)]
Merge "Fix broken unit test"
Zhijun He [Mon, 5 Aug 2013 21:56:11 +0000 (14:56 -0700)]
ImageReader: Add RGB format support.
Bug:
10155122
Change-Id: Id53d6ec815488e73bde6ca62b42c92d16bc813c9
Dirk Dougherty [Tue, 6 Aug 2013 16:32:56 +0000 (09:32 -0700)]
am
8154d293: am
58c68d77: Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs
* commit '
8154d2932a3e4f9800eeff18da640fda7a169ec8':
Doc change: Updated reference docs for Google Play Services 3.2.