Jamie Gennis
d7a3ebe031
am ecb4b3f0: Merge "Pass the IGraphicBufferAlloc to SurfaceTextureClient." into honeycomb
...
* commit 'ecb4b3f02340e21eefabbea78559e85ec7ee0089':
Pass the IGraphicBufferAlloc to SurfaceTextureClient.
2011-02-02 15:56:20 -08:00
Jamie Gennis
1472b3a885
Merge "Pass the IGraphicBufferAlloc to SurfaceTextureClient." into honeycomb
2011-02-02 15:53:33 -08:00
Wink Saville
e733ccfe20
am d31fed90: Merge "Have SmsMessage use getCurrentPhoneType" into honeycomb
...
* commit 'd31fed90f8fdf854cade08af94918066af921d74':
Have SmsMessage use getCurrentPhoneType
2011-02-02 15:52:51 -08:00
Xavier Ducrohet
e4e7344403
am a4747d53: Merge "Make TimePicker/DatePicker/CalendarView render in Eclipse." into honeycomb
...
* commit 'a4747d536e905c3c34ab0d3c1c9c7485d6fac689':
Make TimePicker/DatePicker/CalendarView render in Eclipse.
2011-02-02 15:52:18 -08:00
Dharmaray Kundargi
3a087d1b3e
am 54b0a7f3: Merge "Fix issue 3412777 ANR on adding effects." into honeycomb
...
* commit '54b0a7f3ff0411a215e7e23f1041d414a32147b5':
Fix issue 3412777 ANR on adding effects.
2011-02-02 15:52:05 -08:00
Leon Scroggins
67cc2ff154
am 8257e4d7: Merge "DO NOT MERGE. Only scroll if the IME is open in certain cases." into honeycomb
...
* commit '8257e4d7e2b1ac9b8310a326cf8f4b53aba760ec':
DO NOT MERGE. Only scroll if the IME is open in certain cases.
2011-02-02 15:52:00 -08:00
Jamie Gennis
1b20cde313
Pass the IGraphicBufferAlloc to SurfaceTextureClient.
...
This change passes a reference to the IGraphicBufferAlloc binder object
to SurfaceTextureClient objects. When STC objects are created they
query their associated ISurfaceTexture object for the
IGraphicBufferAlloc that the SurfaceTexture uses to allocate buffers.
Having the SurfaceTextureClient hold this reference prevents the
GraphicBufferAlloc in SurfaceFlinger from freeing the allocated buffers
before the SurfaceTextureClient is done with them.
Change-Id: Ib8e30e8b37fdd60438cbb4cb7e9174d0ba6d661c
related-bug: 3362519
2011-02-02 15:31:47 -08:00
Wink Saville
29e384d850
Merge "Have SmsMessage use getCurrentPhoneType" into honeycomb
2011-02-02 15:06:58 -08:00
Xavier Ducrohet
13b0abe05b
Merge "Make TimePicker/DatePicker/CalendarView render in Eclipse." into honeycomb
2011-02-02 14:15:39 -08:00
Robert Ly
92f7e3e32d
resolved conflicts for merge of f8cc65c4 to honeycomb-plus-aosp
...
Change-Id: I407df4448a126a39128f3e24232c166be2625e14
2011-02-02 14:04:20 -08:00
Dharmaray Kundargi
4e444e8e9a
Merge "Fix issue 3412777 ANR on adding effects." into honeycomb
2011-02-02 13:56:49 -08:00
Leon Scroggins
497b7b8ab8
Merge "DO NOT MERGE. Only scroll if the IME is open in certain cases." into honeycomb
2011-02-02 13:41:19 -08:00
Robert Ly
3192a752d2
Merge "Doc change: fixing broken links/images" into honeycomb
2011-02-02 13:36:47 -08:00
Jim Miller
8c4b273fb6
am 22d23eb5: Merge "Fix 3410155: Remove hint text from password entry field." into honeycomb
...
* commit '22d23eb5d1093a6525621db211b2f4ac4983c6ba':
Fix 3410155: Remove hint text from password entry field.
2011-02-02 13:19:57 -08:00
Dianne Hackborn
63f6d9cb58
am 0035b5ca: Merge "Fix issue #3415137 : New wallpaper size breaks thumbnails." into honeycomb
...
* commit '0035b5cad16c0565102105f5cd0222073b0ddf94':
Fix issue #3415137 : New wallpaper size breaks thumbnails.
2011-02-02 13:19:44 -08:00
Robert Greenwalt
855556a0d0
am 2c507b92: Merge "Use a cached context when possible." into honeycomb
...
* commit '2c507b92c242951e4fb2e807431c10d73e4bf778':
Use a cached context when possible.
2011-02-02 13:19:15 -08:00
Dharmaray Kundargi
b777002598
am 261ddb81: Merge "Fix issue 3408285 Crash while generating KenBurns" into honeycomb
...
* commit '261ddb81206a502a4fd4c9fe1cdc0d931c0e6db1':
Fix issue 3408285 Crash while generating KenBurns
2011-02-02 13:19:11 -08:00
Carl Shapiro
e00ad3451b
am 09128b23: Merge "Fix the naming of the heap growth limit property." into honeycomb
...
* commit '09128b23292e48d01518d6569dfb2cb88ed6e6d5':
Fix the naming of the heap growth limit property.
2011-02-02 13:18:30 -08:00
Jim Miller
3933318c96
Merge "Fix 3410155: Remove hint text from password entry field." into honeycomb
2011-02-02 12:41:07 -08:00
Dianne Hackborn
73de0b7cbc
Merge "Fix issue #3415137 : New wallpaper size breaks thumbnails." into honeycomb
2011-02-02 12:29:47 -08:00
Robert Greenwalt
bf0e823d9d
Merge "Use a cached context when possible." into honeycomb
2011-02-02 11:26:34 -08:00
Dharmaray Kundargi
e283e6c442
Merge "Fix issue 3408285 Crash while generating KenBurns" into honeycomb
2011-02-02 11:14:33 -08:00
Carl Shapiro
9d1502e10b
Merge "Fix the naming of the heap growth limit property." into honeycomb
2011-02-02 10:55:28 -08:00
Jean-Baptiste Queru
73bc75fa20
am f6b2beaa: am 05059b5b: am 8226140c: Merge from gingerbread
...
* commit 'f6b2beaabda6607b1c60dccaff038e9b59733821':
2011-02-02 10:00:00 -08:00
Jean-Baptiste Queru
09a107d3d0
am 05059b5b: am 8226140c: Merge from gingerbread
...
* commit '05059b5b35ade5957b8dfbb21b09e318a94232ed':
2011-02-02 09:56:30 -08:00
Jean-Baptiste Queru
3c47c34dee
am 8226140c: Merge from gingerbread
...
* commit '8226140ccadbc8e0bdd093f8bab0a5292b9224e3':
fix for supporting 3 digits MNC code
2011-02-02 09:52:24 -08:00
Jean-Baptiste Queru
ab7a740bd0
am 61b06be2: am 155b0ee0: Merge from open-source gingerbread
...
* commit '61b06be285ef03381b1d788996650863a1606b36':
fix for supporting 3 digits MNC code
2011-02-02 09:51:38 -08:00
Jean-Baptiste Queru
9aace938ce
am 155b0ee0: Merge from open-source gingerbread
...
* commit '155b0ee0498cf863091f3f83a752eaaedf1257f8':
fix for supporting 3 digits MNC code
2011-02-02 09:48:52 -08:00
Jean-Baptiste Queru
12801c78e9
Merge from gingerbread
...
Change-Id: Ifb3d42aa0f3772ca545f739df347eeb0ca7f58dd
2011-02-02 09:47:43 -08:00
Jean-Baptiste Queru
907b884345
Merge from open-source gingerbread
...
Change-Id: Iec6167bec8423e39dde053f23969c1c76e10a461
2011-02-02 09:45:32 -08:00
Jean-Baptiste Queru
5e06b988ab
Merge "fix for supporting 3 digits MNC code" into gingerbread
2011-02-02 09:44:16 -08:00
Nemmara Venkateswaran
d4c51b7646
am 47b8c96b: Merge "Fix for issue 3370023 : Wrong aspect ratio in overlay" into honeycomb
...
* commit '47b8c96b253ab24d0df089c87ce0798d4981400a':
Fix for issue 3370023 : Wrong aspect ratio in overlay
2011-02-02 09:29:13 -08:00
Nemmara Venkateswaran
6ae3af29e9
Merge "Fix for issue 3370023 : Wrong aspect ratio in overlay" into honeycomb
2011-02-02 09:27:10 -08:00
Justin Ho
fe18132893
am c2e16dc6: Merge "Removing red cross from hdpi emergency symbol" into honeycomb
...
* commit 'c2e16dc6da4f0727e79f61b0b1d85116a7840f28':
Removing red cross from hdpi emergency symbol
2011-02-02 08:36:39 -08:00
Justin Ho
bc2cf787b3
Merge "Removing red cross from hdpi emergency symbol" into honeycomb
2011-02-02 08:33:45 -08:00
Eric Laurent
ef81f53410
am 0990484c: am 3d4069a2: Allow TTY mode for GSM Phones
...
* commit '0990484c3ef96c6f0553374675b76fed54b5b164':
Allow TTY mode for GSM Phones
2011-02-02 08:30:57 -08:00
Eric Laurent
8f1c3ec16c
am 3d4069a2: Allow TTY mode for GSM Phones
...
* commit '3d4069a2e0c1c23244ead88a177ec06a2ef7a7d1':
Allow TTY mode for GSM Phones
2011-02-02 08:28:25 -08:00
Justin Ho
25164b3908
am 3d5b80cb: Merge "Low battery notification sound update, alarm sound update" into honeycomb
...
* commit '3d5b80cb18e904b2d97414c43276ca568af27f1c':
Low battery notification sound update, alarm sound update
2011-02-02 08:13:55 -08:00
Justin Ho
fed16e4034
Merge "Low battery notification sound update, alarm sound update" into honeycomb
2011-02-02 08:08:15 -08:00
Romain Guy
c45fe83461
am c1f8bcff: Merge "Fix incorrect dirty rectangle transformation in hardware layers. Bug #3413433 " into honeycomb
...
* commit 'c1f8bcffb8612ef5bdddc4bca6eca23804cbe453':
Fix incorrect dirty rectangle transformation in hardware layers. Bug #3413433
2011-02-02 00:49:31 -08:00
Romain Guy
a3607b3aee
Merge "Fix incorrect dirty rectangle transformation in hardware layers. Bug #3413433 " into honeycomb
2011-02-02 00:47:21 -08:00
Romain Guy
79e33a42f4
am d51eaa64: Merge "Update layers based on the dirty region. Bug #3413433 " into honeycomb
...
* commit 'd51eaa64e3f2d9684b2dd18ebd67734f4e0e7801':
Update layers based on the dirty region. Bug #3413433
2011-02-01 23:07:54 -08:00
Romain Guy
0a9ddf6621
Merge "Update layers based on the dirty region. Bug #3413433 " into honeycomb
2011-02-01 23:05:35 -08:00
Romain Guy
c7d8d78df2
am 518813ec: Merge "New API to let apps draw without layers. Bug #3413433 " into honeycomb
...
* commit '518813ec13153c7b02fb417720f353330e5d946e':
New API to let apps draw without layers. Bug #3413433
2011-02-01 22:04:31 -08:00
Romain Guy
ded982e811
Merge "New API to let apps draw without layers. Bug #3413433 " into honeycomb
2011-02-01 22:02:00 -08:00
Wink Saville
223f2134bd
am 1bf518d8: Merge "Add TelephonyManager.getCurrentPhoneType" into honeycomb
...
* commit '1bf518d8b333768e26bacf340f88f7d4ba8b9a91':
Add TelephonyManager.getCurrentPhoneType
2011-02-01 21:03:58 -08:00
Wink Saville
a4266a4aa7
Merge "Add TelephonyManager.getCurrentPhoneType" into honeycomb
2011-02-01 21:02:10 -08:00
Michael Jurka
ba685bb83d
am 46ab5e13: Merge "add missing call to superclass method" into honeycomb
...
* commit '46ab5e13f27324d634ff27b7fd75c5d432b915bf':
add missing call to superclass method
2011-02-01 20:55:15 -08:00
Michael Jurka
e46736395a
Merge "add missing call to superclass method" into honeycomb
2011-02-01 20:53:13 -08:00
Dharmaray Kundargi
3118b5a110
am c08f85a6: Fix issue 3414805 Crash during Overlay editing. JNI fixes.
...
* commit 'c08f85a6484ee5da7062a5eac0f19912bd7e2513':
Fix issue 3414805 Crash during Overlay editing. JNI fixes.
2011-02-01 20:42:32 -08:00