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

152975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
89cff0fde7 am 1c33dc49: am efb75031: Merge "Implement TODO" into lmp-dev 
* commit '1c33dc49d8ab4ecac90794090bba191e42bd6c04':
  Implement TODO
 2014-09-03 05:49:53 +00:00
Dianne Hackborn
6bffbe8618 am 7f68e1ae: am a7260b84: Merge "And yet more logging for slow execution." into lmp-dev 
* commit '7f68e1ae893822b70c2a820dee0b55decaea7c37':
  And yet more logging for slow execution.
 2014-09-03 05:49:31 +00:00
Lorenzo Colitti
b448f7a6ef am a04d244b: am 910113a9: Merge "Use per-Network connection pools for openConnection." into lmp-dev 
* commit 'a04d244bf06dbd5845e5129275c30f631b1d0013':
  Use per-Network connection pools for openConnection.
 2014-09-03 05:49:27 +00:00
Lorenzo Colitti
e7cd2f5515 am 4c172753: am 2c0a5509: Merge "Pass the socket mark for DNS queries to dnsmasq." into lmp-dev 
* commit '4c172753f892557175ecb4c3cf4ed6fd76227049':
  Pass the socket mark for DNS queries to dnsmasq.
 2014-09-03 05:49:22 +00:00
Michael Wright
ec217952da am 57eda61b: am 0d35de74: am 144c21c2: (-s ours) am da3b4363: DO NOT MERGE: Use a linear spline if there\'s a non-monotonic brightness curve 
* commit '57eda61b89d35a6b9a31f0e56a9bed138ec99de9':
  DO NOT MERGE: Use a linear spline if there's a non-monotonic brightness curve
 2014-09-03 05:49:10 +00:00
Alan Viverette
1834ecdef4 am 69a2f2b6: am 489e207d: Merge "Update pointer hotspots to scale for DPI" into lmp-dev 
* commit '69a2f2b6059dc87cbee142d1f710d92521ef4389':
  Update pointer hotspots to scale for DPI
 2014-09-03 05:49:05 +00:00
Dianne Hackborn
c7535364b6 am 1f9c4f45: am 8070053f: Merge "Add public constant for usage stats app op." into lmp-dev 
* commit '1f9c4f452d976ad54538ef4ff6484d354ba18212':
  Add public constant for usage stats app op.
 2014-09-03 05:48:53 +00:00
Raph Levien
82ea4ee7f4 am 83f28d57: am 2e97ac0c: Merge "Ensure layout in getExtendedPadding calls" into lmp-dev 
* commit '83f28d5710b9ffca5ab8876e12458a515e694645':
  Ensure layout in getExtendedPadding calls
 2014-09-03 05:48:48 +00:00
Craig Mautner
55ec668ec3 am 183de81a: am 2d94c706: Merge "Account for scaling effects when cropping" into lmp-dev 
* commit '183de81a6cf0c4e45f1fb576cd0da06636ea8336':
  Account for scaling effects when cropping
 2014-09-03 05:48:43 +00:00
Svet Ganov
2f405f1f4e am 87ca3b16: am 668b4765: Merge "Move print rendering in an isolated process." into lmp-dev 
* commit '87ca3b16be5933eb2cd5fdd250389d233ec924bc':
  Move print rendering in an isolated process.
 2014-09-03 05:48:36 +00:00
Adrian Roos
52a76bdcbf am 42bbbeb2: am be31021b: Merge "Disable touch dispatch while adjusting brightness" into lmp-dev 
* commit '42bbbeb2d9e85bc67235e6006cc1f1c7a27ac9b8':
  Disable touch dispatch while adjusting brightness
 2014-09-03 05:48:30 +00:00
Shri Borde
55100d0ad7 am be2ea906: am fb909790: Merge "Bug 17243357: Remove MessagingConfigurationManager" into lmp-dev 
* commit 'be2ea906d9ccb51bb9c188e868ae0297c1f25923':
  Bug 17243357: Remove MessagingConfigurationManager
 2014-09-03 05:48:25 +00:00
Adrian Roos
696e958de5 am 0e15297c: am c51688f7: Merge "Don\'t drop up or cancel touch events" into lmp-dev 
* commit '0e15297c65ee29c4f257e0a7a87f64592c3d01fd':
  Don't drop up or cancel touch events
 2014-09-03 05:07:36 +00:00
John Reck
84b8d1ae8e am efb75031: Merge "Implement TODO" into lmp-dev 
* commit 'efb75031e7eac8ee84ca6202dcddd39149d78980':
  Implement TODO
 2014-09-02 23:09:59 +00:00
John Reck
3d3f5f8c68 Merge "Implement TODO" into lmp-dev 2014-09-02 22:58:51 +00:00
Dianne Hackborn
7e40b9519b am a7260b84: Merge "And yet more logging for slow execution." into lmp-dev 
* commit 'a7260b847f4bf285d7e56b6728f867845f2fc788':
  And yet more logging for slow execution.
 2014-09-02 22:57:27 +00:00
Lorenzo Colitti
7498871821 am 910113a9: Merge "Use per-Network connection pools for openConnection." into lmp-dev 
* commit '910113a91cc62b5840f107f9b41e4a6445d2a155':
  Use per-Network connection pools for openConnection.
 2014-09-02 22:53:03 +00:00
Lorenzo Colitti
91396a3577 am 2c0a5509: Merge "Pass the socket mark for DNS queries to dnsmasq." into lmp-dev 
* commit '2c0a5509a7d74c013e63b7056679394811b5e984':
  Pass the socket mark for DNS queries to dnsmasq.
 2014-09-02 22:52:58 +00:00
Dianne Hackborn
526b642290 Merge "And yet more logging for slow execution." into lmp-dev 2014-09-02 22:49:38 +00:00
John Reck
1661715d40 Implement TODO 
Change-Id: I551ad0dab6356baa4c7787718b54d5b7337a3f26
 2014-09-02 15:44:14 -07:00
Lorenzo Colitti
ca2f20deaa Merge "Use per-Network connection pools for openConnection." into lmp-dev 2014-09-02 22:40:10 +00:00
Lorenzo Colitti
089ea995ba Merge "Pass the socket mark for DNS queries to dnsmasq." into lmp-dev 2014-09-02 22:39:18 +00:00
Michael Wright
b574aef3f1 am 0d35de74: am 144c21c2: (-s ours) am da3b4363: DO NOT MERGE: Use a linear spline if there\'s a non-monotonic brightness curve 
* commit '0d35de7488a28bc60915b8f21bf630103cc80be7':
  DO NOT MERGE: Use a linear spline if there's a non-monotonic brightness curve
 2014-09-02 22:30:01 +00:00
Alan Viverette
c6c42c7e50 am 489e207d: Merge "Update pointer hotspots to scale for DPI" into lmp-dev 
* commit '489e207dcd42e1d4e4c78d7b72138f4a094dfd79':
  Update pointer hotspots to scale for DPI
 2014-09-02 22:29:56 +00:00
Michael Wright
17516155d7 am 144c21c2: (-s ours) am da3b4363: DO NOT MERGE: Use a linear spline if there\'s a non-monotonic brightness curve 
* commit '144c21c2a063981efe942f98c4fa22ebd5f728fc':
  DO NOT MERGE: Use a linear spline if there's a non-monotonic brightness curve
 2014-09-02 22:24:30 +00:00
Alan Viverette
d379361ecb Merge "Update pointer hotspots to scale for DPI" into lmp-dev 2014-09-02 22:20:12 +00:00
Dianne Hackborn
fae8cbfe90 am 8070053f: Merge "Add public constant for usage stats app op." into lmp-dev 
* commit '8070053f6266c98bcffca335b4642d415638b05c':
  Add public constant for usage stats app op.
 2014-09-02 22:04:12 +00:00
Raph Levien
44a233952e am 2e97ac0c: Merge "Ensure layout in getExtendedPadding calls" into lmp-dev 
* commit '2e97ac0cccdb8625385dc2373ce1a0d8e5f18b2c':
  Ensure layout in getExtendedPadding calls
 2014-09-02 22:04:08 +00:00
Craig Mautner
cb31188b0a am 2d94c706: Merge "Account for scaling effects when cropping" into lmp-dev 
* commit '2d94c706439c2d492d60dd9a77fd6643e8a1bb23':
  Account for scaling effects when cropping
 2014-09-02 22:04:03 +00:00
Svet Ganov
825b432151 am 668b4765: Merge "Move print rendering in an isolated process." into lmp-dev 
* commit '668b4765de3e97d69aaebb3bd58fe23eb800264d':
  Move print rendering in an isolated process.
 2014-09-02 22:03:58 +00:00
Adrian Roos
38778c170c am be31021b: Merge "Disable touch dispatch while adjusting brightness" into lmp-dev 
* commit 'be31021b4360f28e49da0bb654103520c9a2ad43':
  Disable touch dispatch while adjusting brightness
 2014-09-02 22:03:53 +00:00
Shri Borde
26664a0a09 am fb909790: Merge "Bug 17243357: Remove MessagingConfigurationManager" into lmp-dev 
* commit 'fb90979054c6800b00b8c4e2890f04f055b4077e':
  Bug 17243357: Remove MessagingConfigurationManager
 2014-09-02 22:03:49 +00:00
Michael Wright
144c21c2a0 am da3b4363: DO NOT MERGE: Use a linear spline if there\'s a non-monotonic brightness curve 
* commit 'da3b43633fe86d69aab5cab52826e76e01f18d63':
  DO NOT MERGE: Use a linear spline if there's a non-monotonic brightness curve
 2014-09-02 22:02:23 +00:00
Dianne Hackborn
7b7b754fab Merge "Add public constant for usage stats app op." into lmp-dev 2014-09-02 21:54:56 +00:00
Raph Levien
4c5ea10caf Merge "Ensure layout in getExtendedPadding calls" into lmp-dev 2014-09-02 21:53:26 +00:00
Craig Mautner
980d466342 Merge "Account for scaling effects when cropping" into lmp-dev 2014-09-02 21:53:03 +00:00
Svet Ganov
561b893174 Merge "Move print rendering in an isolated process." into lmp-dev 2014-09-02 21:51:47 +00:00
Adrian Roos
8c8fbcf358 Merge "Disable touch dispatch while adjusting brightness" into lmp-dev 2014-09-02 21:51:47 +00:00
Shri Borde
ffc150ebed Merge "Bug 17243357: Remove MessagingConfigurationManager" into lmp-dev 2014-09-02 21:48:10 +00:00
Michael Wright
da3b43633f DO NOT MERGE: Use a linear spline if there's a non-monotonic brightness curve 
Some devices may contain things like transflective displays where
they actually want the backlight brightness to decrease in the face
of high ambient light scenarios. In the interest of time, just use a
linear interpolation based on the brightness control points for these
cases but in the future we should consider adding a non-monotonic
cubic spline.

Bug: 15611140
Change-Id: I308ad00943d916866ee8d2507a41b7032e6b524e
 2014-09-02 14:47:37 -07:00
Adrian Roos
8edffdf1e9 am c51688f7: Merge "Don\'t drop up or cancel touch events" into lmp-dev 
* commit 'c51688f7c59890f31ffd8a6b79c083e4659dd087':
  Don't drop up or cancel touch events
 2014-09-02 21:44:34 +00:00
Adrian Roos
9dc3209913 Disable touch dispatch while adjusting brightness 
Prevents new pointers from being added while the shade
is transparent so that nothing gets touched by accident.

Bug: 17113634
Change-Id: I4a607d08dbccd467280159060846edd32db9c512
 2014-09-02 23:38:59 +02:00
Craig Mautner
78505d8d09 Account for scaling effects when cropping 
When a scaled window inherits the crop from an attached animating
window the scaling must be accounted for or the crop will obscure
the scaled window.

In the case of the bug that this CL fixes, the SurfaceView containing
a video was scaled down from 1920x1080 by a factor of 0.562 to fit in
1080 width. The crop applied to the window was 1080 but this was passed
to surfaceflinger which ended up cropping the width to 608 due to the
scaling.

Applying the scaling factor to the crop rectangle fixes this bug.

Fixes bug 16334217.

Change-Id: Iafefe43d3696d9fbff01a3666096348468a41e1a
 2014-09-02 14:36:31 -07:00
Adrian Roos
38b4670d46 Merge "Don't drop up or cancel touch events" into lmp-dev 2014-09-02 21:35:59 +00:00
Dianne Hackborn
36927a3600 And yet more logging for slow execution. 
Change-Id: Idd485d3b4339e22a38fd688cbd435818ca38d233
 2014-09-02 14:32:02 -07:00
Raph Levien
463cf1aea8 Ensure layout in getExtendedPadding calls 
There are cases in which getExtendedPaddingTop() and Bottom can get
called even without a valid layout. This patch just makes sure there
is some reasonable layout available.

Fix for bug 14819392 "java.lang.NullPointerException in
android.widget.TextView"

Change-Id: I203899402ddfe857a688b16b7855a8991eee82b7
 2014-09-02 14:23:18 -07:00
Adrian Roos
ce5474b837 Don't drop up or cancel touch events 
Otherwise you're gonna have a bad time.

Bug: 17113634
Change-Id: I24fa13a4379bab0cef014010058d08096abda094
 2014-09-02 23:19:56 +02:00
Shri Borde
7237972bff Bug 17243357: Remove MessagingConfigurationManager 
It is replaced with SmsManager.getCarrierConfigValues

Change-Id: I560a53427b08746f2a7ed2e540ecb2c978b7ebd0
 2014-09-02 14:00:21 -07:00
Jorim Jaggi
040787ebaa am 4381bd8c: am d9a773e5: Merge "Fix outdated time when turning on screen" into lmp-dev 
* commit '4381bd8cb57c26e2b3f5d2eb09783917357ab6b9':
  Fix outdated time when turning on screen
 2014-09-02 20:46:25 +00:00
Jean-Michel Trivi
091c909180 am 22a14cd2: am 73db0682: Merge "Restore permission check for mic muting" into lmp-dev 
* commit '22a14cd2d8d3fb0e5a9bd8bf9d6ecf1467c0579c':
  Restore permission check for mic muting
 2014-09-02 20:46:20 +00:00