OSDN Git Service
Jeff Brown [Wed, 7 Aug 2013 21:32:32 +0000 (21:32 +0000)]
Merge "Destroy surfaces when display is removed."
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
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.
Dirk Dougherty [Tue, 6 Aug 2013 16:30:12 +0000 (09:30 -0700)]
am
58c68d77: Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs
* commit '
58c68d77596dc81ac6715c8bc7785d1cc430929f':
Doc change: Updated reference docs for Google Play Services 3.2.
Craig Mautner [Tue, 6 Aug 2013 15:44:42 +0000 (08:44 -0700)]
Extend clearing of mLastPausedActivity.
Add more locations where mLastPausedActivity must be set null before
calling resumeTopActivityLocked().
Also separate the "No History" activity from mLastPausedActivity by
adding mLastNoHistoryActivity. This is necessary because now
mLastPausedActivity will be null when mLastNoHistoryActivity
is checked.
Continues to fix bug
10022212.
Change-Id: Ida543b0638c865127691dc51a6e0635062539659
Dirk Dougherty [Tue, 6 Aug 2013 07:35:27 +0000 (07:35 +0000)]
Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs
Baligh Uddin [Tue, 6 Aug 2013 03:46:27 +0000 (20:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0c6999034ab12cf0a9e6b7344e03b8b866406fde
Auto-generated-cl: translation import
Yorke Lee [Tue, 6 Aug 2013 03:42:06 +0000 (03:42 +0000)]
Merge "Add DEMOTED and UNDEMOTE TO ContactsContract"
Baligh Uddin [Tue, 6 Aug 2013 03:40:16 +0000 (20:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6e94a37fbb63c506d46debba9fd8d3ff9d4e21fe
Auto-generated-cl: translation import
Jeff Brown [Tue, 6 Aug 2013 03:39:29 +0000 (20:39 -0700)]
Minor style cleanups.
A few changes to demonstrate a slightly cleaner way to write
JNI code in the framework especially when multiple types are
involved. We use this pattern in many other places outside
of the media stack.
Added more detail to the UnsupportedOperationException that
occurs when buffer formats don't match.
Change-Id: Ic894dc1bd71b387f1be6ea1798fa59e533e9574f
Jeff Sharkey [Tue, 6 Aug 2013 03:15:07 +0000 (03:15 +0000)]
Merge "More recents work; filtering and sorting."
Jeff Sharkey [Tue, 6 Aug 2013 00:56:48 +0000 (17:56 -0700)]
More recents work; filtering and sorting.
Update DirectoryFragment to render List<Document>, making it more
general purpose. Feed it documents either from a backend Cursor or
after resolving fields from a recents Cursor. Start in recents when
no persisted stack available. Synthesize a root for recents.
Local directory filtering and sorting using predicates and
comparators, all performed on background thread. Introduce
UriDerivativeLoader which handles ContentObserver updates while
producing a derivative work of a Cursor.
Split data model classes into separate files.
Change-Id: Idb88b4ee22c58c8e508328e678877f7e4c978533
Dianne Hackborn [Tue, 6 Aug 2013 02:12:19 +0000 (02:12 +0000)]
Merge "Whoops, not yet time to be an error."
Dianne Hackborn [Tue, 6 Aug 2013 02:07:41 +0000 (19:07 -0700)]
Whoops, not yet time to be an error.
Change-Id: I869026e1ad33b891010d556150f0b83fa97c4ac4
Elliott Hughes [Tue, 6 Aug 2013 00:54:08 +0000 (00:54 +0000)]
Merge "Remove an unused C zip API."
Wink Saville [Tue, 6 Aug 2013 00:23:01 +0000 (17:23 -0700)]
am
9fe49fc5: am
523db46f: Merge "Set subscription_mode in the database to a default value"
* commit '
9fe49fc56ef39facf7b3be5f66256bd15a87961f':
Set subscription_mode in the database to a default value
Wink Saville [Tue, 6 Aug 2013 00:20:13 +0000 (17:20 -0700)]
am
523db46f: Merge "Set subscription_mode in the database to a default value"
* commit '
523db46f6981a40e12007dbbe629bbdc47f861ba':
Set subscription_mode in the database to a default value
Dianne Hackborn [Tue, 6 Aug 2013 00:16:04 +0000 (00:16 +0000)]
Merge "Start restricting service calls with implicit intents."
Dianne Hackborn [Tue, 6 Aug 2013 00:15:16 +0000 (00:15 +0000)]
Merge "Add a new process state for "service restarting"."
Wink Saville [Tue, 6 Aug 2013 00:10:02 +0000 (00:10 +0000)]
Merge "Set subscription_mode in the database to a default value"
Dianne Hackborn [Sun, 4 Aug 2013 23:50:16 +0000 (16:50 -0700)]
Start restricting service calls with implicit intents.
The bindService() and startService() calls have always had
undefined behavior when used with an implicit Intent and there
are multiple matching services. Because of this, it is not
safe for applications to use such Intents when interacting with
services, yet the platform would merrily go about doing... something.
In KLP I want to cause this case to be invalid, resulting in
an exception thrown back to the app. Unfortunately there are
lots of (scary) things relying on this behavior, so we can't
immediately turn it into an exception, even one qualified by the
caller's target SDK version.
In this change, we start loggin a WTF when such a call happens,
and clean up some stuff in Bluetooth that was doing this behavior.
Change-Id: I62e25d07890588d2362104e20b054aebb6c0e007
Craig Mautner [Mon, 5 Aug 2013 23:18:07 +0000 (23:18 +0000)]
Merge "Clear last paused activity."
Craig Mautner [Mon, 5 Aug 2013 23:14:22 +0000 (16:14 -0700)]
Clear last paused activity.
Moving an activity to the back used to move it behind the launcher.
This meant that the test in resumeTopActivityLocked() for
mLastPausedActivity being equal to the top activity would fail after
moveTaskToBack(). In the new activity stack model the launcher is
on a different stack so if there is only one task then the test
now passes. Clearing mLastPausedActivity when moving an activity
forward now passes the test.
Fixes bug
10022212.
Change-Id: I17932d5c87d2483f13c29ae85a7067202a08f34e
Xia Wang [Mon, 5 Aug 2013 23:03:01 +0000 (16:03 -0700)]
am
3a5e2013: am
ebbcc18e: am
4032217e: Merge "Add option for video playback test to accept media source path." into jb-mr2-dev
* commit '
3a5e2013a1296065a4674bdc43f357d3a352a6e9':
Add option for video playback test to accept media source path.
David Christie [Mon, 5 Aug 2013 22:59:54 +0000 (22:59 +0000)]
Merge "Revert icon changes in "Modify quicksettings to have new location behavior." (b/
10184973)"
Xia Wang [Mon, 5 Aug 2013 22:58:48 +0000 (15:58 -0700)]
am
ebbcc18e: am
4032217e: Merge "Add option for video playback test to accept media source path." into jb-mr2-dev
* commit '
ebbcc18eaa8a69579fadae484630aa1ba447c031':
Add option for video playback test to accept media source path.
Xia Wang [Mon, 5 Aug 2013 22:54:41 +0000 (15:54 -0700)]
am
4032217e: Merge "Add option for video playback test to accept media source path." into jb-mr2-dev
* commit '
4032217ee939d3b23548e83d9183306d66af6f8f':
Add option for video playback test to accept media source path.
Xia Wang [Mon, 5 Aug 2013 22:51:03 +0000 (22:51 +0000)]
Merge "Add option for video playback test to accept media source path." into jb-mr2-dev
Fabrice Di Meglio [Mon, 5 Aug 2013 21:49:41 +0000 (21:49 +0000)]
Merge "Fix bug #
10185976 Black patch displaying in place of drop down spinner across apps"
David Christie [Mon, 5 Aug 2013 20:32:13 +0000 (13:32 -0700)]
Revert icon changes in "Modify quicksettings to have new location behavior." (b/
10184973)
This reverts icon changes in commit
03ed0127dae141d99b003ede9ba3ea937128e471.
Change-Id: I78e3af4a745dd4f182369edd9df9c296854e7762
Dianne Hackborn [Fri, 2 Aug 2013 20:40:55 +0000 (13:40 -0700)]
Add a new process state for "service restarting".
This is a process that is not actually running, but would be
if we had enough RAM.
Also rework how service stats are stored to used the nice
compact structure we are already using for processes.
And fix a bug where when we committed the current state data,
we would mistakenly write it under the name of the *next* state
that is now starting. Ouch.
Change-Id: I9f2b84b8b3f305301fd48dcd9d4e6c232abe8ef9
Elliott Hughes [Mon, 5 Aug 2013 20:27:39 +0000 (13:27 -0700)]
Remove an unused C zip API.
Change-Id: I10ae849bdedf3e3bb97547c4f9e5a20742e9d6b1
Jeff Brown [Mon, 5 Aug 2013 21:06:50 +0000 (14:06 -0700)]
Add string that was accidentally deleted.
Change-Id: I575cc0a26ab2e701a97d9fedadfb5d54d6f0d2e1
Yorke Lee [Thu, 1 Aug 2013 01:53:31 +0000 (18:53 -0700)]
Add DEMOTED and UNDEMOTE TO ContactsContract
Change-Id: I060e9ce7d5de3f32fc55ba619b9a931ef938bd7b