Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
192,226 Commits 3 Branches 0 Tags
dfc0f03e485ea7bce7a5df2fd876bcedfa564eb9
Commit Graph

51876 Commits

Author SHA1 Message Date
Alan Viverette
9374f43403 am a8625dc7: am 11a8748c: am 6a8c79bb: Merge "Improve keying for theme caches, rebase system theme on config change" into mnc-dev 
* commit 'a8625dc79fe2f0b89f1d7f0476be80dba72ae81f':
  Improve keying for theme caches, rebase system theme on config change
 2015-05-07 22:12:38 +00:00
Mady Mellor
7dd732ea93 am b34791d4: am 2448f8b2: am 6fc03e65: Merge "Revert "Text selection - Don\'t select vertical white space"" into mnc-dev 
* commit 'b34791d428212c929bb1a09dd873c3b4963973ff':
  Revert "Text selection - Don't select vertical white space"
 2015-05-07 22:12:25 +00:00
Alan Viverette
a8625dc79f am 11a8748c: am 6a8c79bb: Merge "Improve keying for theme caches, rebase system theme on config change" into mnc-dev 
* commit '11a8748c43985159ec910832f06ab6299df26787':
  Improve keying for theme caches, rebase system theme on config change
 2015-05-07 21:40:23 +00:00
Mady Mellor
b34791d428 am 2448f8b2: am 6fc03e65: Merge "Revert "Text selection - Don\'t select vertical white space"" into mnc-dev 
* commit '2448f8b24a66a8ceaae13ceb1307a9b40da64475':
  Revert "Text selection - Don't select vertical white space"
 2015-05-07 21:28:15 +00:00
Alan Viverette
6a8c79bb2b Merge "Improve keying for theme caches, rebase system theme on config change" into mnc-dev 2015-05-07 21:19:59 +00:00
Mady Mellor
6fc03e6523 Merge "Revert "Text selection - Don't select vertical white space"" into mnc-dev 2015-05-07 21:13:43 +00:00
Mady Mellor
6a6126834e Revert "Text selection - Don't select vertical white space" 
This reverts commit b9bbbb1d97.

Bug: 20653654
Change-Id: Id96409ac17783bd1e7055913f14de8741d0f9caf
 2015-05-07 21:03:57 +00:00
Chien-Yu Chen
fcdc15972a am 9e1fa287: am 7a34ed6a: am 0dfb7ba4: Merge "camera2: allow mixing regular/reprocess requests" into mnc-dev 
* commit '9e1fa287bcc58c8d7c12e6f47cee4adc43b661a5':
  camera2: allow mixing regular/reprocess requests
 2015-05-07 20:54:10 +00:00
George Mount
a0a0234752 am 04c1770b: am 127fa3a4: am b4035fd8: Merge "Properly cancel animators when View doesn\'t exist in starting state." into mnc-dev 
* commit '04c1770b5aa31a41f776439410a779742a83a075':
  Properly cancel animators when View doesn't exist in starting state.
 2015-05-07 20:54:05 +00:00
Chien-Yu Chen
9e1fa287bc am 7a34ed6a: am 0dfb7ba4: Merge "camera2: allow mixing regular/reprocess requests" into mnc-dev 
* commit '7a34ed6a9ac2eeff39f64531d20c5e4565032437':
  camera2: allow mixing regular/reprocess requests
 2015-05-07 20:39:44 +00:00
George Mount
04c1770b5a am 127fa3a4: am b4035fd8: Merge "Properly cancel animators when View doesn\'t exist in starting state." into mnc-dev 
* commit '127fa3a4b23255b2501e71a22155da03c6419715':
  Properly cancel animators when View doesn't exist in starting state.
 2015-05-07 20:39:37 +00:00
Alan Viverette
b099dc5b7e am 6f5a2305: am 17c29a3b: am 34dd5824: Merge "Only resize list popup if it\'s still attached to a window" into mnc-dev 
* commit '6f5a2305c0e8f5d8e2c1c8fca3f6d444e3ce9400':
  Only resize list popup if it's still attached to a window
 2015-05-07 20:39:33 +00:00
Alan Viverette
6f5a2305c0 am 17c29a3b: am 34dd5824: Merge "Only resize list popup if it\'s still attached to a window" into mnc-dev 
* commit '17c29a3b168969ffebd3f8fb463556f6b239371d':
  Only resize list popup if it's still attached to a window
 2015-05-07 20:27:42 +00:00
Chien-Yu Chen
0dfb7ba4a8 Merge "camera2: allow mixing regular/reprocess requests" into mnc-dev 2015-05-07 20:24:52 +00:00
George Mount
b4035fd886 Merge "Properly cancel animators when View doesn't exist in starting state." into mnc-dev 2015-05-07 20:23:00 +00:00
Alan Viverette
34dd5824f5 Merge "Only resize list popup if it's still attached to a window" into mnc-dev 2015-05-07 20:07:48 +00:00
Chris Wren
1c3e7d0dae am 5df81720: am 1b61d8de: am d11ad51d: Merge "add logging to quick settings tiles" into mnc-dev 
* commit '5df8172053a46d228096ecf98ddf2d1b8c67c23d':
  add logging to quick settings tiles
 2015-05-07 20:03:04 +00:00
Alan Viverette
c8bfc68cdd Only resize list popup if it's still attached to a window 
We can't rely on ListPopupWindow.dismiss() to get called before the popup
is removed, for example when the activity hosting the popup is finished,
but we can easily ensure that the popup is still attached to a window.

Bug: 20831507
Change-Id: I9dcaa46e68df3f2b301cf299fa64d460c7e177fd
 2015-05-07 13:00:25 -07:00
George Mount
1b4ae634f6 Properly cancel animators when View doesn't exist in starting state. 
Bug 19290065

When a transition was interrupted, if a View was not in the start
state, but in the end state, then any animator on that View was
not canceled. This detects that situation and allows canceling
the animator on that View.

Change-Id: Ib1d0579bb6b211782c40c6327be59b0c59682731
 2015-05-07 13:00:12 -07:00
Chris Wren
5df8172053 am 1b61d8de: am d11ad51d: Merge "add logging to quick settings tiles" into mnc-dev 
* commit '1b61d8de9336cd64ee5b859249cdef3434ff1c9c':
  add logging to quick settings tiles
 2015-05-07 19:55:04 +00:00
Chris Wren
d11ad51d11 Merge "add logging to quick settings tiles" into mnc-dev 2015-05-07 19:23:34 +00:00
Doris Liu
244ef07b28 am cba64a9a: am cbb97b50: am c7e56e9d: Merge "Take into account scroll offset for transition animation" into mnc-dev 
* commit 'cba64a9af6b9a08b445c8ba0ecd858e140477ffb':
  Take into account scroll offset for transition animation
 2015-05-07 19:15:40 +00:00
Alan Viverette
b49e087b3a am ec96894f: am c7f2b6d8: am 43ea92b8: Merge "Remove dead code from EpicenterTranslateClipReveal" into mnc-dev 
* commit 'ec96894fcd80507f79af9f0edf235a664e936b68':
  Remove dead code from EpicenterTranslateClipReveal
 2015-05-07 19:15:24 +00:00
Alan Viverette
7982f9483f am 227df797: am 209d6157: am 83ce3b26: Merge "Make popup window enter animation more like app transition enter" into mnc-dev 
* commit '227df797737be922eefea8e869578e3592f08e8a':
  Make popup window enter animation more like app transition enter
 2015-05-07 19:14:52 +00:00
Chris Wren
457a21cdea add logging to quick settings tiles 
QS Grid visibility
  Tiles that are visibile in the grid
  Taps on tiles
  Detail visibility for DND, Users, and Data

Bug: 20264417
Change-Id: I95e65484a9be0a53a071bc12ce8195120582621e
 2015-05-07 15:14:28 -04:00
Doris Liu
cba64a9af6 am cbb97b50: am c7e56e9d: Merge "Take into account scroll offset for transition animation" into mnc-dev 
* commit 'cbb97b50f8e9b3304be0a50790f4515d327cbd5a':
  Take into account scroll offset for transition animation
 2015-05-07 19:05:45 +00:00
Alan Viverette
ec96894fcd am c7f2b6d8: am 43ea92b8: Merge "Remove dead code from EpicenterTranslateClipReveal" into mnc-dev 
* commit 'c7f2b6d80d115781048b29365278fe3faae01a08':
  Remove dead code from EpicenterTranslateClipReveal
 2015-05-07 19:05:28 +00:00
Alan Viverette
227df79773 am 209d6157: am 83ce3b26: Merge "Make popup window enter animation more like app transition enter" into mnc-dev 
* commit '209d6157180661a52998aa242842d6eda7332d32':
  Make popup window enter animation more like app transition enter
 2015-05-07 19:04:56 +00:00
Chet Haase
3f098d11c6 am 1261e766: am 4d2fa67a: am 1bc3c849: Merge "Fix leak in LayoutTransition" into mnc-dev 
* commit '1261e7669202980e33104370d7abf917036de965':
  Fix leak in LayoutTransition
 2015-05-07 18:29:46 +00:00
Doris Liu
c7e56e9df1 Merge "Take into account scroll offset for transition animation" into mnc-dev 2015-05-07 17:56:46 +00:00
Chet Haase
1261e76692 am 4d2fa67a: am 1bc3c849: Merge "Fix leak in LayoutTransition" into mnc-dev 
* commit '4d2fa67a9529a49c9bcfa533205fdc8a13cb462c':
  Fix leak in LayoutTransition
 2015-05-07 17:48:55 +00:00
Niels Egberts
634bc6e2f0 am cc6848ea: am dd441795: Merge "Don\'t strip country and variant from locale." into mnc-dev 
* commit 'cc6848ea684a0309ac20b3968d44beee1afe1c1f':
  Don't strip country and variant from locale.
 2015-05-07 17:48:50 +00:00
Alan Viverette
6689a013b3 Remove dead code from EpicenterTranslateClipReveal 
Change-Id: Id2ba801b61cf419b43188514b36cf869b4f836a6
 2015-05-07 10:38:26 -07:00
Alan Viverette
83ce3b26b6 Merge "Make popup window enter animation more like app transition enter" into mnc-dev 2015-05-07 17:25:37 +00:00
Paul Jensen
48dfee77f4 am b594a96b: am 8bdd2a49: am ffe2dda1: Merge "Avoid NPE when sendMessage is called after disconnect." into mnc-dev 
* commit 'b594a96b9476d8745e7228f294f459fb7dda6daf':
  Avoid NPE when sendMessage is called after disconnect.
 2015-05-07 17:18:16 +00:00
Andreas Gampe
efc49451c3 am 481ecde0: am f40149ff: Merge "Frameworks/base: Fix null-pointer access" 
* commit '481ecde0c27be088c8ee03e14e63707cad191c77':
  Frameworks/base: Fix null-pointer access
 2015-05-07 17:18:10 +00:00
George Mount
3f0e2e598c am 64053d4c: am 94d3164f: am fa216411: Merge "Add CallbackRegistry." into mnc-dev 
* commit '64053d4c4b0decee6324968ebec8d110c8819d3f':
  Add CallbackRegistry.
 2015-05-07 17:17:09 +00:00
George Mount
3f9a81757e am 7b44e5b5: am a31b76e4: am b3ba2138: Merge "Fix crash during Activity Transition with TextureView." into mnc-dev 
* commit '7b44e5b5b96bc88b4f328dc1d1c2228e525e1bc8':
  Fix crash during Activity Transition with TextureView.
 2015-05-07 17:17:04 +00:00
Neil Fuller
ee9623ff69 am 8106751d: am 192b52a4: am d6a21352: Remove FloatMath methods from the API 
* commit '8106751ddc7bb7b34bd1179fe504c4c32c02abd2':
  Remove FloatMath methods from the API
 2015-05-07 17:16:55 +00:00
Yohei Yukawa
c38088b4a4 am 9e391183: am c3d4c6a5: am f2cac4d4: Merge "Retry "Always show auxiliary subtypes from NavBar keyboard icon."" into mnc-dev 
* commit '9e391183a59adddeb81537f0250b4434d1f71284':
  Retry "Always show auxiliary subtypes from NavBar keyboard icon."
 2015-05-07 17:16:27 +00:00
Alan Viverette
4ea5ee2330 Make popup window enter animation more like app transition enter 
Merges the translate and clip reveal so that we can adjust the clip
position based on the current translate position. This ensures the
clip appears to expand from the center of the translated popup and
never extends outside the window bounds.

Change-Id: I8bbb9c0e2293a25f7807d71d9b8779bb782d4784
 2015-05-07 10:07:42 -07:00
Doris Liu
18c2b0ef36 Take into account scroll offset for transition animation 
This CL fixed the issue where scroll offset was ignored when shared
elements are added to the ghost view and when they are laid out.

Bug: 20349408
Change-Id: Ifaeb821bffe6fcfe303221a1732125bf1c4a91b7
 2015-05-07 09:58:02 -07:00
Chet Haase
1bc3c849ba Merge "Fix leak in LayoutTransition" into mnc-dev 2015-05-07 16:56:43 +00:00
Paul Jensen
b594a96b94 am 8bdd2a49: am ffe2dda1: Merge "Avoid NPE when sendMessage is called after disconnect." into mnc-dev 
* commit '8bdd2a49781bd5bd56a04aa483da7b4991af57f8':
  Avoid NPE when sendMessage is called after disconnect.
 2015-05-07 16:23:13 +00:00
Niels Egberts
dd44179540 Merge "Don't strip country and variant from locale." into mnc-dev 2015-05-07 16:22:52 +00:00
Andreas Gampe
481ecde0c2 am f40149ff: Merge "Frameworks/base: Fix null-pointer access" 
* commit 'f40149ff1f067193239c7b93f8fa617ceec101fe':
  Frameworks/base: Fix null-pointer access
 2015-05-07 16:16:18 +00:00
Andreas Gampe
f40149ff1f Merge "Frameworks/base: Fix null-pointer access" 2015-05-07 15:47:31 +00:00
Paul Jensen
ffe2dda135 Merge "Avoid NPE when sendMessage is called after disconnect." into mnc-dev 2015-05-07 15:30:47 +00:00
Niels Egberts
837fba984e Don't strip country and variant from locale. 
When the synthesizer returns LANG_AVAILABLE or LANG_COUNTRY_AVAILABLE
for a certain locale, we strip the country and variant from the locale
before asking the synthesizer for the default voice name for this
locale.

This can prevent the synthesizer from picking the right locale. For
instance it prevents the synthesizer from picking en-gb if en-au is
requested, now it can only have a single preferred voice for all English
countries.

The solution is not to strip the country and variant from the locale.
This is not likely to break anything, because the input to
onGetDefaultVoiceNameFor was never expected to be a subset of all
supported language-country-variant combinations. The default
implementation handles this correctly.

Change-Id: I017f69d321039c7aa7a3ef5a09ba138e35b66670
(cherry picked from commit 4758e99783)
 2015-05-07 15:02:46 +00:00
Paul Jensen
d0d420587a Avoid NPE when sendMessage is called after disconnect. 
This avoids an NPE that could occur when:
1. disconnect() is called
2. sendMessage() is called but encounters a RemoteException
3. replyDisconnected() will attempt to dereference mSrcHandler
There does not appear to be any callers that rely on the NPE.
All callers erase their reference to the AsyncChannel after
calling disconnect(), except for NetworkAgentInfo which can
cause ConnectivityService to crash.  This fix addresses that.

bug:20647016
Change-Id: I89864885dc3371941407a036b7b7647e0ec037b8
 2015-05-07 10:44:32 -04:00