Christopher Tate
6391a8d446
am d9c2ff99: Merge "Add \'pm\' operation to set a package\'s app-linking state" into mnc-dev
...
* commit 'd9c2ff99bf9469f155eabf341880d055741e9db5':
Add 'pm' operation to set a package's app-linking state
2015-07-21 19:28:04 +00:00
Svetoslav
358af14345
am 81adda25: Merge "Always create nodes for views backed by an adapter." into mnc-dev
...
* commit '81adda25b396ee3db794bc9a7946b579d01c2aa0':
Always create nodes for views backed by an adapter.
2015-07-21 19:12:13 +00:00
Christopher Tate
d9c2ff99bf
Merge "Add 'pm' operation to set a package's app-linking state" into mnc-dev
2015-07-21 19:11:37 +00:00
Svetoslav
81adda25b3
Merge "Always create nodes for views backed by an adapter." into mnc-dev
2015-07-21 19:01:19 +00:00
Todd Kennedy
548871f202
am f2805bcb: Merge "Use RingtonePlayer to get ringtone title" into mnc-dev
...
* commit 'f2805bcbe1c99ce806448a2d8c0f12b142c7cece':
Use RingtonePlayer to get ringtone title
2015-07-21 18:21:33 +00:00
Todd Kennedy
f2805bcbe1
Merge "Use RingtonePlayer to get ringtone title" into mnc-dev
2015-07-21 18:11:19 +00:00
Nick Kralevich
894ffd102d
am 673ccfd4: Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev
...
* commit '673ccfd45a81482d97eecf76dc0fef0dfd57be73':
UsbDeviceManager: add back support for USB overlays
2015-07-21 17:25:30 +00:00
Nick Kralevich
673ccfd45a
Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev
2015-07-21 17:16:10 +00:00
Raph Levien
7026617e74
am 1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev
...
* commit '1fcb6d3ae27ac95388eb036d124bd4bd0c6559cc':
Respect style boundaries when measuring text
2015-07-21 17:04:36 +00:00
Raph Levien
1fcb6d3ae2
Merge "Respect style boundaries when measuring text" into mnc-dev
2015-07-21 16:55:39 +00:00
Diego Perez
c273c178d7
am 66e66831: Merge "resolved conflicts for merge of 112d8a36 to mnc-dev" into mnc-dev
...
* commit '66e6683193f6a1d071710ea8a39b02f5129fc505':
Render to measured size when using expand mode
2015-07-21 15:50:11 +00:00
Diego Perez
66e6683193
Merge "resolved conflicts for merge of 112d8a36 to mnc-dev" into mnc-dev
2015-07-21 15:41:12 +00:00
Wale Ogunwale
7dcad6a5d4
am e99f20f5: Merge "Don\'t duplicate recent tasks of the same affinity." into mnc-dev
...
* commit 'e99f20f5873c00b35f2407e28e06ff9119f85088':
Don't duplicate recent tasks of the same affinity.
2015-07-21 14:38:04 +00:00
Diego Perez
b9935889b1
resolved conflicts for merge of 112d8a36 to mnc-dev
...
Change-Id: Ic9511a57db8a96f54dba0704800789a8602b9dd2
2015-07-21 15:32:55 +01:00
Wale Ogunwale
e99f20f587
Merge "Don't duplicate recent tasks of the same affinity." into mnc-dev
2015-07-21 14:28:16 +00:00
Wale Ogunwale
7cbfcd8865
Don't duplicate recent tasks of the same affinity.
...
In change 510e554283d3dc250f836cd3e4abc36d87319333 we stated
limiting the number of document activity entries in recents
by comparing the realActivity of the tasks. This compared was
done for all tasks not just document tasks there by breaking
the use of task affinity to remove tasks with the same affinity
from recent task list. This change limits the compare of
realActivity to just document tasks.
Bug: 22564474
Bug: 18642190
Change-Id: Idc21ec311f194ab2005cb22380ca56303ae0ad94
2015-07-21 07:26:36 -07:00
Diego Perez
112d8a3641
am d6f2a9ef: am 7720eb18: Merge "Render to measured size when using expand mode" into lmp-mr1-dev
...
* commit 'd6f2a9efbb0e0525f6cf970fd9c9b9b7082b19f9':
Render to measured size when using expand mode
2015-07-21 13:20:23 +00:00
Diego Perez
d6f2a9efbb
am 7720eb18: Merge "Render to measured size when using expand mode" into lmp-mr1-dev
...
* commit '7720eb18c1c2fe06e8f4b2f6e2936a4072494da8':
Render to measured size when using expand mode
2015-07-21 13:06:52 +00:00
Diego Perez
7720eb18c1
Merge "Render to measured size when using expand mode" into lmp-mr1-dev
2015-07-21 12:56:56 +00:00
Christopher Tate
387225ff01
Add 'pm' operation to set a package's app-linking state
...
Set an app's state:
pm set-app-link [--user USER_ID] PACKAGE {always|ask|never|undefined}
Read an app's current state:
pm get-app-link [--user USER_ID] PACKAGE
The latter prints to stdout one of the strings usable as an argument to
set-app-link. If an error is encountered, the string printed to
stderr begins with "Error: ".
Bug 19628527
Change-Id: I68b6dc24445917807345a8cf5baa2078490740af
2015-07-20 17:45:17 -07:00
Todd Kennedy
68de157b78
Use RingtonePlayer to get ringtone title
...
Instead of requiring every application that calls Rintone.getTitle()
to request android.permission.READ_EXTERNAL_STORAGE, pass the call
through to the system UI process. We only do this for media store
URIs.
Bug: 22067670
Change-Id: I38cf3fb8d769ef6984c41a7b04afbbd4c57175ce
2015-07-20 17:24:15 -07:00
Jae Seo
6564934d1a
am b2eed1d6: Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev
...
* commit 'b2eed1d6e11f38c00ce1776ade14dfa004c6119f':
TIF: Get or create the user state when failed to find existing one
2015-07-21 00:10:47 +00:00
Terry Heo
aaf67d9527
am e95af4ab: Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev
...
* commit 'e95af4ab8bda68ee80bf4d444356e0c1afb1fe99':
TIF: Use copied track list for onTracksChanged() callback
2015-07-21 00:10:43 +00:00
Jae Seo
b2eed1d6e1
Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev
2015-07-20 23:59:25 +00:00
Terry Heo
e95af4ab8b
Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev
2015-07-20 23:57:31 +00:00
Dongwon Kang
14bdaa7f6b
am 6444fe12: Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev
...
* commit '6444fe121449f1cacf4500d3098b590c74e3646d':
MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive
2015-07-20 23:56:37 +00:00
Jorim Jaggi
c0469f9972
am 55786e11: Merge "Test app to emit all AccessibilityEvents to logcat." into mnc-dev
...
* commit '55786e1164d522d878d1f493c30330669b1fd868':
Test app to emit all AccessibilityEvents to logcat.
2015-07-20 23:56:33 +00:00
Dongwon Kang
6444fe1214
Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev
2015-07-20 23:50:03 +00:00
Jorim Jaggi
7cc56bb44d
am 1f98c62f: Fix unnecessary layer creation for appear animation
...
* commit '1f98c62f9a60fedd8f18bd47e3f3c4e5fcb34031':
Fix unnecessary layer creation for appear animation
2015-07-20 23:45:46 +00:00
Miao Wang
6005f9e5ae
am 15d68941: Merge "[RenderScript] Add docs advising users about dstAtop bug." into mnc-dev
...
* commit '15d6894170f2ee1a6eae57c915fcc27a56c9de17':
[RenderScript] Add docs advising users about dstAtop bug.
2015-07-20 23:45:42 +00:00
Jorim Jaggi
00fe1b650a
am 4cd72169: Fix window animation flickering
...
* commit '4cd7216967a3e6211785c8acdeca449d61d796a0':
Fix window animation flickering
2015-07-20 23:45:37 +00:00
Jorim Jaggi
55786e1164
Merge "Test app to emit all AccessibilityEvents to logcat." into mnc-dev
2015-07-20 23:43:51 +00:00
Jorim Jaggi
1f98c62f9a
Fix unnecessary layer creation for appear animation
...
Bug: 22561692
Change-Id: I9e5a52f8113d1cbb5afba61d7979770c2dddc5ed
2015-07-20 23:39:46 +00:00
Miao Wang
15d6894170
Merge "[RenderScript] Add docs advising users about dstAtop bug." into mnc-dev
2015-07-20 23:37:48 +00:00
Jorim Jaggi
4cd7216967
Fix window animation flickering
...
Bug: 22502673
Change-Id: I939e5840e10f3c0582148a5a01908076f994ae69
2015-07-20 23:31:25 +00:00
Jorim Jaggi
e58ba842de
am 8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev
...
* commit '8924f23d3ecdcb2b1ce4dbc9bb4fbb9ddfa62710':
Fix SysUI crashes on svelte devices
2015-07-20 23:24:21 +00:00
Raph Levien
ea2b4a40f7
Respect style boundaries when measuring text
...
The existing implementation of handleText() in TextLine laid out
text to the end of the context. However, in cases where the text is
broken into multiple style spans, it's only valid to lay out up to
the end of the style span. This can lead to inconsistent
measurements, especially in the presence of legitimate zero-width
characters such as bidi control characters and zero width space.
This patch changes the invocation of getRunAdvance to measure only
within the style span.
Bug: 22589743
Change-Id: I027f5e77db27ddf9596ef20adcad7e62a82b41de
2015-07-20 16:22:01 -07:00
Jae Seo
4f1a6d477c
TIF: Get or create the user state when failed to find existing one
...
Bug: 22560640
Change-Id: Idc56dc2b16319d173f005fc236f91f70d1a93fad
2015-07-20 16:20:18 -07:00
Jorim Jaggi
8924f23d3e
Merge "Fix SysUI crashes on svelte devices" into mnc-dev
2015-07-20 23:09:46 +00:00
Miao Wang
ffb1a9bed0
[RenderScript] Add docs advising users about dstAtop bug.
...
Bug: 22047392
Change-Id: I736a697276020687c20dff515aabb1be1776f8c0
2015-07-20 16:04:59 -07:00
Dongwon Kang
500747bf8f
MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive
...
AudioSystem.isStreamActive() includes a blocking IPC, so it shouldn't be called
in MSR.adjustVolume() which is called from MediaSessionService while holding a
lock.
Bug: 22606983
Change-Id: I3ab94e73731176d9bf80dbc2121702025547114c
2015-07-20 15:59:53 -07:00
Alan Viverette
23305e9f54
am 41668b25: Merge "Adjust padding and font size in time picker for Large text mode" into mnc-dev
...
* commit '41668b259dfa997492e3f4d331fee88b7f9f2453':
Adjust padding and font size in time picker for Large text mode
2015-07-20 22:59:37 +00:00
Alan Viverette
783b3d9d09
am 001f1e7e: Merge "Add missing invalidation check to drawable cache" into mnc-dev
...
* commit '001f1e7eb35630df24d53298c1a3d2de055d7ce9':
Add missing invalidation check to drawable cache
2015-07-20 22:59:33 +00:00
Alan Viverette
41668b259d
Merge "Adjust padding and font size in time picker for Large text mode" into mnc-dev
2015-07-20 22:48:28 +00:00
Jorim Jaggi
e446dcee8f
Fix SysUI crashes on svelte devices
...
Bug: 22602295
Change-Id: Idac0d62683c0f6f7cf7b795967632e34d771c4f7
2015-07-20 15:47:15 -07:00
Alan Viverette
001f1e7eb3
Merge "Add missing invalidation check to drawable cache" into mnc-dev
2015-07-20 22:44:47 +00:00
Simranjit Singh Kohli
7b36e3adf5
am 02aff29c: Merge "[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it after cleari
...
* commit '02aff29c396373acc16be159c8c4ed59f61faaed':
[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it after clearing identity.
2015-07-20 22:44:18 +00:00
Dianne Hackborn
609cb58533
am a7ce2344: Merge "Fix issue #22564918 : Request is inactive" into mnc-dev
...
* commit 'a7ce23440328e63f36a4add05199aa84ff04032d':
Fix issue #22564918 : Request is inactive
2015-07-20 22:44:13 +00:00
Nick Kralevich
2fedc4df51
UsbDeviceManager: add back support for USB overlays
...
Commit fcf10f7c12cb3107bdfedce6f76a8c866d154f3c removed support for USB
overlays. Add it back in, as some devices depend on it.
Bug: 22062484
Bug: 21195124
Change-Id: I74d12699201355b07475744c641e31fdc4bb5a4a
2015-07-20 15:40:54 -07:00
Simranjit Singh Kohli
02aff29c39
Merge "[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it after clearing identity." into mnc-dev
2015-07-20 22:40:03 +00:00