OSDN Git Service
Daniel Sandler [Mon, 12 Mar 2012 18:38:58 +0000 (14:38 -0400)]
Gestures for expanding notifications.
Change-Id: I104c157ffcc2d60b3f0a95c59d4322b07103b69f
Chet Haase [Wed, 18 Apr 2012 14:41:45 +0000 (07:41 -0700)]
Merge "Fix logic of animator start/cancel/end callbacks"
Daniel Sandler [Wed, 18 Apr 2012 12:28:00 +0000 (05:28 -0700)]
Merge "New InboxStyle template for expanded notifications."
satok [Wed, 18 Apr 2012 07:52:44 +0000 (16:52 +0900)]
Optimize the timing to query sentence level spell checking
Bug:
6354647
Change-Id: I52e6c21387c7f4d6fc05b4c50bbb0a5a6c75194b
Bart Sears [Wed, 18 Apr 2012 05:11:46 +0000 (22:11 -0700)]
Merge "Try out the latest SystemUI version of DroidNaskh"
Michael Chan [Wed, 18 Apr 2012 04:27:53 +0000 (21:27 -0700)]
Merge "Added identity and namespace to Calendar Attendees"
Daniel Sandler [Tue, 17 Apr 2012 20:46:51 +0000 (16:46 -0400)]
New InboxStyle template for expanded notifications.
Bug:
6336834
Change-Id: I67b273350b984673cbfb19267451a3782d0477fc
Jeff Brown [Wed, 18 Apr 2012 02:53:47 +0000 (19:53 -0700)]
Merge "Fix build."
Jeff Brown [Wed, 18 Apr 2012 02:52:56 +0000 (19:52 -0700)]
Fix build.
Change-Id: I277042c91b34af59e70941fd5b458581310b1c22
Steven Ross [Wed, 18 Apr 2012 02:30:23 +0000 (19:30 -0700)]
Merge "Always showing FaceUnlock view before bind fixes
6330358"
Svetoslav Ganov [Wed, 18 Apr 2012 02:29:42 +0000 (19:29 -0700)]
Merge "Views with zero alpha are shown for accessibility."
Svetoslav Ganov [Wed, 18 Apr 2012 02:25:18 +0000 (19:25 -0700)]
Views with zero alpha are shown for accessibility.
1. Views that a user cannot see should not be reported for
accessibility. The check for zero alpha was missing.
bug:
6291855
Change-Id: I3cb4c19cccf0dc2427677df630d124c36bd4770b
Jeff Brown [Wed, 18 Apr 2012 02:21:34 +0000 (19:21 -0700)]
Merge "Add Dvorak keyboard layout."
Michael Chan [Wed, 18 Apr 2012 01:40:51 +0000 (18:40 -0700)]
Added identity and namespace to Calendar Attendees
Bug:
6353721
Change-Id: I8cf7a5bbeb5380320b9bb11875168bef4e180b31
Jeff Brown [Wed, 18 Apr 2012 01:50:05 +0000 (18:50 -0700)]
Add Dvorak keyboard layout.
Added support for mapping both scan codes and HID usages to
KeyLayoutMap and KeyCharacterMap. Keyboard overlays can
now influence how key events are mapped to key codes.
Bug:
6110399
Change-Id: I6619fd2d3e1337c55928f89869dbc45b535c7ccf
Michael Chan [Wed, 18 Apr 2012 01:39:00 +0000 (18:39 -0700)]
Fix build
Change-Id: I56d6305b6c28dab8c6d4d04d56df277e0ca39d91
James Dong [Wed, 18 Apr 2012 01:36:48 +0000 (18:36 -0700)]
Merge "AddExternalSource(String path) needs to turn the path to fd if it is a file"
James Dong [Fri, 13 Apr 2012 02:49:02 +0000 (19:49 -0700)]
AddExternalSource(String path) needs to turn the path to fd if it is a file
o related-to-bug:
5542712
Change-Id: Iea32012996ca9de4c86f144de916df64fcab3c52
Bart Sears [Wed, 18 Apr 2012 01:25:16 +0000 (18:25 -0700)]
Try out the latest SystemUI version of DroidNaskh
This is the latest drop (ver 1.00) of DroidNaskhShifAlt.ttf
from Monotype. Checking it in so we can see if there is any
clipping.
Bug:
5987379
Change-Id: I25697e64c1643dc4d36fe4ff6a407549c1165d60
Jeff Brown [Wed, 18 Apr 2012 00:59:03 +0000 (17:59 -0700)]
Merge "Support loading keyboard layout overlays from resources."
Jeff Brown [Tue, 17 Apr 2012 23:52:41 +0000 (16:52 -0700)]
Support loading keyboard layout overlays from resources.
Added the concept of a keyboard layout overlay, which is
a key character map file that has "type OVERLAY".
Added support for loading keyboard layout overlays from
resources dynamically. The layouts are reloaded whenever they
are changed in the Settings application or an application
is installed. This is somewhat more aggressive than necessary
so we might want to optimize it later.
Before system-ready, the input system uses just the generic
keyboard layouts that are included on the device system image.
After system-ready, it considers the user's selected keyboard
layout overlay and attempts to load it as necessary. We need to
wait until system-ready before doing this because we need to
be in a state where it is safe to start applications or access
their resources.
Bug:
6110399
Change-Id: Iae0886d3356649b0d2440aa00910a888cedd8323
Michael Chan [Wed, 18 Apr 2012 00:56:25 +0000 (17:56 -0700)]
Merge "Add support for identity in calendar attendees"
Craig Mautner [Wed, 18 Apr 2012 00:28:20 +0000 (17:28 -0700)]
Merge "Add call-stack reporting methods into Debug"
Craig Mautner [Wed, 18 Apr 2012 00:05:26 +0000 (17:05 -0700)]
Add call-stack reporting methods into Debug
Added two public methods to Debug. These methods return a String
indicating the caller (getCaller()) or callers (getCallers(int depth))
of the calling method. The String indicates the class, method and line
number of the caller(s). Similar to using Throwable.fillInStackTrace()
but much more concise.
Change-Id: I53d0085aa50e4501d28e8eb3ad5b91ef700ac218
Guang Zhu [Tue, 17 Apr 2012 23:01:34 +0000 (16:01 -0700)]
TileBenchmark test app needs read sdcard permission
Since the app is using JB API level, it's required to declare
an explicit READ_EXTERNAL_STORAGE permission
Change-Id: I84142d51aeab4bc28269a6fea716c8663e080118
Michael Chan [Tue, 17 Apr 2012 22:58:28 +0000 (15:58 -0700)]
Add support for identity in calendar attendees
Bug:
6353721
Change-Id: I8667f55e09adf09b070323484342fc296240ff51
John Reck [Tue, 17 Apr 2012 22:37:48 +0000 (15:37 -0700)]
Merge "Fix a bug with enterTouchMode removing focus"
Andreas Huber [Tue, 17 Apr 2012 22:10:36 +0000 (15:10 -0700)]
Merge "Make seekTo not throw exceptions."
Andreas Huber [Tue, 17 Apr 2012 22:02:22 +0000 (15:02 -0700)]
Make seekTo not throw exceptions.
Change-Id: I9d0469962364b86fbab920e9ac65f468fc630737
related-to-bug:
6276111
Alex Yakavenka [Mon, 16 Apr 2012 23:03:06 +0000 (16:03 -0700)]
Telephony: Dynamically instantiate IccCard
Change-Id: I8c4d800158fb1eb12de66d437cb0d76695ff98d3
John Reck [Tue, 17 Apr 2012 21:29:05 +0000 (14:29 -0700)]
Fix a bug with enterTouchMode removing focus
Bug:
6347083
Fix an issue where enterTouchMode would remove focus from the
view that already has focus and is focusableInTouchMode. This
causes issues with WebView, as it updates internal state when
losing and gaining focus.
Change-Id: I5c1f72cc08baf3445e2be9e0496606a53fb9929e
Chet Haase [Tue, 17 Apr 2012 20:18:14 +0000 (13:18 -0700)]
Fix logic of animator start/cancel/end callbacks
The callbacks for animators in some corner cases were not being
called correctly. For example, startDelayed animators that were
started and then ended didn't send out the proper events.
This CL fixes that logic. Specifically:
- An animator that is end()'d will implicitly start() itself and then
assign an end value. This was already the case, but listeners were not
getting notified. Now this situation causes callbacks to listeners for
both the start and end events.
- startDelayed animators that are end()'d or cancel()'d prior to finishing
the startDelay phase will send out events (start and cancel/end, as appropriate)
to listeners.
Change-Id: I40a0f2fdb19d9ec7c3726a91363686c6ecb7d915
Chet Haase [Tue, 17 Apr 2012 20:56:28 +0000 (13:56 -0700)]
Merge "Adding new CHANGING transition to LayoutTransition."
John Reck [Tue, 17 Apr 2012 20:54:54 +0000 (13:54 -0700)]
Merge "Add destroyed check"
Steven Ross [Fri, 13 Apr 2012 14:49:28 +0000 (10:49 -0400)]
Always showing FaceUnlock view before bind fixes
6330358
Sets the view to visible directly on the UI thread when feasible
this includes all cases where FaceUnlock is bound.
The delay in processing a message was causing the bug.
This additionally replaces the call in the keyguardview show
with one when the facelockareaview is initialized.
Change-Id: I8511f175d68023372e11d6e76fa1c44df6ac8a3d
Chet Haase [Mon, 16 Apr 2012 20:35:09 +0000 (13:35 -0700)]
Adding new CHANGING transition to LayoutTransition.
LayoutTransition used to depend on child views being added/removed or
shown/hidden in the transition container. These evens would trigger animations
to fade the child view as well as those to animate the side-affected changes
to sibling views. This CL enables a new feature in LayoutTransition that
enables animating any changes to the layout of the children in the container
whenever a layout occurs. For example, you can change the LayoutParams of a
child view and call requestLayout() to automatically animate those changes.
This capability is not enabled by default. To enable, call the new
LayoutTransition.enableTransitionType(LayoutTransition.CHANGING) method.
Change-Id: I4d07a3b36245353b2151f0dca4f75080ab6a4592
John Reck [Tue, 17 Apr 2012 20:32:00 +0000 (13:32 -0700)]
Add destroyed check
Bug:
6350066
Change-Id: Icf077bcf9678a036a669124c27e56e191a935960
Craig Mautner [Tue, 17 Apr 2012 20:18:45 +0000 (13:18 -0700)]
Merge changes I4752bdf1,I37690cf2
* changes:
Move Surface operations into existing transaction.
Clear orientation variable until rotation is done.
Irfan Sheriff [Tue, 17 Apr 2012 19:52:20 +0000 (12:52 -0700)]
Merge "fix build - new current.txt"
Matthew Xie [Tue, 17 Apr 2012 19:48:00 +0000 (12:48 -0700)]
Merge "Check nullpointer of discoverableTimeout in initBluetoothAfterTurningOn."
Jean-Baptiste Queru [Tue, 17 Apr 2012 19:46:15 +0000 (12:46 -0700)]
fix build - new current.txt
Change-Id: Ia114d5f3fef2b84272237eded88c7908f65851f6
Chris Craik [Tue, 17 Apr 2012 19:08:25 +0000 (12:08 -0700)]
am
a6d62b76: am
4f998a1e: am
fd862e98: Add header for forward compatibility
* commit '
a6d62b76ad8f09bd677fa115fbb71fdae2510552':
Add header for forward compatibility
Andreas Huber [Tue, 17 Apr 2012 19:05:22 +0000 (12:05 -0700)]
Merge "MediaCrypto's constructor can throw RuntimeException."
Chris Craik [Tue, 17 Apr 2012 19:05:12 +0000 (12:05 -0700)]
am
4f998a1e: am
fd862e98: Add header for forward compatibility
* commit '
4f998a1e4865f11f772bbe18a702f4ad95ab353e':
Add header for forward compatibility
Chris Craik [Tue, 17 Apr 2012 19:02:47 +0000 (12:02 -0700)]
am
fd862e98: Add header for forward compatibility
* commit '
fd862e9828d544f593a622f2914d1257366ae802':
Add header for forward compatibility
Amith Yamasani [Tue, 17 Apr 2012 18:55:54 +0000 (11:55 -0700)]
Merge "Make sure persistent processes are not replicated for secondary users."
Craig Mautner [Tue, 17 Apr 2012 18:45:25 +0000 (11:45 -0700)]
Move Surface operations into existing transaction.
Several Surface operations - notably setPosition, setSize, and show -
had been moved outside of a Surface.openTransaction/closeTransaction
window. This corrects that problem.
In addition, before animations were separated from layout the Surface
frame was computed prior to returning from relayoutWindow(). After
separation the frame was being computed during animation. This checkin
restores the frame calculation in layout.
Fixes bug
6343291.
Change-Id: I4752bdf1fed0f2b46c5eb9508825c9b1b0fd702f
Jeff Brown [Tue, 17 Apr 2012 18:52:29 +0000 (11:52 -0700)]
Merge "Add persistence for selected keyboard layout."
Pannag Sanketi [Tue, 17 Apr 2012 18:42:48 +0000 (11:42 -0700)]
Merge "Making the setSurface non-static"
Jeff Brown [Tue, 17 Apr 2012 18:42:39 +0000 (11:42 -0700)]
Merge "Move legacy sensor support to a new class."
Jeff Brown [Tue, 17 Apr 2012 18:42:25 +0000 (11:42 -0700)]
Add persistence for selected keyboard layout.
Bug:
6110399
Change-Id: I99544bf05e9755385bee478b5f047ccec2e5cae3
Amith Yamasani [Mon, 16 Apr 2012 22:44:19 +0000 (15:44 -0700)]
Make sure persistent processes are not replicated for secondary users.
An intent is launched in a singleton process if the process is persistent
and the resolved activity/service/etc is not requested to run in a different
process.
Change-Id: I1463e73a76bc8bde4185f9cf4395edb47515841d
Irfan Sheriff [Tue, 17 Apr 2012 18:40:03 +0000 (11:40 -0700)]
Merge "Open p2p pre-association service discovery API"
Matthew Xie [Tue, 17 Apr 2012 18:39:02 +0000 (11:39 -0700)]
Check nullpointer of discoverableTimeout in initBluetoothAfterTurningOn.
When we fail to get the property, print out warning message, turn
Discoverable off.
Bug
6302990
Change-Id: Ie21aa2a89050c74d99d9ee521a95ffa822114757
Irfan Sheriff [Tue, 17 Apr 2012 18:39:08 +0000 (11:39 -0700)]
Merge "Open network service discovery API"
Andreas Huber [Tue, 17 Apr 2012 18:23:06 +0000 (11:23 -0700)]
MediaCrypto's constructor can throw RuntimeException.
Change-Id: I5718e9abab0d1465882580e826747d6a78bdefb5
related-to-bug:
6275919
Dianne Hackborn [Tue, 17 Apr 2012 18:15:27 +0000 (11:15 -0700)]
Merge "Change dock animations to not use alpha, to make Mathias happy."
Chris Craik [Tue, 17 Apr 2012 17:45:52 +0000 (10:45 -0700)]
Add header for forward compatibility
Change-Id: I6e3da852d50fc14cfb6fb50f7dd867f37daea19d
Irfan Sheriff [Tue, 17 Apr 2012 17:52:41 +0000 (10:52 -0700)]
Merge "Fix SSID parse"
John Reck [Tue, 17 Apr 2012 17:37:41 +0000 (10:37 -0700)]
Merge "Minor cleanup"
Alex Sakhartchouk [Tue, 17 Apr 2012 17:34:41 +0000 (10:34 -0700)]
Merge "Fixing test affected by API renaming."
Irfan Sheriff [Tue, 17 Apr 2012 17:19:16 +0000 (10:19 -0700)]
Fix SSID parse
Bug:
6350079
Change-Id: I104dafa982bd1f144ea3a4fe19a0a23d6bf8075d
Chris Craik [Tue, 17 Apr 2012 17:04:44 +0000 (10:04 -0700)]
Merge "Add webview tracing bit"
Fred Chung [Tue, 17 Apr 2012 16:56:55 +0000 (09:56 -0700)]
am
535b0f10: am
57e351f5: am
3d467946: Merge "Updated "Making your App Location Aware" class to include information on location provider enable check." into ics-mr1
* commit '
535b0f10aaffc0195da16531fc33644760dbcf1d':
Fred Chung [Tue, 17 Apr 2012 16:54:27 +0000 (09:54 -0700)]
am
5a1cf366: am
fe71253b: am
3d467946: Merge "Updated "Making your App Location Aware" class to include information on location provider enable check." into ics-mr1
* commit '
5a1cf3661c9b47ca682511f248987e680768e530':
Updated "Making your App Location Aware" class to include information on location provider enable check.
Fred Chung [Tue, 17 Apr 2012 16:52:44 +0000 (09:52 -0700)]
am
57e351f5: am
3d467946: Merge "Updated "Making your App Location Aware" class to include information on location provider enable check." into ics-mr1
* commit '
57e351f57cc296ed3ef29bdf071713689fc4516e':
Fred Chung [Tue, 17 Apr 2012 16:51:55 +0000 (09:51 -0700)]
am
fe71253b: am
3d467946: Merge "Updated "Making your App Location Aware" class to include information on location provider enable check." into ics-mr1
* commit '
fe71253b334e105a9f67dcef6f8790c246725976':
Updated "Making your App Location Aware" class to include information on location provider enable check.
Fred Chung [Tue, 17 Apr 2012 16:48:44 +0000 (09:48 -0700)]
am
3d467946: Merge "Updated "Making your App Location Aware" class to include information on location provider enable check." into ics-mr1
* commit '
3d467946b2950c6a5e4946c49a33cf4c8d68df20':
Updated "Making your App Location Aware" class to include information on location provider enable check.
Fred Chung [Tue, 17 Apr 2012 16:48:01 +0000 (09:48 -0700)]
am
3d467946: Merge "Updated "Making your App Location Aware" class to include information on location provider enable check." into ics-mr1
* commit '
3d467946b2950c6a5e4946c49a33cf4c8d68df20':
Updated "Making your App Location Aware" class to include information on location provider enable check.
Fred Chung [Tue, 17 Apr 2012 16:46:11 +0000 (09:46 -0700)]
Merge "Updated "Making your App Location Aware" class to include information on location provider enable check." into ics-mr1
Chris Wren [Fri, 30 Mar 2012 22:28:14 +0000 (18:28 -0400)]
A layout that switches between its children based on the requested layout height.
Change-Id: I5a4e5892fbed7cab2470e458a38accbbcb05ae51
Daisuke Miyakawa [Tue, 17 Apr 2012 15:52:46 +0000 (08:52 -0700)]
Merge "Introduce cachedPhotoIcon for notification's large icon"
Steve Block [Tue, 17 Apr 2012 12:08:04 +0000 (05:08 -0700)]
Merge "Clean up JavaDoc for WebView.getZoomControls()"
Steve Block [Mon, 16 Apr 2012 13:10:54 +0000 (14:10 +0100)]
Clean up JavaDoc for WebView.getZoomControls()
Bug:
5461416
Change-Id: I4f2b5c9e4b4c2b1a38d678cb6756f128670ee490
Fred Chung [Mon, 16 Apr 2012 07:40:06 +0000 (00:40 -0700)]
Updated "Making your App Location Aware" class to include information on location provider enable check.
Change-Id: Ie6e966b4204eed60f518759480cebc945f87d91f
satok [Tue, 17 Apr 2012 05:07:45 +0000 (22:07 -0700)]
Merge "Get rid of "isSentenceLevelSpellCheckSupported""
Dianne Hackborn [Tue, 17 Apr 2012 02:31:58 +0000 (19:31 -0700)]
Change dock animations to not use alpha, to make Mathias happy.
Also tweak the action bar animations to slide up/down like the
dock animations.
Change-Id: Id3c85ba76100639a6f6c77b7fd2a060c9d26f38c
Svetoslav Ganov [Tue, 17 Apr 2012 02:30:45 +0000 (19:30 -0700)]
Merge "Fixing a regression I have introduced."
Svetoslav Ganov [Tue, 17 Apr 2012 02:28:22 +0000 (19:28 -0700)]
Fixing a regression I have introduced.
bug:
6344558
Change-Id: Ie726e091942e337962baa052953002be724068b1
Irfan Sheriff [Tue, 17 Apr 2012 02:25:03 +0000 (19:25 -0700)]
Merge "Fix ssid fetch"
Irfan Sheriff [Tue, 17 Apr 2012 02:24:55 +0000 (19:24 -0700)]
Merge "Log messages in dump"
Svetoslav Ganov [Tue, 17 Apr 2012 02:15:27 +0000 (19:15 -0700)]
Merge "Fixing broken add focusables behavior I have introduced."
Svetoslav Ganov [Tue, 17 Apr 2012 02:10:30 +0000 (19:10 -0700)]
Fixing broken add focusables behavior I have introduced.
bug:
6344608
Change-Id: I1d241c02bc22c5ef3f4b4b69a756772e8b2ef902
Brett Chabot [Tue, 17 Apr 2012 01:35:43 +0000 (18:35 -0700)]
Merge "Build junit API docs from external/junit."
Brett Chabot [Mon, 16 Apr 2012 17:13:59 +0000 (10:13 -0700)]
Build junit API docs from external/junit.
Bug
5826326
Change-Id: I67d18cacf0c4e908ec41dbed483314ece8b72ceb
Dianne Hackborn [Sat, 14 Apr 2012 00:32:18 +0000 (17:32 -0700)]
Make ACTION_SEND and ACTION_SEND_MULTIPLE build full clip items.
The current code was just for transferring URI grants. This change
makes it so it propagates all of the relevant extra data into the
ClipData, so developers can just retrieve the ClipData for all of
their data needs.
Change-Id: I36a050c7beae325aceb84518337f878c337d8b86
John Reck [Tue, 17 Apr 2012 01:08:00 +0000 (18:08 -0700)]
Minor cleanup
Change-Id: Ide35e6cf2abe2b723e6d45e796a21ae135706bf5
Dianne Hackborn [Tue, 17 Apr 2012 00:34:25 +0000 (17:34 -0700)]
Merge "Add new scale-up window manager animation."
Dianne Hackborn [Mon, 16 Apr 2012 23:28:22 +0000 (16:28 -0700)]
Add new scale-up window manager animation.
Like zoom thumbnail, but without the thumbnail.
Change-Id: I9486dd204398b87c9e70ff0d05d03f4a22449cd6
Dianne Hackborn [Tue, 17 Apr 2012 00:32:18 +0000 (17:32 -0700)]
Merge "Add new aapt dump badging output explaining implicit badging."
Jeff Brown [Mon, 16 Apr 2012 23:14:44 +0000 (16:14 -0700)]
Move legacy sensor support to a new class.
Bug:
6339552
Change-Id: I2067b754348ac76b1e1f71608031be2c80fc31d2
Irfan Sheriff [Mon, 16 Apr 2012 23:36:59 +0000 (16:36 -0700)]
Fix ssid fetch
Change-Id: Iee5ee5f53bea7dea219b41735cd169389ca7e719
Irfan Sheriff [Mon, 16 Apr 2012 23:47:10 +0000 (16:47 -0700)]
Log messages in dump
Remove event logging and add messages in dump
Change-Id: Ic79c68443bac9b7257644ed6941853f44a9b0661
Jack Palevich [Mon, 16 Apr 2012 23:31:47 +0000 (16:31 -0700)]
Merge "Improve GLSurfaceView Pausing."
Philip Milne [Mon, 16 Apr 2012 23:28:16 +0000 (16:28 -0700)]
Merge "Minor doc fix."
Philip Milne [Mon, 16 Apr 2012 23:12:19 +0000 (16:12 -0700)]
Minor doc fix.
Change-Id: I8f20c4751b599e0108c9373caef7e672d1cd4821
Chris Craik [Mon, 16 Apr 2012 23:08:40 +0000 (16:08 -0700)]
Add webview tracing bit
Change-Id: I7e292cf780fa2e59f183debb0e7e2bc61f27543d
Daisuke Miyakawa [Mon, 16 Apr 2012 21:18:09 +0000 (14:18 -0700)]
Introduce cachedPhotoIcon for notification's large icon
Bug:
6336293
Change-Id: I492384fdb819dfd6574b0dbc84a0324c917c392c
Craig Mautner [Mon, 16 Apr 2012 22:42:47 +0000 (15:42 -0700)]
Clear orientation variable until rotation is done.
In the old code orientationChangeComplete was set to true on each pass
through perfomLayout. If any window was rotating the variable was set
to false on the way through the performLayout. Since we can now make
passes through performLayout before any animation step occurs we were
seeing mOrientationChangeComplete true prior to rotation completing.
This change sets mOrientationChangeComplete false at the start of a
rotation and sets it to true if we ever get through an animation step
without encountering any rotating windows.
Change-Id: I37690cf20868dfbaac94a81640bc4d9cb9fb8f00
Jeff Brown [Mon, 16 Apr 2012 22:46:47 +0000 (15:46 -0700)]
Merge "Refactor SensorManager to move non-API bits into a subclass."