Mathias Agopian
2f1fb40720
am 4f22f981: am 84d36f0a: Merge "egl: fix GetProcAddress for EGLimage extensions" into honeycomb
...
* commit '4f22f981fd2b172487ccc35e83fe604569c5430d':
egl: fix GetProcAddress for EGLimage extensions
2011-01-16 23:07:39 -08:00
Mathias Agopian
5b0cf9d01a
am 82fcc216: am f90633a0: Merge "egl: expose EGLimage extensions" into honeycomb
...
* commit '82fcc21683e7590df05a6455e301ffed35163133':
egl: expose EGLimage extensions
2011-01-16 23:07:22 -08:00
Jim Miller
9e8d9b6cd9
am a55c1280: am 057d9f16: Merge "Fix 3342063: Correctly update StatusView when battery changes." into honeycomb
...
* commit 'a55c1280f9b674619368ee61e4fe6b8db64eb2ce':
Fix 3342063 : Correctly update StatusView when battery changes.
2011-01-16 23:06:59 -08:00
Jason Sams
f32424315d
am 58d10708: am 7f13a850: Merge "Add some error checking." into honeycomb
...
* commit '58d1070861237cf8f931808cc143c3da090da056':
Add some error checking.
2011-01-16 23:06:50 -08:00
Adam Cohen
432589b046
am dc0b8323: am 50204584: Fixing StackView bug (Issue: 3321912)
...
* commit 'dc0b8323d4fbe9c41de674ef8b18dd4efab67846':
Fixing StackView bug (Issue: 3321912 )
2011-01-16 23:06:36 -08:00
Jeff Brown
7b86464181
am 01f4a588: am 2d1072ed: Merge "Flush Binder commands in ndk looper." into honeycomb
...
* commit '01f4a588eaf793392bd30ac48a10fe99ab14cbbc':
Flush Binder commands in ndk looper.
2011-01-16 23:06:29 -08:00
Patrick Dubroy
a409951f91
am c0147531: am e7218240: Merge "Add a method for clearing all animations on a thread." into honeycomb
...
* commit 'c01475318e0618219e9e56f274b38f6d3b76a9b1':
Add a method for clearing all animations on a thread.
2011-01-16 23:06:11 -08:00
Adam Powell
0acd32fddf
am 4b8bb8b0: am 70359ce2: Merge "Fix bug 3050138 - Action bar does not display correctly when many action items are added" into honeycomb
...
* commit '4b8bb8b01aa9c2eb2b94318009d6e84387ee0b01':
Fix bug 3050138 - Action bar does not display correctly when many action items are added
2011-01-16 23:06:04 -08:00
Mathias Agopian
109023a90d
am d13ff8de: am 8a852406: Merge "Add logs when taking a screenshot to help tracking issue 3361121" into honeycomb
...
* commit 'd13ff8de1af1a2a022c74a4fb9f801f1cb77f262':
Add logs when taking a screenshot to help tracking issue 3361121
2011-01-16 23:05:55 -08:00
Adam Cohen
efc47c52cf
am 760534a6: am 67e8915c: Merge "Fixing StackView bugs:" into honeycomb
...
* commit '760534a68aebc761bd12a9cccf76135cb3e5ce3d':
Fixing StackView bugs:
2011-01-16 23:05:39 -08:00
Joe Onorato
8f769f8a80
am 85e700ca: am 08a555ba: Merge "Remove a bunch of logging." into honeycomb
...
* commit '85e700ca2e89d1174a591e99e5f16eaf46509c9c':
Remove a bunch of logging.
2011-01-16 23:05:29 -08:00
Kenny Root
a9d5188cc6
am d259468f: am fc28f412: Merge "Put externalSize measurements in PackageStats" into honeycomb
...
* commit 'd259468fe92b9714b45a134e781ce09681e70217':
Put externalSize measurements in PackageStats
2011-01-16 23:05:15 -08:00
Jeff Brown
90ba0c070c
am 04970d65: am 3392b8e2: am 4a2e478a: Merge "Flush Binder commands in ndk looper." into gingerbread
...
* commit '04970d654d96404cff60f774c1b7a02da03c75fd':
Flush Binder commands in ndk looper.
2011-01-16 23:05:06 -08:00
Jim Miller
a3006a46d0
am 3530ebe4: resolved conflicts for merge of 578e73da to honeycomb-plus-aosp
...
* commit '3530ebe451fea39b159baa9b8c9f9cd851de42a3':
Fix 3106227: use WeakReferences for receivers in DigitalClock class
2011-01-16 23:04:55 -08:00
Jason Sams
b32585a5ff
am 4e7a9fea: am 981df1d9: Merge "unhide functions used by reflected files for SDK." into honeycomb
...
* commit '4e7a9feae2c40d40a76eaaa8fcbd5a647bea86ba':
unhide functions used by reflected files for SDK.
2011-01-16 23:04:25 -08:00
Jim Miller
4169700edd
am 76e75335: am 1f6e37ef: Merge "Fix 3355957: Don\'t hide the keyboard for PIN/Password" into honeycomb
...
* commit '76e75335648f1c0c695701a94499bfd4625eba5d':
Fix 3355957: Don't hide the keyboard for PIN/Password
2011-01-16 23:04:09 -08:00
Irfan Sheriff
5f261ddb3f
am 4ef32660: am 6374d7e2: Merge "Report WPS overlap error" into honeycomb
...
* commit '4ef326602a0cafc5f837891905671abd51732b82':
Report WPS overlap error
2011-01-16 23:03:57 -08:00
Shih-wei Liao
f3c209756f
am f98f2b6b: am 077fd5f6: Merge "Fix bug in on-device linking." into honeycomb
...
* commit 'f98f2b6bc6078c63d2e988492d4eb870dd15abfd':
Fix bug in on-device linking.
2011-01-16 23:03:39 -08:00
Jim Miller
93940bf835
am 04745768: am 717143ca: Fix 3339260: Remove emergency button from AccountUnlock screen
...
* commit '04745768f78f1930fa72e1ae435a48fb0c4d1637':
Fix 3339260: Remove emergency button from AccountUnlock screen
2011-01-16 23:03:28 -08:00
Romain Guy
b48e32803f
am aa00dd65: am 94677083: Merge "Fix 9patch rendering in ExpandableListView." into honeycomb
...
* commit 'aa00dd650ca1d9b9499bdb9bcdc7182b35fce0f0':
Fix 9patch rendering in ExpandableListView.
2011-01-16 23:03:11 -08:00
Patrick Dubroy
b1769b5d6c
am 8a0efde5: am 6e72ff90: Merge "Fix latent bug with reinitializing an ObjectAnimator." into honeycomb
...
* commit '8a0efde52a79e93809597736dc0de22a138d884c':
Fix latent bug with reinitializing an ObjectAnimator.
2011-01-16 23:02:48 -08:00
Jason Sams
6d72af6ab2
am ae566d93: am d7398953: Merge "Implement sub updates for mipmap levels and cubmaps." into honeycomb
...
* commit 'ae566d937d2f1dbfcca27077f04df049078f72e9':
Implement sub updates for mipmap levels and cubmaps.
2011-01-16 23:02:31 -08:00
Joe Onorato
150c51d013
am bda28700: am c45389fd: Merge "fix the build... sorry... bad docs..." into honeycomb
...
* commit 'bda28700e3b61fbb18d24f62886bc366f444a54a':
fix the build... sorry... bad docs...
2011-01-16 23:02:15 -08:00
Jeff Brown
21e4fa5539
am 7d5f9095: am 85562dde: Merge "Fix keyboard hidden states." into honeycomb
...
* commit '7d5f9095a6feb40aa0c87d5671050df7c24609ef':
Fix keyboard hidden states.
2011-01-16 23:02:00 -08:00
Patrick Dubroy
dd5abe2b2d
am 6943e5e8: am 149da0d4: Merge "Fix animation bugs caused by weak reference" into honeycomb
...
* commit '6943e5e8aefee2e89f76dcf989123e2139ca20be':
Fix animation bugs caused by weak reference
2011-01-16 23:01:49 -08:00
Dianne Hackborn
f2d4c9ec33
am 8a3a5320: am bdacefba: Merge "Change FLAG_FORWARD_LOCK back to its original value to not break things." into honeycomb
...
* commit '8a3a5320e616b79a227e5e1e4bc22b0b909925e1':
Change FLAG_FORWARD_LOCK back to its original value to not break things.
2011-01-16 23:01:38 -08:00
Joe Onorato
5ab6e0228e
am bbfeb526: am 9b120ead: Merge "Make the notification settings view less janky." into honeycomb
...
* commit 'bbfeb526138d730222c31c9761167ef825fe3951':
Make the notification settings view less janky.
2011-01-16 23:01:15 -08:00
Joe Onorato
3ce6e50ece
am 4e0a956c: am 1ddf75a3: Merge "Change the default of how AsyncTask enqueues." into honeycomb
...
* commit '4e0a956c5a681bbd97b6718132f909affecf390c':
Change the default of how AsyncTask enqueues.
2011-01-16 23:00:59 -08:00
Romain Guy
8675b3f79d
am 761ae69b: am 3c372789: Merge "Don\'t dispatchDetachedFromWindow() if the View was not attached." into honeycomb
...
* commit '761ae69b7cb5639a5f468f258848578a6c8feb72':
Don't dispatchDetachedFromWindow() if the View was not attached.
2011-01-16 23:00:35 -08:00
Irfan Sheriff
3e1dc1c482
am a81851f0: am b2c1a5c3: Merge "Fix WPS to provides immediate feedback" into honeycomb
...
* commit 'a81851f0743d5c0bf620c72a18b7fdfc42bb7f28':
Fix WPS to provides immediate feedback
2011-01-16 23:00:15 -08:00
Romain Guy
634be78d38
am 222a2f1d: am 749b9dba: Merge "Don\'t blend transparent pixels when rendering layers." into honeycomb
...
* commit '222a2f1de1bb069b26eccc06e00d1793c2773a8e':
Don't blend transparent pixels when rendering layers.
2011-01-16 23:00:00 -08:00
Dianne Hackborn
3b403694be
am 64e30643: am c237bb27: Merge "Add manifest API to request a large heap." into honeycomb
...
* commit '64e306430570fcfb35a1b14e1b333ad114b23829':
Add manifest API to request a large heap.
2011-01-16 22:59:39 -08:00
Chet Haase
ac4e2cbbb1
am 15401dc2: am 598913a6: Merge "Remove obsolete DoubleEvaluator" into honeycomb
...
* commit '15401dc2c22d53bdecd7441370630b95fad8691c':
Remove obsolete DoubleEvaluator
2011-01-16 22:59:06 -08:00
Amith Yamasani
e5094700cf
am fac8e262: am fe75749c: Merge "Fix position and size of searchfield and buttons." into honeycomb
...
* commit 'fac8e262a16c36d7467afd59b1029024a1afb2aa':
Fix position and size of searchfield and buttons.
2011-01-16 22:58:19 -08:00
Joe Onorato
1c721a1658
am 0ffce152: am 772f5600: Need to save the brigness setting.
...
* commit '0ffce152096aca858dc6b440f90c7c607fd3fbae':
Need to save the brigness setting.
2011-01-16 22:58:02 -08:00
Joe Onorato
827b2851d7
am f3c739ca: am a032c901: Provide a public resource with the dimensions of the large notification icon.
...
* commit 'f3c739cae41ee8c113e8d2d95db065bb8fe5c188':
Provide a public resource with the dimensions of the large notification icon.
2011-01-16 22:57:39 -08:00
Mathias Agopian
4f22f981fd
am 84d36f0a: Merge "egl: fix GetProcAddress for EGLimage extensions" into honeycomb
...
* commit '84d36f0a382d79f00fdd896f955a579bf9e160d9':
egl: fix GetProcAddress for EGLimage extensions
2011-01-16 18:15:29 -08:00
Mathias Agopian
84d36f0a38
Merge "egl: fix GetProcAddress for EGLimage extensions" into honeycomb
2011-01-16 18:13:19 -08:00
Michael I. Gold
f4a43837f9
egl: fix GetProcAddress for EGLimage extensions
...
Return wrappers from GetProcAddress for glEGLImageTargetTexture2DOES
and glEGLImageTargetRenderbufferStorageOES which unwrap the EGLimage
handle before calling through to the implementation.
Change-Id: I2f5b180ab3ccdb28a4f510a2bd8c2eee941a84df
2011-01-16 18:12:04 -08:00
Mathias Agopian
82fcc21683
am f90633a0: Merge "egl: expose EGLimage extensions" into honeycomb
...
* commit 'f90633a07edf2ed058c054ec4cb82d7d1b3a8666':
egl: expose EGLimage extensions
2011-01-16 18:05:32 -08:00
Mathias Agopian
f90633a07e
Merge "egl: expose EGLimage extensions" into honeycomb
2011-01-16 18:03:55 -08:00
Michael I. Gold
3ece010a4b
egl: expose EGLimage extensions
...
Add EGL_KHR_gl_texture_cubemap_image and EGL_KHR_gl_renderbuffer_image
to the static EGL extension string since these require no new APIs
beyond what is already required.
Change-Id: I2d1fde86b19bb9eee46b3b977f51784a17cfcc3c
2011-01-16 18:02:52 -08:00
Jim Miller
a55c1280f9
am 057d9f16: Merge "Fix 3342063: Correctly update StatusView when battery changes." into honeycomb
...
* commit '057d9f16f793c3796751913ad2eeb12582a7626b':
Fix 3342063 : Correctly update StatusView when battery changes.
2011-01-16 17:52:39 -08:00
Jim Miller
057d9f16f7
Merge "Fix 3342063: Correctly update StatusView when battery changes." into honeycomb
2011-01-16 17:51:04 -08:00
Jason Sams
58d1070861
am 7f13a850: Merge "Add some error checking." into honeycomb
...
* commit '7f13a850ddb420015d953492b093c762a4ec3050':
Add some error checking.
2011-01-16 17:48:41 -08:00
Jason Sams
7f13a850dd
Merge "Add some error checking." into honeycomb
2011-01-16 17:46:16 -08:00
Jim Miller
fc5001a592
Fix 3342063: Correctly update StatusView when battery changes.
...
LockScreen wasn't correctly updating StatusView when the battery
status changed. In addition, the messages aren't supposed to
"pop" when changed, so changed visibility state from GONE to INVISIBLE
when not in use.
Change-Id: Icacbf7e2275c77a28e7e0a9d1247abdbebadcd4f
2011-01-16 17:45:46 -08:00
Adam Cohen
dc0b8323d4
am 50204584: Fixing StackView bug (Issue: 3321912)
...
* commit '502045849f760f018f662d752020aef32d4cecd9':
Fixing StackView bug (Issue: 3321912 )
2011-01-16 17:41:38 -08:00
Jeff Brown
01f4a588ea
am 2d1072ed: Merge "Flush Binder commands in ndk looper." into honeycomb
...
* commit '2d1072ed7e5a263e7ddf4923d46538fbb25caf4f':
Flush Binder commands in ndk looper.
2011-01-16 17:39:33 -08:00
Adam Cohen
502045849f
Fixing StackView bug (Issue: 3321912)
...
Change-Id: I3a0e898e53a44146f1970479573880609f545799
2011-01-16 17:38:03 -08:00