drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,370 Commits 1 Branch 0 Tags
Commit Graph

198370 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav
161314fa54 am 358af143: am 81adda25: Merge "Always create nodes for views backed by an adapter." into mnc-dev 
* commit '358af143454fdcda120e90840b6ca835bebc4120':
  Always create nodes for views backed by an adapter.
 2015-07-21 19:30:37 +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
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
8e0ab9971c am 548871f2: am f2805bcb: Merge "Use RingtonePlayer to get ringtone title" into mnc-dev 
* commit '548871f202c2c68e0197cc993073ca80a60f70da':
  Use RingtonePlayer to get ringtone title
 2015-07-21 18:37:15 +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
6b04e5b803 am 894ffd10: am 673ccfd4: Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev 
* commit '894ffd102d90a7c794e5c522818f163b92baa55d':
  UsbDeviceManager: add back support for USB overlays
 2015-07-21 17:38:50 +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
Raph Levien
fa8570bcd2 am 7026617e: am 1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev 
* commit '7026617e74cc1753ae7c1846e005dc7b3286170d':
  Respect style boundaries when measuring text
 2015-07-21 17:17:49 +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
224dfca641 am c273c178: am 66e66831: Merge "resolved conflicts for merge of 112d8a36 to mnc-dev" into mnc-dev 
* commit 'c273c178d70eda9858714d59118b05da7ffb5313':
  Render to measured size when using expand mode
 2015-07-21 16:04:20 +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
18c87a1eb8 am 7dcad6a5: am e99f20f5: Merge "Don\'t duplicate recent tasks of the same affinity." into mnc-dev 
* commit '7dcad6a5d426e1a243e36cbd084c60bc8038c56b':
  Don't duplicate recent tasks of the same affinity.
 2015-07-21 14:52:05 +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
Jae Seo
6ff64bc34d am 6564934d: am b2eed1d6: Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev 
* commit '6564934d1a3f1020184c48bdddbe91321652a0b2':
  TIF: Get or create the user state when failed to find existing one
 2015-07-21 00:28:20 +00:00
Terry Heo
00869af85d am aaf67d95: am e95af4ab: Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev 
* commit 'aaf67d952711e9587df143e017618fc488c32077':
  TIF: Use copied track list for onTracksChanged() callback
 2015-07-21 00:28:16 +00: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
Dongwon Kang
e64dfb4773 am 14bdaa7f: am 6444fe12: Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev 
* commit '14bdaa7f6b2140dadb631e67d61462219c678100':
  MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive
 2015-07-21 00:00:44 +00:00
Jorim Jaggi
4cb9ccc732 am c0469f99: am 55786e11: Merge "Test app to emit all AccessibilityEvents to logcat." into mnc-dev 
* commit 'c0469f99723919cf1d55b34180020ef14fb36b56':
  Test app to emit all AccessibilityEvents to logcat.
 2015-07-21 00:00:39 +00:00
Jorim Jaggi
f2ae250e7e am 7cc56bb4: am 1f98c62f: Fix unnecessary layer creation for appear animation 
* commit '7cc56bb44d2be8bc0d2cd43dba86247867992305':
  Fix unnecessary layer creation for appear animation
 2015-07-21 00:00:33 +00:00
Miao Wang
c1f197ca7d am 6005f9e5: am 15d68941: Merge "[RenderScript] Add docs advising users about dstAtop bug." into mnc-dev 
* commit '6005f9e5ae8e15e598d7bcb9667f1289e1d8c4fe':
  [RenderScript] Add docs advising users about dstAtop bug.
 2015-07-21 00:00:28 +00:00
Jorim Jaggi
b946ce96d2 am 00fe1b65: am 4cd72169: Fix window animation flickering 
* commit '00fe1b650a8ac66838273d91ecf5facd6225bca1':
  Fix window animation flickering
 2015-07-21 00:00:24 +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
027db7c90a am e58ba842: am 8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev 
* commit 'e58ba842de4324c62b7e527f0b90fc6ee5ccba13':
  Fix SysUI crashes on svelte devices
 2015-07-20 23:40:00 +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
Alan Viverette
6ae0a992c8 am 23305e9f: am 41668b25: Merge "Adjust padding and font size in time picker for Large text mode" into mnc-dev 
* commit '23305e9f54207f5c945dfda7f0d576871f50b917':
  Adjust padding and font size in time picker for Large text mode
 2015-07-20 23:15:23 +00:00