Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,528 Commits 3 Branches 0 Tags
0df62d47c7fd61aeed376ed7a7ded00a59bda4f9
Commit Graph

31388 Commits

Author SHA1 Message Date
Lajos Molnar
9c5b14977c am a0d70290: am 171c63db: Merge "Add subtitle support to VideoView." into klp-dev 
* commit 'a0d702908cc2da75e0102e1a2f276e2b3feea198':
  Add subtitle support to VideoView.
 2013-09-04 14:38:51 -07:00
Lajos Molnar
a0d702908c am 171c63db: Merge "Add subtitle support to VideoView." into klp-dev 
* commit '171c63db9253e77c2bd11c53eb89b7c3c983669f':
  Add subtitle support to VideoView.
 2013-09-04 14:35:29 -07:00
Fabrice Di Meglio
165d0d5738 am eb4ed48f: am 3ab8e884: Merge "Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child" into klp-dev 
* commit 'eb4ed48f77b8d7889252dcbfcefd97d306347145':
  Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child
 2013-09-04 14:35:09 -07:00
Alan Viverette
132fb928dc Merge "Move viscous fluid interpolator to its own class" 2013-09-04 21:33:30 +00:00
Lajos Molnar
171c63db92 Merge "Add subtitle support to VideoView." into klp-dev 2013-09-04 21:32:43 +00:00
Fabrice Di Meglio
eb4ed48f77 am 3ab8e884: Merge "Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child" into klp-dev 
* commit '3ab8e8847d723fd3b114a4c895c5eeb4623412f4':
  Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child
 2013-09-04 14:31:37 -07:00
Fabrice Di Meglio
3ab8e8847d Merge "Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child" into klp-dev 2013-09-04 21:26:55 +00:00
Alan Viverette
5c08f7cf86 am 1d26f041: am 3aa18248: Merge "Implement drag-to-open in ActivityChooserView" into klp-dev 
* commit '1d26f041ab15a9c30fcd8378d5284d9692fba56e':
  Implement drag-to-open in ActivityChooserView
 2013-09-04 14:24:41 -07:00
Romain Guy
2a9807f414 am 1c5a86ab: am cb039124: Merge "Don\'t draw with invalid display lists Bug #10301674" into klp-dev 
* commit '1c5a86ab6028aade1dd34a357192844c1bba5139':
  Don't draw with invalid display lists Bug #10301674
 2013-09-04 14:24:38 -07:00
Alan Viverette
1d26f041ab am 3aa18248: Merge "Implement drag-to-open in ActivityChooserView" into klp-dev 
* commit '3aa18248013c25b80586d90dba71145d9aae8baf':
  Implement drag-to-open in ActivityChooserView
 2013-09-04 14:21:09 -07:00
Romain Guy
1c5a86ab60 am cb039124: Merge "Don\'t draw with invalid display lists Bug #10301674" into klp-dev 
* commit 'cb039124c145f95bd46fa6c84b585fbad88cf036':
  Don't draw with invalid display lists Bug #10301674
 2013-09-04 14:21:05 -07:00
Chet Haase
56fe281da4 am e4d5c881: am 5f25f7c3: Merge "Perform layout and invalidation after bringChildToFront()" into klp-dev 
* commit 'e4d5c8815aca38b9772a647e61e980858c778c68':
  Perform layout and invalidation after bringChildToFront()
 2013-09-04 14:21:03 -07:00
Chet Haase
e4d5c8815a am 5f25f7c3: Merge "Perform layout and invalidation after bringChildToFront()" into klp-dev 
* commit '5f25f7c37390e407b5c3d8545c5d6e0ef03b753a':
  Perform layout and invalidation after bringChildToFront()
 2013-09-04 14:17:25 -07:00
Alan Viverette
3aa1824801 Merge "Implement drag-to-open in ActivityChooserView" into klp-dev 2013-09-04 21:17:00 +00:00
Romain Guy
cb039124c1 Merge "Don't draw with invalid display lists Bug #10301674" into klp-dev 2013-09-04 21:16:23 +00:00
Alan Viverette
d75e2539c1 Move viscous fluid interpolator to its own class 
Change-Id: If7dcc968895ba9200b40fbc7d7aded6e6bbf6ff7
 2013-09-04 14:16:08 -07:00
Timothy Knight
48bd2376aa am 73b0bdf1: am 2629f273: Camera2: Clarified docs for 3A regions. 
* commit '73b0bdf1ada1dd475928dd7e39bb781d37af003f':
  Camera2: Clarified docs for 3A regions.
 2013-09-04 14:15:24 -07:00
Romain Guy
f66645671f Don't draw with invalid display lists 
Bug #10301674

Change-Id: I900322dcb9b53f0eb82741c94d4ab1eaf939259e
 2013-09-04 14:14:07 -07:00
Timothy Knight
73b0bdf1ad am 2629f273: Camera2: Clarified docs for 3A regions. 
* commit '2629f27362f1a35521501f3a28279ab05b9beb32':
  Camera2: Clarified docs for 3A regions.
 2013-09-04 14:13:53 -07:00
Chet Haase
5f25f7c373 Merge "Perform layout and invalidation after bringChildToFront()" into klp-dev 2013-09-04 21:13:31 +00:00
Timothy Knight
2629f27362 Camera2: Clarified docs for 3A regions. 
Bug: 10545568
Change-Id: I0a76e7d063ceccb68707973abd312a1b909155ec
 2013-09-04 21:07:13 +00:00
Timothy Knight
953da2b15a am 232c39ab: am 1b039b1d: Merge "Camera2: Updated Rational for denom=0." into klp-dev 
* commit '232c39abc9c4bc254249cc916b0ce240b648aad7':
  Camera2: Updated Rational for denom=0.
 2013-09-04 13:30:48 -07:00
Timothy Knight
232c39abc9 am 1b039b1d: Merge "Camera2: Updated Rational for denom=0." into klp-dev 
* commit '1b039b1d2e93cef528da3dcf01b328d6286e9d98':
  Camera2: Updated Rational for denom=0.
 2013-09-04 13:27:28 -07:00
Timothy Knight
1b039b1d2e Merge "Camera2: Updated Rational for denom=0." into klp-dev 2013-09-04 20:25:35 +00:00
Fabrice Di Meglio
2bd961ae38 Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child 
- related to "wrap_content"
- self bounds should include childs horizontal / vertical margin too
- so make height / width  computation follow similar pattern as top / bottom computation

Passing CTS tests: RelativeLayoutTest / RelativeLayout_LayoutParamsTest

Change-Id: Id019c2536e89d2d8a4991aaabf6de60aae2e263b
 2013-09-04 12:30:19 -07:00
David Christie
ef00641cbf am 55e4889c: am 61edc94a: Merge "Make location QuickSettings multi-user compatible (b/10563313)" into klp-dev 
* commit '55e4889cea528253ff91fe5c1806c0c0b75d9827':
  Make location QuickSettings multi-user compatible (b/10563313)
 2013-09-04 12:28:09 -07:00
David Christie
55e4889cea am 61edc94a: Merge "Make location QuickSettings multi-user compatible (b/10563313)" into klp-dev 
* commit '61edc94ab58354381ab381cd9b92faf0a337742b':
  Make location QuickSettings multi-user compatible (b/10563313)
 2013-09-04 12:25:37 -07:00
David Christie
b12ba933f3 Make location QuickSettings multi-user compatible (b/10563313) 
Change-Id: I8ae5238e66fa2d6890ffe5697d3e6d5f50413c3e
 2013-09-04 11:36:17 -07:00
Chet Haase
cb96db8d14 Perform layout and invalidation after bringChildToFront() 
Previously, calls to ViewGroup.bringChildToFront() or View.bringToFront()
would need to be followed by calls to requestLayout() and invalidate()
to force the container to redraw with the new child ordering. This
change calls requestLayout() and invalidate() automatically.

Issue #8667065 bringtoTop does not work

Change-Id: Id37ce7a64dead82119e49f7a1b28385cf0d1f20d
 2013-09-04 11:28:57 -07:00
Timothy Knight
23c8809568 Camera2: Updated Rational for denom=0. 
Handle NaN and INF using the same semantics as Java floats. No longer
throw an exception if a rational is constructed with a zero-denominator.

This commit is required for the ITS pdk app, since without it, the app
fails when it tries to deserialize rational values that are
(incorrectly) set to 0/0.

Bug: 10337323

Change-Id: I890ec2092f2945abc0f531fc46f9a7f5c71d2dbf
 2013-09-04 16:58:58 +00:00
Scott Main
8241cb8239 am eec4cb1f: am 703b34bb: am f579f134: am e0718c04: am 605d56c0: Merge "clarify javadoc for constructors. bug: 10563421" into jb-mr2-docs 
* commit 'eec4cb1fea2549082b778c519534158ea2e08fd1':
  clarify javadoc for constructors. bug: 10563421
 2013-09-04 09:25:35 -07:00
Scott Main
eec4cb1fea am 703b34bb: am f579f134: am e0718c04: am 605d56c0: Merge "clarify javadoc for constructors. bug: 10563421" into jb-mr2-docs 
* commit '703b34bb13e009b8d82f96f17626f806007bd042':
  clarify javadoc for constructors. bug: 10563421
 2013-09-04 09:22:48 -07:00
Scott Main
703b34bb13 am f579f134: am e0718c04: am 605d56c0: Merge "clarify javadoc for constructors. bug: 10563421" into jb-mr2-docs 
* commit 'f579f134ee9495571899be958983a1a242457603':
  clarify javadoc for constructors. bug: 10563421
 2013-09-04 09:19:46 -07:00
Scott Main
f579f134ee am e0718c04: am 605d56c0: Merge "clarify javadoc for constructors. bug: 10563421" into jb-mr2-docs 
* commit 'e0718c044bc81db0334f2973b9884b968c18ce07':
  clarify javadoc for constructors. bug: 10563421
 2013-09-04 09:17:05 -07:00
Scott Main
e0718c044b am 605d56c0: Merge "clarify javadoc for constructors. bug: 10563421" into jb-mr2-docs 
* commit '605d56c0492536488c997c6ca0b85fd38fd4e19a':
  clarify javadoc for constructors. bug: 10563421
 2013-09-04 09:13:57 -07:00
Adam Skory
d3effc3941 am 1b6d0891: am 11254ade: Merge "Add provideAssistData attr to public.xml" into klp-dev 
* commit '1b6d08916c88827839416afd2ac264d422c469e7':
  Add provideAssistData attr to public.xml
 2013-09-04 05:27:10 -07:00
Adam Skory
1b6d08916c am 11254ade: Merge "Add provideAssistData attr to public.xml" into klp-dev 
* commit '11254adec733956085567af38036ab0e1e0e300f':
  Add provideAssistData attr to public.xml
 2013-09-04 05:24:11 -07:00
Adam Skory
16731d4dc0 Add provideAssistData attr to public.xml 
http://ag/323631 added the provideAssistData
attribute to the Service manifest tag.

It did not, however, add that attribute to
public.xml - making it impossible to actually
build a service that defines said tag.

So, add it.

Now that the attribute is where it should be,
restore @link notation to ServiceInfo.java
without breaking the offline docs build
( see http://ag//340279 ).

Also, make some log warnings related to
providing assist data slightly more verbose.

Bug: 10573008
Change-Id: Ie2bcb411c182d69738a2fa4a74de3171b9b9c455
 2013-09-04 12:30:47 +01:00
Lajos Molnar
484ff7a922 Add subtitle support to VideoView. 
Change-Id: Ibfde491a624272c4f9733098529ad70c6aa93fe0
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10326117
 2013-09-03 23:33:05 -07:00
Aravind Akella
49cbf9c438 am f41e223e: am 1f519d46: Fix for build breakage. Remove documentation link to hidden registerListener API. 
* commit 'f41e223efef6b270ff27fe2035914ab3528f3a5f':
  Fix for build breakage. Remove documentation link to hidden registerListener API.
 2013-09-03 20:50:36 -07:00
Aravind Akella
f41e223efe am 1f519d46: Fix for build breakage. Remove documentation link to hidden registerListener API. 
* commit '1f519d46828f11413c70653ce5c31eba25b3f633':
  Fix for build breakage. Remove documentation link to hidden registerListener API.
 2013-09-03 20:48:45 -07:00
Aravind Akella
1f519d4682 Fix for build breakage. Remove documentation link to hidden registerListener API. 
Change-Id: Iba5d623bf12f1b6654f570febcc65d591d309038
 2013-09-03 19:37:24 -07:00
Martijn Coenen
070cfb2da0 am a5259f62: am f48416de: Merge "Reader mode NFC API: move to callback model." into klp-dev 
* commit 'a5259f6261ed4521d70d02328807aab34275a706':
  Reader mode NFC API: move to callback model.
 2013-09-03 17:53:53 -07:00
Igor Murashkin
afb0317fa0 am 6cbd7a8f: am 979cf8e4: Merge "camera2: Don\'t NPE when closing the CameraDevice" into klp-dev 
* commit '6cbd7a8f4fd921ea1b0ad3d1da0580b384a1855e':
  camera2: Don't NPE when closing the CameraDevice
 2013-09-03 17:53:46 -07:00
Alan Viverette
c80531ae5f am f37fb4d9: am 40fbaa79: Merge "Fix pre tag formatting in getDragToOpenListener documentation" into klp-dev 
* commit 'f37fb4d95b6ed790b7c2de5268bd3e20d76aa146':
  Fix pre tag formatting in getDragToOpenListener documentation
 2013-09-03 17:53:43 -07:00
Martijn Coenen
a5259f6261 am f48416de: Merge "Reader mode NFC API: move to callback model." into klp-dev 
* commit 'f48416dede08b243c90738ec108a08041d7609c2':
  Reader mode NFC API: move to callback model.
 2013-09-03 17:51:23 -07:00
Martijn Coenen
f48416dede Merge "Reader mode NFC API: move to callback model." into klp-dev 2013-09-04 00:48:20 +00:00
Igor Murashkin
6cbd7a8f4f am 979cf8e4: Merge "camera2: Don\'t NPE when closing the CameraDevice" into klp-dev 
* commit '979cf8e461c6790747b2bb6dcc4c0784ca34dbdd':
  camera2: Don't NPE when closing the CameraDevice
 2013-09-03 17:47:43 -07:00
Alan Viverette
f37fb4d95b am 40fbaa79: Merge "Fix pre tag formatting in getDragToOpenListener documentation" into klp-dev 
* commit '40fbaa79bc31aadefc5dacb314f66b5bcb6d52ae':
  Fix pre tag formatting in getDragToOpenListener documentation
 2013-09-03 17:47:39 -07:00
Aravind Akella
567753c895 am ce025258: am 14abafa1: Merge "Sensor batching. Implementation for registerListener(with batch support) and flush APIs." into klp-dev 
* commit 'ce025258ed12d1885150bae41f367248c0f65f97':
  Sensor batching. Implementation for registerListener(with batch support) and flush APIs.
 2013-09-03 17:45:24 -07:00