Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
151,184 Commits 3 Branches 0 Tags
f500f905727b94ae4345fce5ce6afdc97ba0e413
Commit Graph

39959 Commits

Author SHA1 Message Date
Alan Viverette
f500f90572 am 1e7d7382: am 3d3783ec: am 417f92da: Merge "Update fast scroller preview for Material" into lmp-dev 
* commit '1e7d7382cae24bc141c3dc24f0350fb1b88fd4b5':
  Update fast scroller preview for Material
 2014-08-18 23:25:08 +00:00
Alan Viverette
6d58ab0346 am 3d3783ec: am 417f92da: Merge "Update fast scroller preview for Material" into lmp-dev 
* commit '3d3783ec27d7b3aafbd08d6695d37543e9a337f8':
  Update fast scroller preview for Material
 2014-08-18 23:16:31 +00:00
Alan Viverette
d59c585588 Merge "Update fast scroller preview for Material" into lmp-dev 2014-08-18 21:31:41 +00:00
Dianne Hackborn
00eea5072b am 4a0bc3cc: am 2dff9254: Merge "Fix issue #14617210: Apps can gain access to any ContentProvider..." into lmp-dev 
* commit '4a0bc3cc94f034f0a83f1e68edf7d440181777ba':
  Fix issue #14617210: Apps can gain access to any ContentProvider...
 2014-08-18 19:29:08 +00:00
Nicolas Prévot
cf4d240140 am 9ecc411b: am 1e8e553b: Merge "Revert "Adding the requiredForProfile flag."" into lmp-dev 
* commit '9ecc411b74923957691a9150acb9c3b38d27cd41':
  Revert "Adding the requiredForProfile flag."
 2014-08-18 19:29:03 +00:00
Svetoslav
7a3867f3e5 am f0307cc9: am 1b3e768a: Merge "Fix a crash in RemoteViews." into lmp-dev 
* commit 'f0307cc91363b8e2b37372b72a5a44c3ce9aa9ab':
  Fix a crash in RemoteViews.
 2014-08-18 19:28:58 +00:00
Sunny Goyal
7bf7a25618 am 868b656d: am 860af1e5: Merge "Fixing bounds check." into lmp-dev 
* commit '868b656d19dc6920fbcabe61e4913f95c4b68de0':
  Fixing bounds check.
 2014-08-18 19:28:53 +00:00
Craig Stout
c27e79d3e1 am b23f941f: am a245102a: Merge "Fix alert, date picker, time picker dialogs for TV." into lmp-dev 
* commit 'b23f941f0f0b2ad267b8617aefd41bdc132fd21a':
  Fix alert, date picker, time picker dialogs for TV.
 2014-08-18 19:28:48 +00:00
Kenny Root
74a74b637e am b4b398b7: am 286a1434: Merge "Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"" into lmp-dev 
* commit 'b4b398b7cae59c581930acc58d9b9f09262c0695':
  Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"
 2014-08-18 19:28:14 +00:00
Dianne Hackborn
80086cd4b4 am a0a64624: am 728f5d08: Merge "Work on issue #16629489: Google (Play?) Services eating through battery" into lmp-dev 
* commit 'a0a646245c6aefa9d8303b641256381e639f0d47':
  Work on issue #16629489: Google (Play?) Services eating through battery
 2014-08-18 19:17:51 +00:00
Dianne Hackborn
84ba83bb3d am af6eb301: am e882cea6: Merge "Fix issue #17082301: replacePreferredActivity is ignoring userId" into lmp-dev 
* commit 'af6eb301c54d90e534ed058c88f6ca7e907eb340':
  Fix issue #17082301: replacePreferredActivity is ignoring userId
 2014-08-18 19:17:47 +00:00
Adrian Roos
48986869c3 am 2ff048ff: am a31e2348: Play "device trusted" sound when onTrustInitiatedByUser fires 
* commit '2ff048ff5587e029e83e17fdfdecaa3fa0fd70c2':
  Play "device trusted" sound when onTrustInitiatedByUser fires
 2014-08-18 17:14:52 +00:00
Adrian Roos
49e057d7ee Play "device trusted" sound when onTrustInitiatedByUser fires 
Bug: 16840500
Change-Id: I73fbe5c2cff665ccb637abb9039d57f377d9df53
 2014-08-18 16:53:27 +00:00
John Reck
30bb86629a am 98270e20: am 976189a1: Merge "Don\'t mangle layer paint\'s alpha" into lmp-dev 
* commit '98270e20063bd6446c088335c957bb5062ba5cf1':
  Don't mangle layer paint's alpha
 2014-08-18 16:21:34 +00:00
Jason Monk
d6ea61cd15 am 75391416: am 71793e71: Merge "Fixes to lock task API from API review" into lmp-dev 
* commit '75391416fe284946f41cfa39799f7e580975fbbf':
  Fixes to lock task API from API review
 2014-08-18 13:51:09 +00:00
Jinsuk Kim
b347ed75cd am c68c9dbd: am 47a91229: Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev 
* commit 'c68c9dbdd5b1e70a429ff2283348a5609522d8cb':
  CEC: Replace the usage of logical address with id for HdmiDeviceInfo
 2014-08-18 02:37:42 +00:00
Jason Monk
95d9ad0f79 Merge "Fixes to lock task API from API review" into lmp-dev 2014-08-16 04:32:18 +00:00
Nicolas Prévot
2e365c805a Merge "Revert "Adding the requiredForProfile flag."" into lmp-dev 2014-08-16 04:29:45 +00:00
Nicolas Prévot
6d24849387 Revert "Adding the requiredForProfile flag." 
This reverts commit 531270a4a1.

BUG: 17102702

Change-Id: Iec5d047dc74bd4899662ede82c48fc024238427c
 2014-08-18 12:51:11 +01:00
Jinsuk Kim
98f4c16a7b Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev 2014-08-16 04:12:14 +00:00
Craig Stout
26bcdf14cf Merge "Fix alert, date picker, time picker dialogs for TV." into lmp-dev 2014-08-16 04:03:42 +00:00
John Reck
fb5899d6e0 Don't mangle layer paint's alpha 
Bug: 15918037

Change-Id: Iecca0908c6e3b77f15807f75a8294d34975533b4
 2014-08-18 08:53:36 -07:00
Anish Athalye
6f7344ff0b Merge "Add optimizing line breaker" 2014-08-16 03:56:29 +00:00
Dianne Hackborn
6b8dba383a am 93109322: am 4a0bc3cc: am 2dff9254: Merge "Fix issue #14617210: Apps can gain access to any ContentProvider..." into lmp-dev 
* commit '93109322f71099a78a9c597a8d74f27110e669af':
  Fix issue #14617210: Apps can gain access to any ContentProvider...
 2014-08-18 19:42:02 +00:00
Nicolas Prévot
b8b6d7ea37 am fa836822: am 9ecc411b: am 1e8e553b: Merge "Revert "Adding the requiredForProfile flag."" into lmp-dev 
* commit 'fa83682209a7f2d49736ade3fab63be7ffb0b37e':
  Revert "Adding the requiredForProfile flag."
 2014-08-18 19:41:57 +00:00
Svetoslav
535e1df59d am 51fd7e00: am f0307cc9: am 1b3e768a: Merge "Fix a crash in RemoteViews." into lmp-dev 
* commit '51fd7e0009c64d6081963e9036b948f5366f7d67':
  Fix a crash in RemoteViews.
 2014-08-18 19:41:26 +00:00
Sunny Goyal
e1682a6258 am 0dd222ef: am 868b656d: am 860af1e5: Merge "Fixing bounds check." into lmp-dev 
* commit '0dd222ef706eb4e1fdeaa7f2bf08f7254124ff11':
  Fixing bounds check.
 2014-08-18 19:41:21 +00:00
Craig Stout
e7daa311df am 37e35094: am b23f941f: am a245102a: Merge "Fix alert, date picker, time picker dialogs for TV." into lmp-dev 
* commit '37e3509452ed789d57165f7929c3f9d648c49eb0':
  Fix alert, date picker, time picker dialogs for TV.
 2014-08-18 19:41:16 +00:00
Kenny Root
5a9621c73a am b1123831: am b4b398b7: am 286a1434: Merge "Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"" into lmp-dev 
* commit 'b1123831c098e9e32c39ce93583dadd121709935':
  Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"
 2014-08-18 19:40:44 +00:00
Anish Athalye
969e7b9496 Add optimizing line breaker 
Change-Id: I1eabc863e7f027c4c19a9ab23e561c774c721993
 2014-08-18 12:25:17 -07:00
Anish Athalye
c8f9e62186 Implement line breaking in native code 
The main purpose for this change is to prepare for adding support for
alternative line breaking algorithms (such as optimal line breaking).

The existing implementation of line breaking was intertwined with
measurement, so it wasn't structured in a way such that other line
breaking algorithms could be easily added. In addition to this,
algorithms (such as optimal line breaking) are usually fairly complex
and computation-intensive, so it is advantageous to implement them in
native code.

This has several other advantages:

    * Unlike the Java code in the previous version of generate(), this
      implementation separates line breaking from measurement. This
      makes it easier to understand and modify the line breaking process
      without affecting measurement (and vice versa).

    * This native implementation of greedy line breaking is identical to
      the Java version in terms of functionality, and it is similar in
      terms of performance, depending on the use case. The performance
      gains from this change are not significant due to increased JNI
      overhead. However, this change is a step in the right direction in
      terms of increasing performance. Once more code moves to C++,
      there will be fewer JNI crossings per layout call and less data
      will be passed from Java to C++, resulting in better performance.

This change moves line breaking from Java to native C++ code. Inspired
by the "Breaking Paragraphs into Lines" paper by Knuth and Plass (1981),
we express the line breaking problem in terms of 'box', 'glue', and
'penalty' primitives, along with a few others. Our implementation
differs in a couple ways:

    * We do not want to clip text when words are wider than the view, so
      we add a new primitive type to represent break opportunities
      between letters. These breaks are avoided whenever possible, but
      when single words do not fit on lines by themselves, they can be
      broken so the entire word is visible.

    * We have to support tab characters, along with user*specified tab
      stops, so we add a new primitive type for that purpose.

    * We are left*aligning text, and so we are not using shrinking /
      stretching glue.

    * We do not support hypenation, so we do not use penalties that have
      widths.

Change-Id: Ia22d1d1275ef26ff3d7b41ee2658e4db525a0305
 2014-08-18 12:25:16 -07:00
Adrian Roos
1bd5a220e7 am 04935e46: am 2ff048ff: am a31e2348: Play "device trusted" sound when onTrustInitiatedByUser fires 
* commit '04935e46cbbc298e930e5c10450a4118861a1b77':
  Play "device trusted" sound when onTrustInitiatedByUser fires
 2014-08-18 17:21:02 +00:00
John Reck
931d0d073c am 41f5d936: am 98270e20: am 976189a1: Merge "Don\'t mangle layer paint\'s alpha" into lmp-dev 
* commit '41f5d93635d91e309eb49dbd8973ff8593e66529':
  Don't mangle layer paint's alpha
 2014-08-18 16:28:47 +00:00
Jason Monk
45c3597975 resolved conflicts for merge of 8e6b5343 to master 
Change-Id: Iece54064b2667b45febd0bffbf602be0fe58ae6d
 2014-08-18 11:05:17 -04:00
Jinsuk Kim
ac33c6cb56 am 28920008: am c68c9dbd: am 47a91229: Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev 
* commit '28920008ff3835c8febcad58f638530ec6253112':
  CEC: Replace the usage of logical address with id for HdmiDeviceInfo
 2014-08-18 04:06:25 +00:00
Robert Greenwalt
2c8a41fba5 am f8f559f5: am 316c9421: am c993be52: Add tcp buffer size conduit to NetworkAgent. 
* commit 'f8f559f5234a8ae0596ecce7814e66a1948d3c2e':
  Add tcp buffer size conduit to NetworkAgent.
 2014-08-17 23:30:35 +00:00
Robert Greenwalt
bbca13351a am 316c9421: am c993be52: Add tcp buffer size conduit to NetworkAgent. 
* commit '316c9421eda732bd510631acd9384b593f37f027':
  Add tcp buffer size conduit to NetworkAgent.
 2014-08-17 23:22:32 +00:00
Robert Greenwalt
3f05bf4d78 Add tcp buffer size conduit to NetworkAgent. 
bug: 16549611
Change-Id: I7d97dedea2c7c1aed2eccb185645889424508591
 2014-08-17 15:14:29 -07:00
Dianne Hackborn
314b29a70c am b8496b22: am 7da20cdf: am 83249fc9: Merge "Make sure we initialize to enable the default voice interaction service." into lmp-dev 
* commit 'b8496b223a714b8bc6233f17562d13360063d257':
  Make sure we initialize to enable the default voice interaction service.
 2014-08-16 19:17:14 +00:00
Dianne Hackborn
28bb0b8ff3 am 7da20cdf: am 83249fc9: Merge "Make sure we initialize to enable the default voice interaction service." into lmp-dev 
* commit '7da20cdf3c36162ab02790dc99a8c7592e86a015':
  Make sure we initialize to enable the default voice interaction service.
 2014-08-16 19:09:39 +00:00
Anish Athalye
7c4db3583b Merge "Implement line breaking in native code" 2014-08-16 04:32:18 +00:00
Dianne Hackborn
e837316a50 am 2d810a47: am a0a64624: am 728f5d08: Merge "Work on issue #16629489: Google (Play?) Services eating through battery" into lmp-dev 
* commit '2d810a477456b93d39aa0cdc30565a9c6eaf574c':
  Work on issue #16629489: Google (Play?) Services eating through battery
 2014-08-18 19:30:05 +00:00
Dianne Hackborn
aba7df589c am 0b04b981: am af6eb301: am e882cea6: Merge "Fix issue #17082301: replacePreferredActivity is ignoring userId" into lmp-dev 
* commit '0b04b98199a89ee640eef3e860d9f003c05b58ca':
  Fix issue #17082301: replacePreferredActivity is ignoring userId
 2014-08-18 19:30:00 +00:00
Dianne Hackborn
90f58b4447 Merge "Make sure we initialize to enable the default voice interaction service." into lmp-dev 2014-08-16 04:29:45 +00:00
Santos Cordon
bb958df02e am fe75850a: am ef80aab4: am 5a496deb: Merge "Fixing wrong tag usage" into lmp-dev 
* commit 'fe75850adbbcc63cec8f8a68ab903ab3d28ccdbc':
  Fixing wrong tag usage
 2014-08-16 04:11:33 +00:00
Santos Cordon
4adf4b0882 am ef80aab4: am 5a496deb: Merge "Fixing wrong tag usage" into lmp-dev 
* commit 'ef80aab4cd9042171bdd14f2afb89de72d96db06':
  Fixing wrong tag usage
 2014-08-16 03:56:27 +00:00
Craig Stout
fd4bc4cdca Fix alert, date picker, time picker dialogs for TV. 
b/15194230

Change-Id: I85bcef86332acb041e5c3b1f8c515d981486c3d1
 2014-08-15 20:56:14 -07:00
Svetoslav
d109f03e3a Merge "Fix a crash in RemoteViews." into lmp-dev 2014-08-16 03:56:00 +00:00
Svetoslav
14494a8760 Fix a crash in RemoteViews. 
We are now using the application info of the target app
of the remote views to create a deicated context for
loading resources. The code that is looking up the app
info was using the appilcation context of the current
app which may be null. Now we are using the base context
which is never null.

bug:17005860

Change-Id: Ibcf8b6f81fe24d23a82327870741146c8864ce8f
 2014-08-18 10:54:12 -07:00
Sunny Goyal
0efc1186fe Merge "Fixing bounds check." into lmp-dev 2014-08-16 03:56:00 +00:00