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

119397 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
5b8a63c10a am 1b753cc9: am 1ae704b8: resolved conflicts for merge of b08447ba to klp-ub-dev 
* commit '1b753cc96f2ddd8289909ae46f43e9333ab1af47':
 2013-11-06 15:57:29 -08:00
Dirk Dougherty
1b753cc96f am 1ae704b8: resolved conflicts for merge of b08447ba to klp-ub-dev 
* commit '1ae704b87efbcae9aff46776e27e72678f92ce42':
 2013-11-06 15:55:12 -08:00
Dirk Dougherty
1ae704b87e resolved conflicts for merge of b08447ba to klp-ub-dev 
Change-Id: I77406f89d3b499f831ba4a66b7bf79039838c5b2
 2013-11-06 15:42:01 -08:00
Chris Craik
a2801c5f64 am 4899398d: am baba771c: am 47742d4b: Merge "Fix NPE with inPurgeable Bitmaps in getAllocationByteCount" into klp-dev 
* commit '4899398dcad50d1b9734ca5f8959712f42f72b02':
  Fix NPE with inPurgeable Bitmaps in getAllocationByteCount
 2013-11-06 15:33:42 -08:00
Ruben Brunk
9cd3b1218e am df049d6f: am 9aed2ae0: am e77d2a9c: Merge "Disable face unlock when returning from camera." into klp-dev 
* commit 'df049d6f2270b06679d51021c97eb9559f2657b7':
  Disable face unlock when returning from camera.
 2013-11-06 15:33:39 -08:00
Craig Mautner
df220c5c59 am e5bdd85a: am ea18624a: am c9d0ee5e: Merge "Tweak test for layout." into klp-dev 
* commit 'e5bdd85a99839e1d557c924d5396d510151da42e':
  Tweak test for layout.
 2013-11-06 15:33:35 -08:00
Chris Craik
4899398dca am baba771c: am 47742d4b: Merge "Fix NPE with inPurgeable Bitmaps in getAllocationByteCount" into klp-dev 
* commit 'baba771c85ec4a8d56e07c0d963c663a99cfa0e3':
  Fix NPE with inPurgeable Bitmaps in getAllocationByteCount
 2013-11-06 15:30:29 -08:00
Ruben Brunk
df049d6f22 am 9aed2ae0: am e77d2a9c: Merge "Disable face unlock when returning from camera." into klp-dev 
* commit '9aed2ae0bd03edcaef3dd3cac8795055cf8d2b43':
  Disable face unlock when returning from camera.
 2013-11-06 15:30:26 -08:00
Craig Mautner
e5bdd85a99 am ea18624a: am c9d0ee5e: Merge "Tweak test for layout." into klp-dev 
* commit 'ea18624ae557a06e49748964f951a81fd6c48370':
  Tweak test for layout.
 2013-11-06 15:30:23 -08:00
Craig Mautner
660041f89f am a2dad41e: am 8ed10cff: am def34eb7: Merge "Ensure bar window state is SHOWING after rotate if visible." into klp-dev 
* commit 'a2dad41e757b8de097491aedecca80387ba3af09':
  Ensure bar window state is SHOWING after rotate if visible.
 2013-11-06 15:29:00 -08:00
Chris Craik
baba771c85 am 47742d4b: Merge "Fix NPE with inPurgeable Bitmaps in getAllocationByteCount" into klp-dev 
* commit '47742d4bb004a51c045d443024a36d784cd38d9b':
  Fix NPE with inPurgeable Bitmaps in getAllocationByteCount
 2013-11-06 15:26:51 -08:00
Craig Mautner
a2dad41e75 am 8ed10cff: am def34eb7: Merge "Ensure bar window state is SHOWING after rotate if visible." into klp-dev 
* commit '8ed10cff78460a0cc426dc5c1426a9edaafe3e67':
  Ensure bar window state is SHOWING after rotate if visible.
 2013-11-06 15:26:49 -08:00
Ruben Brunk
9aed2ae0bd am e77d2a9c: Merge "Disable face unlock when returning from camera." into klp-dev 
* commit 'e77d2a9c62e747902bc53d40e303214705702b00':
  Disable face unlock when returning from camera.
 2013-11-06 15:26:48 -08:00
Craig Mautner
ea18624ae5 am c9d0ee5e: Merge "Tweak test for layout." into klp-dev 
* commit 'c9d0ee5e8476bbe0d50b726f9cb4cf173d6f6952':
  Tweak test for layout.
 2013-11-06 15:26:45 -08:00
Chris Craik
47742d4bb0 Merge "Fix NPE with inPurgeable Bitmaps in getAllocationByteCount" into klp-dev 2013-11-06 23:23:56 +00:00
Craig Mautner
8ed10cff78 am def34eb7: Merge "Ensure bar window state is SHOWING after rotate if visible." into klp-dev 
* commit 'def34eb775caf8eb56248d536ec56b39c47e4431':
  Ensure bar window state is SHOWING after rotate if visible.
 2013-11-06 15:23:15 -08:00
Ruben Brunk
e77d2a9c62 Merge "Disable face unlock when returning from camera." into klp-dev 2013-11-06 23:22:55 +00:00
Craig Mautner
c9d0ee5e84 Merge "Tweak test for layout." into klp-dev 2013-11-06 23:22:12 +00:00
Craig Mautner
def34eb775 Merge "Ensure bar window state is SHOWING after rotate if visible." into klp-dev 2013-11-06 23:19:58 +00:00
Adam Powell
9c5c6fdb17 Merge "Fix docs" 2013-11-06 23:07:55 +00:00
Adam Powell
ab42aec4bc Fix docs 
Change-Id: Iaeef1812e3dfa76abe40468066860f73d8a10f79
 2013-11-06 15:00:36 -08:00
Craig Mautner
f961b3c5b6 Tweak test for layout. 
Return to old way of only laying out Keyguard on configuration change
and add a new qualifier that does a layout if a window is part of an
opening app. This qualifier allows apps that handle their own
configuration changes to be notified of screen changes after the
configuration has changed. Apps that do not handle their own
configuration changes find their way into this code because their
surfaces are recreated by default and mHaveFrame is false.

This fixes bug 11544694 and passes the test of all bugs listed in CL
ag/383579.

Change-Id: I3a679b27eb4a2c5210957bcd4ae2f10b46f6e076
 2013-11-06 14:52:36 -08:00
Craig Mautner
8da77784a0 am f6744886: am b9132543: am a724d865: Merge "Fix incorrect looping limits." into klp-dev 
* commit 'f6744886f2dba3865beb2b3dff33d7bf747fe772':
  Fix incorrect looping limits.
 2013-11-06 14:28:23 -08:00
Craig Mautner
f6744886f2 am b9132543: am a724d865: Merge "Fix incorrect looping limits." into klp-dev 
* commit 'b9132543b02e76e7ca8f043ed68667a189b64cc0':
  Fix incorrect looping limits.
 2013-11-06 14:25:32 -08:00
Craig Mautner
b9132543b0 am a724d865: Merge "Fix incorrect looping limits." into klp-dev 
* commit 'a724d865372530e01e4bb14751e0305da9bc377b':
  Fix incorrect looping limits.
 2013-11-06 14:22:26 -08:00
Craig Mautner
a724d86537 Merge "Fix incorrect looping limits." into klp-dev 2013-11-06 22:20:25 +00:00
John Spurlock
c23bd80b38 Ensure bar window state is SHOWING after rotate if visible. 
Bug:11544694
Change-Id: Ied56f01a931f33437bdc05d026006cabcdef0149
 2013-11-06 17:09:51 -05:00
Chris Craik
222f2ad294 Fix NPE with inPurgeable Bitmaps in getAllocationByteCount 
bug:11556330
Change-Id: I430136ea15baeb60adfb9bb2acdde9505ce707fe
 2013-11-06 14:01:28 -08:00
John Spurlock
574ad40c26 am cd6258b5: am 20dc4923: am 10b9ac80: Merge "Fix lockscreen camera preview position in RTL." into klp-dev 
* commit 'cd6258b50f94d69a3ba677c2d17bed824c10cdd2':
  Fix lockscreen camera preview position in RTL.
 2013-11-06 13:57:47 -08:00
John Spurlock
cd6258b50f am 20dc4923: am 10b9ac80: Merge "Fix lockscreen camera preview position in RTL." into klp-dev 
* commit '20dc49235e213d40f75dca9005e0e248931ceff4':
  Fix lockscreen camera preview position in RTL.
 2013-11-06 13:55:18 -08:00
Craig Mautner
db5c4fb864 Fix incorrect looping limits. 
One cannot iterate across an entire list if one both removes an entry
and increments the index into the list. Do one or the other or you
will end up with bugs like 11556768 which is now fixed.

Change-Id: I57f1ad13075a005cae3c1cbfae10e230d9af143a
 2013-11-06 13:55:08 -08:00
Jason Sams
b7189d2f35 Merge "Use Object + type in place of specific array" 2013-11-06 21:55:04 +00:00
John Spurlock
20dc49235e am 10b9ac80: Merge "Fix lockscreen camera preview position in RTL." into klp-dev 
* commit '10b9ac807f7cc0817e8dd4b96d587ccd41f8f177':
  Fix lockscreen camera preview position in RTL.
 2013-11-06 13:52:15 -08:00
John Spurlock
10b9ac807f Merge "Fix lockscreen camera preview position in RTL." into klp-dev 2013-11-06 21:48:41 +00:00
Jim Miller
17a93ff130 am 5a31605a: am 78244c83: am 32293469: Merge "Fix issue where transport control shows up off-screen on tablets" into klp-dev 
* commit '5a31605a034e990a68567597bbf9ccbc8cb28494':
  Fix issue where transport control shows up off-screen on tablets
 2013-11-06 13:25:09 -08:00
Jim Miller
5a31605a03 am 78244c83: am 32293469: Merge "Fix issue where transport control shows up off-screen on tablets" into klp-dev 
* commit '78244c83fb633895c95f3c93ab874be979cf42e3':
  Fix issue where transport control shows up off-screen on tablets
 2013-11-06 13:22:16 -08:00
Jim Miller
78244c83fb am 32293469: Merge "Fix issue where transport control shows up off-screen on tablets" into klp-dev 
* commit '322934699433d703fa35505d72028abbcf8ce45f':
  Fix issue where transport control shows up off-screen on tablets
 2013-11-06 13:19:27 -08:00
Jim Miller
3229346994 Merge "Fix issue where transport control shows up off-screen on tablets" into klp-dev 2013-11-06 21:15:17 +00:00
Adam Powell
d033e67afe Merge "Make Scenes and Transitions first-class in PhoneWindow/Themes" 2013-11-06 21:14:03 +00:00
Michael Wright
a1dc9fc9d5 am 09bfaa79: am ce89135a: am 6a29778e: Merge "Continue synthesizing data even after brightness adjustment" into klp-dev 
* commit '09bfaa7991066703d1dca87b4ab8e68a30076990':
  Continue synthesizing data even after brightness adjustment
 2013-11-06 12:39:30 -08:00
Michael Wright
09bfaa7991 am ce89135a: am 6a29778e: Merge "Continue synthesizing data even after brightness adjustment" into klp-dev 
* commit 'ce89135a53b1f5c0e7f34dbae12794f4421d9390':
  Continue synthesizing data even after brightness adjustment
 2013-11-06 12:36:41 -08:00
Michael Wright
ce89135a53 am 6a29778e: Merge "Continue synthesizing data even after brightness adjustment" into klp-dev 
* commit '6a29778eeb836fe01993b6dbd3734d8085f48015':
  Continue synthesizing data even after brightness adjustment
 2013-11-06 12:35:03 -08:00
Michael Wright
6a29778eeb Merge "Continue synthesizing data even after brightness adjustment" into klp-dev 2013-11-06 20:33:08 +00:00
John Spurlock
b6c3b20d71 Fix lockscreen camera preview position in RTL. 
Bug:11263914
Change-Id: Ic3e5157ceb82495d10afd74b3af2655434a9467c
 2013-11-06 14:44:54 -05:00
Victoria Lease
d0d4b00ac5 am dd3776d6: am 30a3ef6c: am c89eaf91: Merge "Fix for Typeface.create(Typeface, style) semantics changed in KK" into klp-dev 
* commit 'dd3776d673776785f32aa7d813871a38de906c5d':
  Fix for Typeface.create(Typeface, style) semantics changed in KK
 2013-11-06 11:39:58 -08:00
Victoria Lease
dd3776d673 am 30a3ef6c: am c89eaf91: Merge "Fix for Typeface.create(Typeface, style) semantics changed in KK" into klp-dev 
* commit '30a3ef6c85011ba82a777e6eef7f026323019f35':
  Fix for Typeface.create(Typeface, style) semantics changed in KK
 2013-11-06 11:37:15 -08:00
Victoria Lease
30a3ef6c85 am c89eaf91: Merge "Fix for Typeface.create(Typeface, style) semantics changed in KK" into klp-dev 
* commit 'c89eaf916ad7e88565d2a15991432b22cd9099ff':
  Fix for Typeface.create(Typeface, style) semantics changed in KK
 2013-11-06 11:33:35 -08:00
Victoria Lease
c89eaf916a Merge "Fix for Typeface.create(Typeface, style) semantics changed in KK" into klp-dev 2013-11-06 19:30:23 +00:00
Jason Sams
e729a9400f Use Object + type in place of specific array 
Changed to avoid the explosion of entry points in the JNI layer.

Change-Id: I7d6cc565c8853b06560eb891fdd5e8acf05c9779
 2013-11-06 11:22:02 -08:00
Michael Jurka
b52856129c am 065f321d: am f080a24e: am 04cead14: Merge "Fix calculation of default wallpaper size" into klp-dev 
* commit '065f321de92cfe8e86eaaeb86f0a0420c9300fbf':
  Fix calculation of default wallpaper size
 2013-11-06 11:17:37 -08:00