Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
209,545 Commits 3 Branches 0 Tags
e013384386e1973f63d56665718eb4927fd795ed
Commit Graph

51513 Commits

Author SHA1 Message Date
Alan Viverette
e013384386 am 1a9097b5: am d02e90f2: am 5466d754: am 4c06870d: am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev 
* commit '1a9097b5695759aa1e9e8fea563a7a569c0b345f':
  Ensure maxHeight is at least 0 during measureChildHorizontal()
 2015-07-29 22:05:04 +00:00
Alan Viverette
2c48d46d52 am f9ff3a27: am 91f23647: am 7fedf5d4: am 1c8107dd: am 5c380efa: Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev 
* commit 'f9ff3a27c6e6cdea7a0f05024de22bc2bad9312a':
  Always distribute excess space in LinearLayout measurement
 2015-07-29 22:04:56 +00:00
Jeff Sharkey
dea786bf7c am fb4a3a99: am aa6c2002: am ca843039: am 439e2db3: am b86048da: Merge "Always return content Uri for downloads." into mnc-dev 
* commit 'fb4a3a99da3b28e1873feecb5c074aa537239dd6':
  Always return content Uri for downloads.
 2015-07-29 22:04:49 +00:00
Raph Levien
27630ec94d am bd0db6b4: am 8fde12eb: am c248a6cf: am d9074d1e: am c3cc344d: Merge "Release text when finishing StaticLayout.Builder" into mnc-dev 
* commit 'bd0db6b451fd3182fbc73157af4021b84e8177e8':
  Release text when finishing StaticLayout.Builder
 2015-07-29 22:04:40 +00:00
Svetoslav Ganov
fdf59bf82f am c875ad14: am 56de6167: am f6c2d8a9: am 6da43a83: am 9352af2a: Merge "Remove dependencies on the package installer\'s package name" into mnc-dev 
* commit 'c875ad14ddc09d0d3a3bde58f71845123110f9f2':
  Remove dependencies on the package installer's package name
 2015-07-29 22:03:19 +00:00
Sailesh Nepal
6672c8ba3b am 33ec1710: am 2830a139: am 2084291d: am 33763760: am 6b96de8d: Merge "Default permissions for sim call manager" into mnc-dev 
* commit '33ec1710b0404f36019688ea8e285b687f81109c':
  Default permissions for sim call manager
 2015-07-29 22:03:03 +00:00
Alan Viverette
1a9097b569 am d02e90f2: am 5466d754: am 4c06870d: am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev 
* commit 'd02e90f2c3917a983ed7f543efa30c05a34ee3ea':
  Ensure maxHeight is at least 0 during measureChildHorizontal()
 2015-07-29 20:55:07 +00:00
Alan Viverette
f9ff3a27c6 am 91f23647: am 7fedf5d4: am 1c8107dd: am 5c380efa: Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev 
* commit '91f2364738666674ad9dda7bc633d22ad5fb8680':
  Always distribute excess space in LinearLayout measurement
 2015-07-29 20:55:01 +00:00
Jeff Sharkey
fb4a3a99da am aa6c2002: am ca843039: am 439e2db3: am b86048da: Merge "Always return content Uri for downloads." into mnc-dev 
* commit 'aa6c200281e35a1d8b566c307c8b1620916c4391':
  Always return content Uri for downloads.
 2015-07-29 20:54:53 +00:00
Raph Levien
bd0db6b451 am 8fde12eb: am c248a6cf: am d9074d1e: am c3cc344d: Merge "Release text when finishing StaticLayout.Builder" into mnc-dev 
* commit '8fde12eb447c4f7a7db17977ffc00fec42fe5bc9':
  Release text when finishing StaticLayout.Builder
 2015-07-29 20:40:47 +00:00
Alan Viverette
5466d7548e am 4c06870d: am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev 
* commit '4c06870db615acbf50008e0bc964e15a1c36aa22':
  Ensure maxHeight is at least 0 during measureChildHorizontal()
 2015-07-29 20:26:33 +00:00
Alan Viverette
7fedf5d469 am 1c8107dd: am 5c380efa: Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev 
* commit '1c8107dd89c8424c8fad9e341dc43be04e1a62ae':
  Always distribute excess space in LinearLayout measurement
 2015-07-29 20:26:28 +00:00
Jeff Sharkey
ca84303927 am 439e2db3: am b86048da: Merge "Always return content Uri for downloads." into mnc-dev 
* commit '439e2db3f38f0d304757651b2d9291ba1c93f2d2':
  Always return content Uri for downloads.
 2015-07-29 20:26:21 +00:00
Vadim Tryshev
d0432b2db4 Merge "Adding a drag flag to make drag shadow opaque." 2015-07-29 20:11:48 +00:00
Raph Levien
c248a6cf34 am d9074d1e: am c3cc344d: Merge "Release text when finishing StaticLayout.Builder" into mnc-dev 
* commit 'd9074d1eec5be644168dc17133f5bd753fedb614':
  Release text when finishing StaticLayout.Builder
 2015-07-29 20:11:20 +00:00
Alan Viverette
4c06870db6 am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev 
* commit '47a74e7e2b45d9ec462f47f6741c381c478b4156':
  Ensure maxHeight is at least 0 during measureChildHorizontal()
 2015-07-29 20:10:21 +00:00
Alan Viverette
1c8107dd89 am 5c380efa: Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev 
* commit '5c380efa2c0bf3617aedbb9270fa02cce59c7935':
  Always distribute excess space in LinearLayout measurement
 2015-07-29 20:10:16 +00:00
Jeff Sharkey
439e2db3f3 am b86048da: Merge "Always return content Uri for downloads." into mnc-dev 
* commit 'b86048dab3df3e4a8f05de170b38c189243de898':
  Always return content Uri for downloads.
 2015-07-29 20:10:09 +00:00
Alan Viverette
47a74e7e2b Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev 2015-07-29 20:02:41 +00:00
Alan Viverette
5c380efa2c Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev 2015-07-29 20:01:52 +00:00
Jeff Sharkey
b86048dab3 Merge "Always return content Uri for downloads." into mnc-dev 2015-07-29 19:59:36 +00:00
Raph Levien
d9074d1eec am c3cc344d: Merge "Release text when finishing StaticLayout.Builder" into mnc-dev 
* commit 'c3cc344d12ff4a952af8842fab71ef2f6df5e340':
  Release text when finishing StaticLayout.Builder
 2015-07-29 19:58:30 +00:00
Alan Viverette
7a40d21d89 Ensure maxHeight is at least 0 during measureChildHorizontal() 
Bug: 22613599
Change-Id: I11f70ed1f7221874bef0f00f006e0ae294c4bdfa
 2015-07-29 15:55:20 -04:00
Alan Viverette
4fabc02158 Always distribute excess space in LinearLayout measurement 
Previously, excess space was added to existing measured dimensions.
This consistently resulted in incorrect allocation of excess space,
since the delta already included the height of any measured children
rather than just the excess space itself.

This CL ensures that excess space is always distributed according to the
layout weights.

Bug: 22810327
Change-Id: I482a553c469169769cc40ab3d88b4a44023f3eb5
 2015-07-29 15:53:53 -04:00
Raph Levien
c3cc344d12 Merge "Release text when finishing StaticLayout.Builder" into mnc-dev 2015-07-29 19:44:21 +00:00
Raph Levien
22ba7869f6 Release text when finishing StaticLayout.Builder 
DynamicLayout reuses a StaticLayout.Builder object to avoid having to
allocate. There is a "finish" method that releases any expensive
internal state of the builder object, but it didn't release a
reference to the text object (which in turn may contain references to
lots of other things, especially if it's a Spannable).

This patch releases the text, as well as a few other arrays, at time
of finish.

Bug: 22822416
Change-Id: Icc8b6cd41a9a2d11689df7bd1b9f524c6524f706
 2015-07-29 12:34:13 -07:00
Svetoslav Ganov
c875ad14dd am 56de6167: am f6c2d8a9: am 6da43a83: am 9352af2a: Merge "Remove dependencies on the package installer\'s package name" into mnc-dev 
* commit '56de616725aca7d875fafc2a94e00ae9874fedf9':
  Remove dependencies on the package installer's package name
 2015-07-29 19:23:52 +00:00
Sailesh Nepal
33ec1710b0 am 2830a139: am 2084291d: am 33763760: am 6b96de8d: Merge "Default permissions for sim call manager" into mnc-dev 
* commit '2830a13991dbd9e054aafa6b1b2b8da2a1d30681':
  Default permissions for sim call manager
 2015-07-29 19:03:05 +00:00
Dianne Hackborn
fc15b56bd2 am b003d9a8: am c4ed81af: am cb98228d: am deb28b77: am eda1cc50: Merge "Work on issue #22765972: Binder transactions running out of address..." into mnc-dev 
* commit 'b003d9a8032a672dbcb76a9750522953d1c0db5d':
  Work on issue #22765972: Binder transactions running out of address...
 2015-07-29 18:42:48 +00:00
Nicolas Prévot
523d865d9f am 327046d0: am e1d51934: am 95c26295: am 2b0cd2c7: am 64ac302f: Merge "Send a public broadcast when the device owner is set." into mnc-dev 
* commit '327046d0e75c8917dc18cbc23b4aa72b1ba61034':
  Send a public broadcast when the device owner is set.
 2015-07-29 18:42:41 +00:00
Svetoslav Ganov
f6c2d8a9bf am 6da43a83: am 9352af2a: Merge "Remove dependencies on the package installer\'s package name" into mnc-dev 
* commit '6da43a835c0667e7f539ef47870d83f9bc516ef9':
  Remove dependencies on the package installer's package name
 2015-07-29 18:39:12 +00:00
Dianne Hackborn
b003d9a803 am c4ed81af: am cb98228d: am deb28b77: am eda1cc50: Merge "Work on issue #22765972: Binder transactions running out of address..." into mnc-dev 
* commit 'c4ed81af8a12fac07c797870207e07cf7dc982c7':
  Work on issue #22765972: Binder transactions running out of address...
 2015-07-29 18:20:56 +00:00
Nicolas Prévot
327046d0e7 am e1d51934: am 95c26295: am 2b0cd2c7: am 64ac302f: Merge "Send a public broadcast when the device owner is set." into mnc-dev 
* commit 'e1d51934edf4a8605195f38bc24dac0472767545':
  Send a public broadcast when the device owner is set.
 2015-07-29 18:20:49 +00:00
Sailesh Nepal
2084291d18 am 33763760: am 6b96de8d: Merge "Default permissions for sim call manager" into mnc-dev 
* commit '337637607df93491276a1285f57dd41afd219682':
  Default permissions for sim call manager
 2015-07-29 18:18:09 +00:00
Svetoslav Ganov
6da43a835c am 9352af2a: Merge "Remove dependencies on the package installer\'s package name" into mnc-dev 
* commit '9352af2a9ef95e3f577a04474625249d3da62a04':
  Remove dependencies on the package installer's package name
 2015-07-29 18:17:56 +00:00
Chris Craik
c9a6ca5d6b Merge "Revert "Support High Contrast Text for all canvas types"" 2015-07-29 18:15:16 +00:00
Chris Craik
749e67438c Revert "Support High Contrast Text for all canvas types" 
bug:22820834

This reverts commit 876d56612a.

Change-Id: I4e07a0894095caaaf2fd36bfa6073d033542bfc4
 2015-07-29 18:14:46 +00:00
Vadim Tryshev
0e95bc4fb2 Adding a drag flag to make drag shadow opaque. 
The default is still a semitransparent shadow.

Bug: 22028725
Change-Id: I4b0090053fe28cc4ac009960b5b7866d1219a675
 2015-07-29 11:02:56 -07:00
Sailesh Nepal
337637607d am 6b96de8d: Merge "Default permissions for sim call manager" into mnc-dev 
* commit '6b96de8dae8be99f75c86c795672905e10fca153':
  Default permissions for sim call manager
 2015-07-29 18:00:05 +00:00
Svetoslav Ganov
9352af2a9e Merge "Remove dependencies on the package installer's package name" into mnc-dev 2015-07-29 17:54:23 +00:00
Dianne Hackborn
cb98228dac am deb28b77: am eda1cc50: Merge "Work on issue #22765972: Binder transactions running out of address..." into mnc-dev 
* commit 'deb28b770a0b11604fc20c71044a9c2d9718fe06':
  Work on issue #22765972: Binder transactions running out of address...
 2015-07-29 17:42:46 +00:00
Nicolas Prévot
95c26295c2 am 2b0cd2c7: am 64ac302f: Merge "Send a public broadcast when the device owner is set." into mnc-dev 
* commit '2b0cd2c7a19bbffce7b7f7e313c3dd5195c036ff':
  Send a public broadcast when the device owner is set.
 2015-07-29 17:42:41 +00:00
Sailesh Nepal
6b96de8dae Merge "Default permissions for sim call manager" into mnc-dev 2015-07-29 17:39:37 +00:00
Paul Jensen
dede231240 am 06eabfcc: am 4c55639a: am 8c83be09: am bf10991d: resolved conflicts for merge of 30813942 to mnc-dr-dev 
* commit '06eabfcc2d82833ec89bf92d087210bab18d78bb':
  Disable WiFi autojoin when user decides via "Stay connected?" dialog
 2015-07-29 17:31:12 +00:00
Dianne Hackborn
deb28b770a am eda1cc50: Merge "Work on issue #22765972: Binder transactions running out of address..." into mnc-dev 
* commit 'eda1cc50cead674287616e6a852f8f281b70b9f5':
  Work on issue #22765972: Binder transactions running out of address...
 2015-07-29 17:25:15 +00:00
Nicolas Prévot
2b0cd2c7a1 am 64ac302f: Merge "Send a public broadcast when the device owner is set." into mnc-dev 
* commit '64ac302f0c10de0016689b234ba01c1c81da0061':
  Send a public broadcast when the device owner is set.
 2015-07-29 17:25:10 +00:00
Jeff Sharkey
b11683ba62 Always return content Uri for downloads. 
Now that we're relying more heavily on Uri permission grants between
apps, we should always return content:// Uris.

Bug: 22820206
Change-Id: Ie9603da09944dc594ea5dde2db04455f57d6f103
 2015-07-29 10:22:30 -07:00
Paul Jensen
06eabfcc2d am 4c55639a: am 8c83be09: am bf10991d: resolved conflicts for merge of 30813942 to mnc-dr-dev 
* commit '4c55639a780caa3e0a3594795ab408c5a8618ff2':
  Disable WiFi autojoin when user decides via "Stay connected?" dialog
 2015-07-29 17:09:00 +00:00
Dianne Hackborn
eda1cc50ce Merge "Work on issue #22765972: Binder transactions running out of address..." into mnc-dev 2015-07-29 17:05:58 +00:00
Nicolas Prévot
64ac302f0c Merge "Send a public broadcast when the device owner is set." into mnc-dev 2015-07-29 16:59:46 +00:00