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

169380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
0d4ab958c1 am 4e3404d9: am dec3f138: Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev 
* commit '4e3404d90fe33a0ff790aff4a97b6bb55e4c0e8f':
  Force-use the pbuffer surface for destroy
 2014-11-26 12:02:19 +00:00
Jorim Jaggi
2f47df8334 am dccd3662: am c1de25d8: Merge "Animate notifs depending on touch when exiting doze mode" into lmp-mr1-dev 
* commit 'dccd3662da356ed7b0beedc09c8a58103723b463':
  Animate notifs depending on touch when exiting doze mode
 2014-11-26 12:02:13 +00:00
Robin Lee
a7ffed86fc am cc19e8b8: am 692e4933: Merge "DevicePolicy: Don\'t warn about managed profile CAs" into lmp-mr1-dev 
* commit 'cc19e8b85b223e8a4b36ce3342c28f250fb08f91':
  DevicePolicy: Don't warn about managed profile CAs
 2014-11-26 12:02:06 +00:00
Chris Craik
1fb141f83b am 9c5b7b09: am ee660651: Merge "Improve DisplayList state output" into lmp-mr1-dev 
* commit '9c5b7b094254cad0a8a90ece5ea650c49694087d':
  Improve DisplayList state output
 2014-11-26 12:01:46 +00:00
Dianne Hackborn
6df037ac5d am bafddb4a: am d0f6b4f6: Merge "Start MountService before performBootDexOpt" into lmp-mr1-dev 
* commit 'bafddb4aa57b79f51c0b1f5d4f4cf178069b824c':
  Start MountService before performBootDexOpt
 2014-11-26 12:01:41 +00:00
John Spurlock
a2decb0e4d am f74ae93c: am bc6f59a1: Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev 
* commit 'f74ae93cac3c78762fc87cdaa9edd6f86f2dbec8':
  VolumeZen: Introduce internal vs external ringer mode.
 2014-11-26 12:01:35 +00:00
Narayan Kamath
c9269da26c am edda97c9: am fdbef408: Merge "Start MountService before performBootDexOpt" 
* commit 'edda97c9ffc4fae08744e42fdbf60040e8f97b99':
  Start MountService before performBootDexOpt
 2014-11-26 11:10:48 +00:00
Narayan Kamath
edda97c9ff am fdbef408: Merge "Start MountService before performBootDexOpt" 
* commit 'fdbef4081d715de59525d58d44881b00f616616f':
  Start MountService before performBootDexOpt
 2014-11-26 11:05:46 +00:00
Narayan Kamath
fdbef4081d Merge "Start MountService before performBootDexOpt" 2014-11-26 10:59:29 +00:00
Chris Craik
ab1a53c509 am bf62d307: am af5bd75b: Merge "Enable stencil clipping within clearLayerRegions" 
* commit 'bf62d3070c1653b79f4edcc0729b6a1a833d3ca1':
  Enable stencil clipping within clearLayerRegions
 2014-11-26 00:08:05 +00:00
Chris Craik
bf62d3070c am af5bd75b: Merge "Enable stencil clipping within clearLayerRegions" 
* commit 'af5bd75b3d65fc710784f59d1c22c164312e2691':
  Enable stencil clipping within clearLayerRegions
 2014-11-26 00:02:17 +00:00
Chris Craik
af5bd75b3d Merge "Enable stencil clipping within clearLayerRegions" 2014-11-25 23:56:33 +00:00
Elliott Hughes
1fae099132 am f67cc149: am 2657717f: Merge "We have POSIX clocks." 
* commit 'f67cc149982cefdcf9f8697c9966c710f6512d23':
  We have POSIX clocks.
 2014-11-25 23:29:14 +00:00
Elliott Hughes
f67cc14998 am 2657717f: Merge "We have POSIX clocks." 
* commit '2657717f97e0de689aa3d8cae75bb0053607839d':
  We have POSIX clocks.
 2014-11-25 23:23:45 +00:00
Elliott Hughes
2657717f97 Merge "We have POSIX clocks." 2014-11-25 23:17:59 +00:00
Elliott Hughes
42c569224a We have POSIX clocks. 
Change-Id: I70f82074f8c14a26c4ed7eb912ddf6d7da44c168
 2014-11-25 15:11:59 -08:00
John Reck
4e3404d90f am dec3f138: Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev 
* commit 'dec3f138c2f6a31879b0fe055a26d618e4874bb5':
  Force-use the pbuffer surface for destroy
 2014-11-25 19:59:05 +00:00
John Reck
dec3f138c2 Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev 2014-11-25 19:52:53 +00:00
Jorim Jaggi
dccd3662da am c1de25d8: Merge "Animate notifs depending on touch when exiting doze mode" into lmp-mr1-dev 
* commit 'c1de25d8ebaecff697c1d5dfaa445e18ee07fa2d':
  Animate notifs depending on touch when exiting doze mode
 2014-11-25 19:31:44 +00:00
Jorim Jaggi
c1de25d8eb Merge "Animate notifs depending on touch when exiting doze mode" into lmp-mr1-dev 2014-11-25 19:28:39 +00:00
Jorim Jaggi
2a5e452f4f Animate notifs depending on touch when exiting doze mode 
When exiting doze mode during pulsing and the reason for the wakeup
is a touch event, we calculate the delay of the animations to animate
the notification from black/white to color depending on the point
where the touch happened to wake up the screen.

Bug: 18146441
Change-Id: Ica76b235d629acfc2b09b5f56027c688502f89d8
 2014-11-25 20:26:40 +01:00
Robin Lee
cc19e8b85b am 692e4933: Merge "DevicePolicy: Don\'t warn about managed profile CAs" into lmp-mr1-dev 
* commit '692e4933f01f5f7d0c16dcbcd96127897d054511':
  DevicePolicy: Don't warn about managed profile CAs
 2014-11-25 19:17:43 +00:00
Robin Lee
692e4933f0 Merge "DevicePolicy: Don't warn about managed profile CAs" into lmp-mr1-dev 2014-11-25 19:11:00 +00:00
chh
d7572b84ef am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters" 
* commit '3ec380d365cbe5fac23ff19897512cf492a7a8a4':
  Remove unused variables and functions, don't warn about unused parameters
 2014-11-25 19:04:05 +00:00
Chih-hung Hsieh
243a42a799 am 43ea037b: am 481c4b64: Merge "Fix class vs. struct mismatch" 
* commit '43ea037b4c61e332d7419ac069a62e314166fdd7':
  Fix class vs. struct mismatch
 2014-11-25 19:03:57 +00:00
Chih-hung Hsieh
b308666814 am 6cc39a47: am 613d2066: Merge "Fix unused variables." 
* commit '6cc39a475dd8eaac04438b393559612ff7cd840f':
  Fix unused variables.
 2014-11-25 19:03:50 +00:00
Chih-hung Hsieh
0551ae80eb am 73780ac3: am 38cc84de: Merge "Remove unused variable" 
* commit '73780ac3921c26853eb132296144b85461c80e31':
  Remove unused variable
 2014-11-25 19:03:18 +00:00
Chih-Hung Hsieh
f14203295b am a3b1ea33: am e57b3991: Merge "Remove unused function" 
* commit 'a3b1ea33368b72209f72ad21b512b1c755ce05aa':
  Remove unused function
 2014-11-25 18:52:20 +00:00
Chris Craik
9c5b7b0942 am ee660651: Merge "Improve DisplayList state output" into lmp-mr1-dev 
* commit 'ee6606519d22805c1caf23a3c75cde9fc97b34eb':
  Improve DisplayList state output
 2014-11-25 18:51:59 +00:00
Andres Morales
ffc710281c am 83f4847f: am 59093d92: Merge "Define permission for system apps to query size of block" into lmp-mr1-dev 
* commit '83f4847f7b842fafec74fad85878e36b19dfef9f':
  Define permission for system apps to query size of block
 2014-11-25 18:46:15 +00:00
Bo Liu
88309159a5 am 38134303: am 84be180e: Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev 
* commit '3813430367591efcf925b2baebc50a99a7666644':
  Fix crash in getNativeCanvas when canvasHandle is NULL
 2014-11-25 18:46:04 +00:00
John Reck
af3efb4a9e am f2a382d4: am fb6121e0: Merge "Revert "Ensure calling mutate() on DrawableContainer creates a new state"" into lmp-mr1-dev 
* commit 'f2a382d4f7de5336d0c20358bb694e205a38fc38':
  Revert "Ensure calling mutate() on DrawableContainer creates a new state"
 2014-11-25 18:45:54 +00:00
John Reck
5ab86ba05d am 89a63f02: am 0c31d97a: Merge "Switch TextureCache to SkPixelRef::fStableId" into lmp-mr1-dev 
* commit '89a63f02f5d0814435e72b515b792bc6737014dc':
  Switch TextureCache to SkPixelRef::fStableId
 2014-11-25 18:45:48 +00:00
Natalie Masse
18c295bf8b am a05d4a4b: am 8d9e6434: am 65e51fcd: am d7c7d275: am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs 
* commit 'a05d4a4bb38df792cbf19a0f1e198a26f1509281':
  Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
 2014-11-25 18:45:38 +00:00
Svet Ganov
846aac1a22 am 48956f26: am f51d7015: Merge "Lockup in the print spooler." into lmp-mr1-dev 
* commit '48956f266df46bc852c8c2886f16dbb7ac61b3fe':
  Lockup in the print spooler.
 2014-11-25 18:45:32 +00:00
Dianne Hackborn
bafddb4aa5 am d0f6b4f6: Merge "Start MountService before performBootDexOpt" into lmp-mr1-dev 
* commit 'd0f6b4f6297373e569e383edc21aaa3f87591e0b':
  Start MountService before performBootDexOpt
 2014-11-25 18:45:28 +00:00
John Spurlock
f74ae93cac am bc6f59a1: Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev 
* commit 'bc6f59a1ef341231c2b57e0cde691be1a5a32203':
  VolumeZen: Introduce internal vs external ringer mode.
 2014-11-25 18:45:23 +00:00
Chris Craik
ee6606519d Merge "Improve DisplayList state output" into lmp-mr1-dev 2014-11-25 18:45:11 +00:00
Dirk Dougherty
e264e1f046 am be8da57a: am 5977f7d5: am d23a8692: am 14e40f04: am fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861 
* commit 'be8da57a33103f9257d1a23eee372a703d8c181a':
  Doc change: zh-cn translation of Android L overviews. cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
 2014-11-25 18:45:11 +00:00
Alan Viverette
3d0b7cdb66 am 2bae3789: am ada19e6d: Merge "Update action bar insets on sw600dp to match Material spec" into lmp-mr1-dev 
* commit '2bae3789da18676cabf2e09e49c519fa96184a81':
  Update action bar insets on sw600dp to match Material spec
 2014-11-25 18:44:48 +00:00
Alan Viverette
bf7ef37898 am 0e8aabd6: am 662039c6: Merge "Update IME selection dialog layout for Material" into lmp-mr1-dev 
* commit '0e8aabd6c9dfef168a6de714219fc52ecaca08ea':
  Update IME selection dialog layout for Material
 2014-11-25 18:44:42 +00:00
Alan Viverette
c9b68e1150 am df188d41: am d30f6fba: Merge "Cannot set Pivot X,Y values from setPivotX, setPivotY API" into lmp-mr1-dev 
* commit 'df188d4137a9ebf0661127bab36c517a7fb001d5':
  Cannot set Pivot X,Y values from setPivotX, setPivotY API
 2014-11-25 18:44:37 +00:00
Adam Lesinski
44a711ccac am 9f692b52: am 9be305d1: Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev 
* commit '9f692b520255435903c8c1efb7b50f22a80505a5':
  Make the Context service constant for UsageStats public
 2014-11-25 18:44:31 +00:00
Alan Viverette
15913c804f am cda2dafd: am 27fdbc60: Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev 
* commit 'cda2dafd36641130fc41888d81c98cd2d54047b8':
  Ensure calling mutate() on DrawableContainer creates a new state
 2014-11-25 18:44:25 +00:00
Alan Viverette
11d33527e8 am 44c09f29: am 27fbf676: Merge "Update documentation for DatePicker to reflect the new mode" into lmp-mr1-dev 
* commit '44c09f2919d21296c0f020b954621c30d73eba20':
  Update documentation for DatePicker to reflect the new mode
 2014-11-25 18:44:20 +00:00
Tom Taylor
0b7a212f6a am bd3b0000: am 4cd3e47e: Merge "Issues with messaging apps on non-primary user account" into lmp-mr1-dev 
* commit 'bd3b00004c5aab43de0632994aa9a9d4e701ad5e':
  Issues with messaging apps on non-primary user account
 2014-11-25 18:43:56 +00:00
Ruben Brunk
7eb6e0e395 am c02cdf00: am 8791a1e8: Merge "Camera2: Ignore unsupported face detection results in LEGACY." into lmp-mr1-dev 
* commit 'c02cdf00e51b9a7ec7b9c74ba7eeb3711ec52213':
  Camera2: Ignore unsupported face detection results in LEGACY.
 2014-11-25 18:43:51 +00:00
Jeff Sharkey
bcf57d9d3a am f07a99f9: am 07aca15b: Merge "Better am error when SELinux blocking access." into lmp-mr1-dev 
* commit 'f07a99f9b92878e3570fe1715c701bc4c32d2ad9':
  Better am error when SELinux blocking access.
 2014-11-25 18:43:43 +00:00
RoboErik
351ab57e25 am a9031025: am d9bb296b: Merge "Delay calling onConnected until a session is set in MediaBrowser" into lmp-mr1-dev 
* commit 'a90310256476868d51811eb41c2c7f9b609dc0dc':
  Delay calling onConnected until a session is set in MediaBrowser
 2014-11-25 18:43:37 +00:00
Dianne Hackborn
d0f6b4f629 Merge "Start MountService before performBootDexOpt" into lmp-mr1-dev 2014-11-25 18:42:59 +00:00