Commit Graph

35 Commits

Author SHA1 Message Date
Android (Google) Code Review
c20e4ebef2 am b61ae351: Merge change 2747 into donut
Merge commit 'b61ae351256518add7bcb40e0bf18337dd87195c'

* commit 'b61ae351256518add7bcb40e0bf18337dd87195c':
  log the geomerty of surfaces causing an out of memory in SurfaceFlinger.
2009-05-29 14:57:33 -07:00
Mathias Agopian
3c4d8c83da log the geomerty of surfaces causing an out of memory in SurfaceFlinger. 2009-05-29 14:55:06 -07:00
Android (Google) Code Review
bdbf6b094d am 69a6c3eb: Merge change 2292 into donut
Merge commit '69a6c3ebd46a8de0e896747757f364322c12608d'

* commit '69a6c3ebd46a8de0e896747757f364322c12608d':
  split boot animation out of SurfaceFlinger
2009-05-21 19:36:53 -07:00
Mathias Agopian
a1ecca920e split boot animation out of SurfaceFlinger
Conflicts:

	data/etc/platform.xml
2009-05-21 19:21:59 -07:00
Mathias Agopian
c5b2c0bf80 move libbinder's header files under includes/binder 2009-05-20 12:55:03 -07:00
Mathias Agopian
208059f67e checkpoint: split libutils into libutils + libbinder 2009-05-20 12:55:02 -07:00
Android (Google) Code Review
3f54b2ae7e am 0124a15: Merge change 626 into donut
Merge commit '0124a150157d69a9f0ea109be2390afb5399b8a7'

* commit '0124a150157d69a9f0ea109be2390afb5399b8a7':
  fix 1803886 android15 Translucent GLSurfaceView demo does not display properly
2009-04-29 13:35:37 -07:00
Mathias Agopian
2b42fa7fdd fix 1803886 android15 Translucent GLSurfaceView demo does not display properly 2009-04-27 18:50:06 -07:00
Mathias Agopian
816c5e2314 AI 143172: am: CL 142875 [1732012] for some reason these files didn't go through in the preview check-in.
Original author: mathias
  Merged from: //branches/cupcake/...

Automated import of CL 143172
2009-03-27 16:13:24 -07:00
Mathias Agopian
24fd77d440 AI 143171: am: CL 142873 fix [1732012] Only show screen rotation animation when triggered by sensor
Original author: mathias
  Merged from: //branches/cupcake/...

Automated import of CL 143171
2009-03-27 16:10:37 -07:00
The Android Open Source Project
06ee417bc5 Merge commit 'korg/cupcake'
Conflicts:
	core/java/android/webkit/WebView.java
	core/java/android/widget/TwoLineListItem.java
	preloaded-classes
2009-03-27 15:38:40 -07:00
Mathias Agopian
ecbeaa0cf1 AI 143160: am: CL 142856 new-new-new-new rotation animation. it may still change one more time.
Original author: mathias
  Merged from: //branches/cupcake/...

Automated import of CL 143160
2009-03-27 15:36:09 -07:00
Mathias Agopian
192f79fe71 Automated import from //branches/cupcake/...@142875,142875 2009-03-25 23:26:39 -07:00
Mathias Agopian
ceff6e1874 Automated import from //branches/cupcake/...@142873,142873 2009-03-25 23:18:56 -07:00
Mathias Agopian
262453cecb Automated import from //branches/cupcake/...@142856,142856 2009-03-25 21:42:35 -07:00
Mathias Agopian
74c770be33 Automated import from //branches/donutburger/...@142446,142446 2009-03-24 22:43:22 -07:00
Mathias Agopian
6219dd7d3a Automated import from //branches/donutburger/...@142430,142430 2009-03-24 22:42:15 -07:00
Mathias Agopian
3df5e433a2 Automated import from //branches/donutburger/...@141502,141502 2009-03-24 20:25:29 -07:00
Mathias Agopian
0348218e93 Automated import from //branches/cupcake/...@142445,142445 2009-03-24 19:43:24 -07:00
Mathias Agopian
2ed5f739eb Automated import from //branches/cupcake/...@142427,142427 2009-03-24 19:41:37 -07:00
Mathias Agopian
38c89491e4 Automated import from //branches/donutburger/...@140807,140807 2009-03-24 18:34:22 -07:00
The Android Open Source Project
0c2bcbc6cc auto import from //branches/cupcake_rel/...@141571 2009-03-19 23:08:54 -07:00
Jean-Baptiste Queru
732ca39b70 Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
	core/java/android/view/animation/TranslateAnimation.java
	core/jni/Android.mk
	core/res/res/values-en-rGB/strings.xml
	libs/audioflinger/AudioFlinger.cpp
	libs/surfaceflinger/LayerScreenshot.cpp
	packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
2009-03-18 11:33:14 -07:00
The Android Open Source Project
bcef13b666 auto import from //branches/cupcake/...@137873 2009-03-11 12:11:56 -07:00
The Android Open Source Project
edbf3b6af7 auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
The Android Open Source Project
d5193d9394 auto import from //depot/cupcake/@135843 2009-03-03 18:28:45 -08:00
Adrian Taylor
f18936cbf4 Fixing LayerScreenshot bitmap config value. 2009-03-02 12:11:47 -08:00
The Android Open Source Project
ac65e0b172 auto import from //branches/cupcake/...@131421 2009-02-13 12:57:50 -08:00
The Android Open Source Project
a6938bab1f auto import from //branches/cupcake/...@130745 2009-02-10 15:44:00 -08:00
Jean-Baptiste Queru
a837ba778f Add missing <limits.h> include
This should fix the build for gcc 4.3.2
2009-01-26 12:11:20 -08:00
The Android Open Source Project
5f78a48bb8 auto import from //branches/cupcake/...@127101 2009-01-20 14:03:58 -08:00
The Android Open Source Project
8a7a67538a auto import from //branches/cupcake/...@126645 2009-01-15 16:12:10 -08:00
The Android Open Source Project
276293246e auto import from //branches/cupcake/...@125939 2009-01-09 17:51:23 -08:00
The Android Open Source Project
e09fd9e819 Code drop from //branches/cupcake/...@124589 2008-12-17 18:05:43 -08:00
The Android Open Source Project
7c1b96a165 Initial Contribution 2008-10-21 07:00:00 -07:00