OSDN Git Service
Jean-Michel Trivi [Tue, 3 Feb 2015 23:02:19 +0000 (23:02 +0000)]
Merge "AudioAttributes javadoc update for conversion to stream types"
Jae Seo [Tue, 3 Feb 2015 22:48:26 +0000 (22:48 +0000)]
Merge "TIF: Add a comment to remove padding around the channel logo image"
Craig Mautner [Tue, 3 Feb 2015 22:37:51 +0000 (22:37 +0000)]
Merge "Remove path, query, and fragment from http Uri."
Alan Viverette [Tue, 3 Feb 2015 22:37:04 +0000 (22:37 +0000)]
Merge "Add layer width, height, gravity, and RTL insets for LayerDrawable"
destradaa [Tue, 3 Feb 2015 21:33:06 +0000 (21:33 +0000)]
Merge "Reduce memory usage of GpsStatus objects."
Alan Viverette [Tue, 3 Feb 2015 21:24:59 +0000 (13:24 -0800)]
Add layer width, height, gravity, and RTL insets for LayerDrawable
Bug:
18473819
Change-Id: Iae8e3dbd3fcc7f4c2f08b266c69d40036e75dfb6
Paul Jensen [Tue, 3 Feb 2015 21:22:00 +0000 (21:22 +0000)]
am
f1b78d04: Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev automerge:
39ae054
automerge:
b35275a
* commit '
b35275a25e1a0775458fcbda5b6e8180a0e3311a':
Facilitate network validation on networks with a per-network PAC.
destradaa [Sat, 31 Jan 2015 00:11:20 +0000 (16:11 -0800)]
Reduce memory usage of GpsStatus objects.
A simple GpsStatus object uses 9K of space, given that it initializes an array
of 255 GpsSatellite objects.
This change reduces the memory footprint in the average case, and keeps the
semantics of the API and its GpsSatellite sibling objects without any changes.
In a best case scenario it brings the memory usage per object to 1K.
It's likely in most cases that only 20-50 satellites will be in view. So the
usage should not exceeed half of the original memory usage.
It was considered to keep the internal array but a SparseArray provided bigger
memory savings in the test scenario of ~700B.
Change-Id: Ie2d2144d776a74d4904a08c0d6c5aec6d3bba7cc
Paul Jensen [Tue, 3 Feb 2015 21:17:09 +0000 (21:17 +0000)]
am
f1b78d04: Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev automerge:
39ae054
* commit '
f1b78d046965f91c2e03d541cba4c91ea707111a':
Facilitate network validation on networks with a per-network PAC.
Paul Jensen [Tue, 3 Feb 2015 21:11:51 +0000 (21:11 +0000)]
Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev
automerge:
39ae054
* commit '
39ae0547ca5a1e7cfe24a945b2f8a910e09b7f3c':
Facilitate network validation on networks with a per-network PAC.
Paul Jensen [Tue, 3 Feb 2015 21:08:58 +0000 (21:08 +0000)]
Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev
Jae Seo [Tue, 3 Feb 2015 20:39:35 +0000 (12:39 -0800)]
TIF: Add a comment to remove padding around the channel logo image
Bug:
19066924
Change-Id: Ibb1efb945550028be4106ead826b1e152e488c92
Wale Ogunwale [Tue, 3 Feb 2015 20:30:24 +0000 (20:30 +0000)]
Merge "@hide ActivityInfo.resizeable."
Ruben Brunk [Tue, 3 Feb 2015 20:23:03 +0000 (20:23 +0000)]
Merge "Add ProcessInfoService to activity manager."
Winson Chung [Tue, 3 Feb 2015 20:06:36 +0000 (20:06 +0000)]
Merge "Ensuring that the list of stack views are mutable. (Bug
19245963)"
Winson Chung [Tue, 3 Feb 2015 18:26:22 +0000 (10:26 -0800)]
Ensuring that the list of stack views are mutable. (Bug
19245963)
Change-Id: I5a298bf389d8756492cce2777f127fc214f6d6be
Craig Mautner [Tue, 3 Feb 2015 18:52:59 +0000 (18:52 +0000)]
Merge "[ActivityManager] Prevent application holding AMS lock" automerge:
53e8d6f automerge:
6112f63
automerge:
e8bd6d7
* commit '
e8bd6d734ccef685c4e25a0ec1735c140b9fe644':
[ActivityManager] Prevent application holding AMS lock
Craig Mautner [Tue, 3 Feb 2015 18:48:29 +0000 (18:48 +0000)]
Merge "[ActivityManager] Prevent application holding AMS lock" automerge:
53e8d6f
automerge:
6112f63
* commit '
6112f63369c7ba463c0384c73a4e4c0d45b63918':
[ActivityManager] Prevent application holding AMS lock
Craig Mautner [Tue, 3 Feb 2015 18:43:46 +0000 (18:43 +0000)]
Merge "[ActivityManager] Prevent application holding AMS lock"
automerge:
53e8d6f
* commit '
53e8d6f934be403b9c7733c190b6052d60dd0658':
[ActivityManager] Prevent application holding AMS lock
Craig Mautner [Tue, 3 Feb 2015 18:41:12 +0000 (18:41 +0000)]
Merge "[ActivityManager] Prevent application holding AMS lock"
Adrian Roos [Tue, 3 Feb 2015 18:18:01 +0000 (18:18 +0000)]
Merge "Remove UI code from LockPatternUtils"
Jean-Michel Trivi [Tue, 3 Feb 2015 18:15:08 +0000 (10:15 -0800)]
AudioAttributes javadoc update for conversion to stream types
Change-Id: I2b687d8a002897fff90a8c99d180aa0a3511a571
Clara Bayarri [Tue, 3 Feb 2015 18:13:59 +0000 (18:13 +0000)]
Merge "Floating Palettes: Create the ActionMode type and use it in Editor."
Adrian Roos [Thu, 15 Jan 2015 22:20:20 +0000 (23:20 +0100)]
Remove UI code from LockPatternUtils
Bug:
18931518
Change-Id: I951166f675731ec7a2bc51585e0a51e0cd92611d
Craig Mautner [Tue, 3 Feb 2015 18:09:38 +0000 (18:09 +0000)]
am
c0e9c1d0: am
240e8743: Merge "[ActivityManager] Set appropriate relation of task to home" automerge:
7d1aded
* commit '
c0e9c1d0a405c66e7ec75eb6268f84fe1d466344':
[ActivityManager] Set appropriate relation of task to home
Wale Ogunwale [Tue, 3 Feb 2015 17:29:00 +0000 (09:29 -0800)]
@hide ActivityInfo.resizeable.
Bug:
19178148
Change-Id: Icc132eef7196cc2b8e50294df10595bde8d73ecd
Craig Mautner [Tue, 3 Feb 2015 18:04:32 +0000 (18:04 +0000)]
am
240e8743: Merge "[ActivityManager] Set appropriate relation of task to home"
automerge:
7d1aded
* commit '
7d1adede2fbea8f4c0ad92214bee16395498dd07':
[ActivityManager] Set appropriate relation of task to home
Craig Mautner [Tue, 3 Feb 2015 17:16:52 +0000 (09:16 -0800)]
Remove path, query, and fragment from http Uri.
For http and https schemes leave only scheme and authority in
Uri.toSafeString().
Fixes bug
19217173.
Change-Id: Ic07665f4754bb33ad48f7a55ce5efda185df7577
Craig Mautner [Tue, 3 Feb 2015 18:00:46 +0000 (18:00 +0000)]
am
240e8743: Merge "[ActivityManager] Set appropriate relation of task to home"
* commit '
240e8743977d1a1e7a43ff42e0d52148db10cda8':
[ActivityManager] Set appropriate relation of task to home
Craig Mautner [Tue, 3 Feb 2015 17:54:25 +0000 (17:54 +0000)]
Merge "[ActivityManager] Set appropriate relation of task to home"
Craig Mautner [Tue, 3 Feb 2015 17:51:31 +0000 (17:51 +0000)]
am
cd1b1ee3: Merge "Remove fall through for KEYCODE_VOICE_ASSIST" automerge:
84533ed automerge:
11c6f8b
* commit '
cd1b1ee39fbeaf7d95089c183b549b0853206ffd':
Remove fall through for KEYCODE_VOICE_ASSIST
Tony Mantler [Tue, 3 Feb 2015 17:50:14 +0000 (17:50 +0000)]
Merge "Check NAVIGATION_NONAV in ActivityManagerService"
Craig Mautner [Tue, 3 Feb 2015 17:46:56 +0000 (17:46 +0000)]
Merge "Remove fall through for KEYCODE_VOICE_ASSIST" automerge:
84533ed
automerge:
11c6f8b
* commit '
11c6f8b7c3cc51a3a44bca5003ac3fb56a410c33':
Remove fall through for KEYCODE_VOICE_ASSIST
Brian Attwell [Tue, 3 Feb 2015 17:43:22 +0000 (17:43 +0000)]
Merge "Expose EXTRA_MODE"
Craig Mautner [Tue, 3 Feb 2015 17:41:31 +0000 (17:41 +0000)]
Merge "Remove fall through for KEYCODE_VOICE_ASSIST"
automerge:
84533ed
* commit '
84533edfc081f8dfa632ee1e49947b3d42f8a27d':
Remove fall through for KEYCODE_VOICE_ASSIST
Brian Attwell [Tue, 3 Feb 2015 00:10:39 +0000 (16:10 -0800)]
Expose EXTRA_MODE
The ability to set EXTRA_MODE values on QuickContact
intents has existed for ages by setting the extraMode
parameter on showQuickContact().
Now we need a way for QuickContactActivity to read the intent.
Bug:
18777272
Change-Id: If5e4aa5757e62e942926a12a36345512d6fb66ca
Craig Mautner [Tue, 3 Feb 2015 17:36:54 +0000 (17:36 +0000)]
Merge "Remove fall through for KEYCODE_VOICE_ASSIST"
Wale Ogunwale [Tue, 3 Feb 2015 17:16:15 +0000 (17:16 +0000)]
Merge "Support for activity to opt-in/out of resizeable/multi-window support."
Robert Greenwalt [Tue, 3 Feb 2015 16:59:08 +0000 (16:59 +0000)]
am
10d1609b: am
deef702e: Merge "Deutsche Telekom VVM free SMS shortcodes DE"
automerge:
74033e9
* commit '
74033e9d8fc66f6b888f0aa4b17015d6a5da032b':
Deutsche Telekom VVM free SMS shortcodes DE
Robert Greenwalt [Tue, 3 Feb 2015 16:53:49 +0000 (16:53 +0000)]
am
10d1609b: am
deef702e: Merge "Deutsche Telekom VVM free SMS shortcodes DE"
* commit '
10d1609be9bd842f9a3ee44d9753a55e6e19cbd8':
Deutsche Telekom VVM free SMS shortcodes DE
Robert Greenwalt [Tue, 3 Feb 2015 16:47:34 +0000 (16:47 +0000)]
am
deef702e: Merge "Deutsche Telekom VVM free SMS shortcodes DE"
* commit '
deef702e60f2f0aa9cf35a70bdf4c5e582799750':
Deutsche Telekom VVM free SMS shortcodes DE
Bryce Lee [Tue, 3 Feb 2015 16:44:25 +0000 (16:44 +0000)]
Merge "Make THEATER_MODE_ON a System API."
Robert Greenwalt [Tue, 3 Feb 2015 16:44:01 +0000 (16:44 +0000)]
Merge "Deutsche Telekom VVM free SMS shortcodes DE"
Paul Jensen [Mon, 2 Feb 2015 16:03:03 +0000 (11:03 -0500)]
Facilitate network validation on networks with a per-network PAC.
On networks with a per-network PAC, Network.openConnection(URL) will
fetch using NO_PROXY. This will fail on networks where Internet
access is only permitted via the proxy. Always failing network
validation has the potential to disable WiFi auto-join. Instead
of performing the normal connectivity check, instead attempt to
fetch the PAC, as this is meant to succeed with NO_PROXY.
bug:
19143573
Change-Id: Ia482f5c046d338c27daf42571f20851dfa36671c
Clara Bayarri [Mon, 26 Jan 2015 16:38:07 +0000 (16:38 +0000)]
Floating Palettes: Create the ActionMode type and use it in Editor.
This CL creates the Type attribute for ActionMode, which will serve as a flag to determine its behavior and representation.
- TYPE_PRIMARY is the default and will maintain the current behavior and representation in the ActionBar
- TYPE_FLOATING will be the new Type and will be represented as a Floating Palette
Editor switches the flag from the default to TYPE_FLOATING, but this has no consequences right now, until the functionality is implemented.
Change-Id: Icd6cab01637f6ca3ae2e999b06904e08974d0c81
Henrik Baard [Tue, 3 Feb 2015 08:25:28 +0000 (09:25 +0100)]
Remove fall through for KEYCODE_VOICE_ASSIST
Removing unintentional fallthrough for the case
KEYCODE_VOICE_ASSIST.
The code works today since KEYCODE_VOICE_ASSIST is the
last case in the switch statement, however it is bad
practice. If somone adds another case statement the
code will break.
Change-Id: Iee6234807bbe176bd94e2584de288105d6c6a7cb
Svetoslav [Tue, 3 Feb 2015 07:31:28 +0000 (07:31 +0000)]
Fix broken activation of the selected view in accessibility mode. automerge:
ded133c automerge:
b6b526e
automerge:
f8acd7a
* commit '
f8acd7a961f3a36712519d0f925f86f3da8d0b7c':
Fix broken activation of the selected view in accessibility mode.
Svetoslav [Tue, 3 Feb 2015 07:27:33 +0000 (07:27 +0000)]
Fix broken activation of the selected view in accessibility mode. automerge:
ded133c
automerge:
b6b526e
* commit '
b6b526eaafdcc39e9d55a82f61f1e03c4a3487c3':
Fix broken activation of the selected view in accessibility mode.
Svetoslav [Tue, 3 Feb 2015 07:20:34 +0000 (07:20 +0000)]
Fix broken activation of the selected view in accessibility mode.
automerge:
ded133c
* commit '
ded133c446fa9d0d23e6bde19a66fb2ce3980491':
Fix broken activation of the selected view in accessibility mode.
Yang Ni [Tue, 3 Feb 2015 06:33:27 +0000 (06:33 +0000)]
Merge "Pass in code cache directory when creating a script group." automerge:
9559ce7 automerge:
29fe5ef
automerge:
712e38e
* commit '
712e38eaba012904a515dc84d1edda4dab563dcc':
Pass in code cache directory when creating a script group.
Yang Ni [Tue, 3 Feb 2015 06:27:39 +0000 (06:27 +0000)]
Merge "Pass in code cache directory when creating a script group." automerge:
9559ce7
automerge:
29fe5ef
* commit '
29fe5ef179a4a7de15360650353c6196f9350b07':
Pass in code cache directory when creating a script group.
Yang Ni [Tue, 3 Feb 2015 06:22:55 +0000 (06:22 +0000)]
Merge "Pass in code cache directory when creating a script group."
automerge:
9559ce7
* commit '
9559ce7c1bd4451a470d6e1542659e726b0dce3d':
Pass in code cache directory when creating a script group.
Yang Ni [Tue, 3 Feb 2015 06:20:19 +0000 (06:20 +0000)]
Merge "Pass in code cache directory when creating a script group."
Alan Viverette [Tue, 3 Feb 2015 00:12:27 +0000 (00:12 +0000)]
Merge "Make popup transition animation play nicely with dismiss/show pair"
Andrew Lee [Tue, 3 Feb 2015 00:11:18 +0000 (00:11 +0000)]
Merge "Null-protect attempt to get EmergencyButton."
Andrew Lee [Mon, 2 Feb 2015 23:50:29 +0000 (15:50 -0800)]
Null-protect attempt to get EmergencyButton.
Not all device layouts, such as for tablets, will have an Emergency
Button, so check for null before attempting to set a callback.
Bug:
18977746
Change-Id: I0e909e71c51f6923edda4707bb25053a5f2de398
Wale Ogunwale [Mon, 2 Feb 2015 00:49:44 +0000 (16:49 -0800)]
Support for activity to opt-in/out of resizeable/multi-window support.
Bug:
19178148
Change-Id: I5819a71cdc48e0af4add11a6d4a503ec5cbe5d63
Chris Craik [Tue, 3 Feb 2015 00:00:57 +0000 (00:00 +0000)]
Merge "Refactoring of Program ownership/lifecycle, and WIP Glop rendering path"
Sanket Padawe [Mon, 2 Feb 2015 23:36:41 +0000 (23:36 +0000)]
Merge "Updated string in Wifi dialog to generate appropriate message."
RoboErik [Mon, 2 Feb 2015 23:26:48 +0000 (23:26 +0000)]
Merge "Fix crash in dumpsys media_session"
RoboErik [Mon, 2 Feb 2015 23:21:29 +0000 (15:21 -0800)]
Fix crash in dumpsys media_session
Changes the dump to use the correct keys instead of just counting
when doing a dump of users.
Change-Id: Ibb2033f1cc9209fff03e5cf4928acacca29fc11b
Svetoslav [Sat, 31 Jan 2015 04:28:41 +0000 (20:28 -0800)]
Fix broken activation of the selected view in accessibility mode.
We were using an approximation to determine where to send a pair of down
and up events to click on the view that has accessibility focus. We were
doing reverse computation to figuring out which portion of the view is
not covered by interactive views and get a point in this region. However,
determining whether a view is interactive is not feasible in general since
for example may override onTouchEvent. This results in views not being
activated or which is worse wrong views being activated.
This change swithes to a new approach to activate views in accessibility
mode which is guaranteed to always work except the very rare case of a
view that overrides dispatchTouchEvent (which developers shouldn't be
doing). The new approach is to flag the down and up events pair sent
by the touch explorer as targeting the accessibility focused view. Such
events are dispatched such that views predecessors of the accessibility
focus do not handle them guaranteeing that these events reach the accessibiliy
focused view. Once the accessibiliy focused view gets such an event it clears
the flag and the event is dispatched following the normal event dispatch
semantics.
The new approach is semantically equivalent to requesting the view to perform
a click accessiblitiy action but is more generic as it is not affected by
views not implementing click action support correctly.
bug:
18986806
bug:
18889611
Change-Id: Id4b7b886c9fd34f7eb11e606636d8e3bab122869
Glenn Kasten [Mon, 2 Feb 2015 22:32:36 +0000 (22:32 +0000)]
Merge "Clarify that flush does not necessarily free up buffer space"
Tony Mantler [Mon, 15 Dec 2014 18:42:25 +0000 (10:42 -0800)]
Check NAVIGATION_NONAV in ActivityManagerService
b/
18733457
Change-Id: I12b4d1da3564129a445882025575d759fc80d6d2
Glenn Kasten [Thu, 29 Jan 2015 00:45:15 +0000 (16:45 -0800)]
Clarify that flush does not necessarily free up buffer space
Change-Id: I6f77efb6a8da5e11c0cc68f0bb3ce47a0c1cb3da
Chris Craik [Mon, 2 Feb 2015 21:50:55 +0000 (13:50 -0800)]
Refactoring of Program ownership/lifecycle, and WIP Glop rendering path
Change-Id: I2549032790bddbc048b0bccc224ed8f386b4517c
Brian Attwell [Mon, 2 Feb 2015 21:34:33 +0000 (21:34 +0000)]
Merge "Expose QUERY_PARAMETER_VCARD_NO_PHOTO"
Brian Attwell [Mon, 2 Feb 2015 20:16:13 +0000 (12:16 -0800)]
Expose QUERY_PARAMETER_VCARD_NO_PHOTO
QUERY_PARAMETER_VCARD_NO_PHOTO is used to avoid
attaching photos on vcards that get sent over NFC.
Large VCards can't be easily sent over NFC.
I'm deferring writing CTS tests till later.
Bug:
18777272
Change-Id: I6e3a7bf836978023225c709446b9113de05f6cef
Joe Fernandez [Mon, 2 Feb 2015 20:38:56 +0000 (20:38 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
Scott Kennedy [Mon, 2 Feb 2015 20:38:08 +0000 (20:38 +0000)]
Merge "Add some @Nullable annotations to SharedPreferences"
Joe Fernandez [Mon, 2 Feb 2015 20:37:46 +0000 (20:37 +0000)]
am
e9557d7d: am
175ddbcf: am
d14b6432: am
eba583e3: docs: February 2015 Dashboard updates automerge:
c6ca860 automerge:
d99924d
* commit '
e9557d7d2728d1c77e4d173e8f6d954eeeb69357':
docs: February 2015 Dashboard updates
Andrew Lee [Fri, 30 Jan 2015 21:23:21 +0000 (13:23 -0800)]
Reset keyguard/bouncer on "return to call".
+ Add callback, to be invoked when EmergencyButton is clicked when
inside a call.
+ Route callback to the KeyguardViewMediator, to invoke
resetStateLocked() to reset the bouncer.
Bug:
18977746
Change-Id: I4733ccfb6809c4610184a33a28ba38ecf255231f
Joe Fernandez [Mon, 2 Feb 2015 20:29:31 +0000 (20:29 +0000)]
am
175ddbcf: am
d14b6432: am
eba583e3: docs: February 2015 Dashboard updates automerge:
c6ca860
automerge:
d99924d
* commit '
d99924d556b95bc05bbff9408519e301983193fb':
docs: February 2015 Dashboard updates
Jorim Jaggi [Mon, 2 Feb 2015 19:53:55 +0000 (19:53 +0000)]
Merge "Merge commit '
83eaf6cc' into HEAD"
Jorim Jaggi [Mon, 2 Feb 2015 19:45:32 +0000 (20:45 +0100)]
Merge commit '
83eaf6cc' into HEAD
Change-Id: I13918ee8116ac17169910a1414de913bcc2d184e
destradaa [Mon, 2 Feb 2015 19:42:20 +0000 (11:42 -0800)]
Revert API breaking change in System API.
Change introduced in ag/616521
Change-Id: Ia95982b051496e123b4a179746aea15c6a0b8a65
Joe Fernandez [Mon, 2 Feb 2015 19:35:00 +0000 (19:35 +0000)]
am
175ddbcf: am
d14b6432: am
eba583e3: docs: February 2015 Dashboard updates automerge:
c6ca860
* commit '
175ddbcf2ed71fdcd44a9b64cdc5d479df496a4d':
docs: February 2015 Dashboard updates
Jorim Jaggi [Mon, 2 Feb 2015 19:30:34 +0000 (19:30 +0000)]
am
515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev
automerge:
2ffb340
* commit '
2ffb3400f7922aba597b61cea91b82bcfc3d7e7d':
Send accessibility event when bouncer is shown
Alan Viverette [Mon, 2 Feb 2015 19:27:21 +0000 (11:27 -0800)]
Make popup transition animation play nicely with dismiss/show pair
Previously it was okay to call dismiss/show in quick succession since
the window was removed synchronously. Adding transitions introduced a
delay between dismiss() and actually removing the window, which broke
this behavior.
Change-Id: I0de8ae0a551dcb2eb8b8a50356c308b654ebdc6f
Jorim Jaggi [Mon, 2 Feb 2015 19:25:34 +0000 (19:25 +0000)]
am
515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev
* commit '
515148dcaaf5b63e69998d67958829d4347071ec':
Send accessibility event when bouncer is shown
Joe Fernandez [Mon, 2 Feb 2015 19:24:38 +0000 (19:24 +0000)]
am
d14b6432: am
eba583e3: docs: February 2015 Dashboard updates
automerge:
c6ca860
* commit '
c6ca8600a4257b25d2ffd1ab6abe02089d06b3d7':
docs: February 2015 Dashboard updates
Jorim Jaggi [Mon, 2 Feb 2015 19:19:23 +0000 (19:19 +0000)]
Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev
Jorim Jaggi [Mon, 2 Feb 2015 13:45:39 +0000 (14:45 +0100)]
Send accessibility event when bouncer is shown
Bug:
18996476
Change-Id: I0e402aa198263807e3013c7fb151f28d049ea51a
Brian Attwell [Wed, 28 Jan 2015 22:15:41 +0000 (14:15 -0800)]
Remove NAME_VERIFIED. Part 4
Bug:
18777272
Change-Id: I1579a3122b2d45b80de7106a2b9616e323855045
destradaa [Mon, 2 Feb 2015 18:07:40 +0000 (18:07 +0000)]
Merge "Fix race condition generating READY and NOT_SUPPORTED statuses."
Alan Viverette [Mon, 2 Feb 2015 18:01:03 +0000 (18:01 +0000)]
Merge "Ensure InsetDrawable propagates state and callback on set drawable"
Alan Viverette [Mon, 2 Feb 2015 17:56:49 +0000 (09:56 -0800)]
Ensure InsetDrawable propagates state and callback on set drawable
Bug:
19230432
Change-Id: I161e377c5a50fd68718a36cef0038ab06e74c90d
Julia Reynolds [Mon, 2 Feb 2015 17:52:03 +0000 (17:52 +0000)]
Merge "Add skip encryption constants for device owner provisioning."
RoboErik [Mon, 2 Feb 2015 17:47:51 +0000 (17:47 +0000)]
Merge "Route volume keys directly to the audio system on TVs"
Joe Fernandez [Mon, 2 Feb 2015 17:44:26 +0000 (17:44 +0000)]
am
d14b6432: am
eba583e3: docs: February 2015 Dashboard updates
* commit '
d14b64323ff92be9db804d66a1146693c27150a6':
docs: February 2015 Dashboard updates
Julia Reynolds [Mon, 2 Feb 2015 14:54:26 +0000 (09:54 -0500)]
Add skip encryption constants for device owner provisioning.
Bug:
19228730
Change-Id: Id5022f2f669cf0dfc1b1523190da52c77238a02c
Jason Monk [Mon, 2 Feb 2015 17:39:43 +0000 (17:39 +0000)]
Merge "Create SettingsLib"
Robert Greenwalt [Mon, 2 Feb 2015 17:33:09 +0000 (17:33 +0000)]
am
0cdd4560: am
fabf0e0b: Merge "Fixing up the formatting code which is already merged"
automerge:
21475c6
* commit '
21475c6a92b893f5d078ba23f06f0be6edaaacbd':
Robert Greenwalt [Mon, 2 Feb 2015 17:29:21 +0000 (17:29 +0000)]
am
0cdd4560: am
fabf0e0b: Merge "Fixing up the formatting code which is already merged"
* commit '
0cdd4560dac5784dda169863eb844d489bdc79d5':
Sailesh Nepal [Mon, 2 Feb 2015 17:24:01 +0000 (17:24 +0000)]
Merge "Update setNextPostDialWaitChar API"
Joe Fernandez [Mon, 2 Feb 2015 17:20:35 +0000 (17:20 +0000)]
am
eba583e3: docs: February 2015 Dashboard updates
* commit '
eba583e3930891f7a8a0e48a961a4a2471fc757c':
docs: February 2015 Dashboard updates
Robert Greenwalt [Mon, 2 Feb 2015 17:16:32 +0000 (17:16 +0000)]
am
fabf0e0b: Merge "Fixing up the formatting code which is already merged"
* commit '
fabf0e0ba84e0cd28f459360b20386e68179cc31':
Robert Greenwalt [Mon, 2 Feb 2015 17:00:42 +0000 (17:00 +0000)]
Merge "Fixing up the formatting code which is already merged"
Joe Fernandez [Mon, 2 Feb 2015 16:48:42 +0000 (08:48 -0800)]
docs: February 2015 Dashboard updates
Change-Id: I1936395193ec4c382b2492f992149fa7a29c9282
Jason Monk [Tue, 13 Jan 2015 15:08:23 +0000 (10:08 -0500)]
Create SettingsLib
This will hold common code that SystemUI and Settings (and others)
will share.
Bug:
19180466
Change-Id: I6614b31d6c3b0a2d426a2aa8ce66725245339d22