Stephen Hines
91c5889347
am 3dd0908a: Merge "Add missing functions to math library." into honeycomb
...
* commit '3dd0908a65095cb6946001ae3039ab87a47b4f33':
Add missing functions to math library.
2011-01-24 16:16:35 -08:00
Stephen Hines
816914d103
Merge "Add missing functions to math library." into honeycomb
2011-01-24 16:14:43 -08:00
Jeff Brown
14f05ef174
am aaa55d3f: Merge "New orientation listener." into honeycomb
...
* commit 'aaa55d3f45744814907d0809befb49281ced462e':
New orientation listener.
2011-01-24 15:33:46 -08:00
Jeff Brown
b0355c5b0d
Merge "New orientation listener." into honeycomb
2011-01-24 15:31:22 -08:00
Svetoslav Ganov
ccf7a1174c
am 33322052: Merge "DatePicker is picking the wrong date" into honeycomb
...
* commit '33322052edd6c77b4378e69b66f746f241a80764':
DatePicker is picking the wrong date
2011-01-24 15:28:30 -08:00
Svetoslav Ganov
4465fa24c3
Merge "DatePicker is picking the wrong date" into honeycomb
2011-01-24 15:26:42 -08:00
Adam Powell
6aee302406
am 1914971c: Merge "Fix bug 3242393 - overscroll effect missing from lists which drag but are always visible" into honeycomb
...
* commit '1914971c6bdeac330846488fdd5c0bb4120d5624':
Fix bug 3242393 - overscroll effect missing from lists which drag but are always visible
2011-01-24 15:06:28 -08:00
Leon Scroggins
0a11bdf7b0
am 8801ad35: Merge "Disable focus controller when WebView loses focus." into honeycomb
...
* commit '8801ad35264b6780697fcdcfbac0e17c7ca2d771':
Disable focus controller when WebView loses focus.
2011-01-24 15:04:19 -08:00
Adam Powell
6314bea24b
Merge "Fix bug 3242393 - overscroll effect missing from lists which drag but are always visible" into honeycomb
2011-01-24 15:03:16 -08:00
Leon Scroggins
8362ee8894
Merge "Disable focus controller when WebView loses focus." into honeycomb
2011-01-24 15:02:10 -08:00
Gilles Debunne
b005b0f904
am 7c8c6d68: Typo in InputMethodManager\'s documentation
...
* commit '7c8c6d689280ecfbd151a2e0cb40341768470676':
Typo in InputMethodManager's documentation
2011-01-24 15:01:02 -08:00
Gilles Debunne
14bb8a58c5
am 88b5953a: Merge "NULL inputType text fields should never show the IME." into honeycomb
...
* commit '88b5953ab2f63ed6f820bb13845cf8fecb2d57e3':
NULL inputType text fields should never show the IME.
2011-01-24 14:48:28 -08:00
Gilles Debunne
caafe33dfe
am 705a27a9: Merge "Non-editable TextViews should not display a cursor." into honeycomb
...
* commit '705a27a97ccd8e363944083d948b7f5204916b85':
Non-editable TextViews should not display a cursor.
2011-01-24 14:48:21 -08:00
Gilles Debunne
8d24f48727
Merge "NULL inputType text fields should never show the IME." into honeycomb
2011-01-24 14:46:57 -08:00
Gilles Debunne
62bd287d7d
Merge "Non-editable TextViews should not display a cursor." into honeycomb
2011-01-24 14:46:42 -08:00
Adam Powell
cd3eea54ba
am c831e319: Merge "Fix bug 3382994 - android.view.WindowManager" into honeycomb
...
* commit 'c831e3192ccd9b2cf69ec7c973005e578631da3b':
Fix bug 3382994 - android.view.WindowManager$BadTokenException
2011-01-24 14:37:46 -08:00
Adam Powell
b2859765e8
Merge "Fix bug 3382994 - android.view.WindowManager$BadTokenException" into honeycomb
2011-01-24 14:35:11 -08:00
Dianne Hackborn
e3daf45cbb
am 6d92cde2: am 35f4d32d: Merge "frameworks/base: Track owner in appropriate owners list of Uri"
...
* commit '6d92cde287b6399d5c90f3eaccb73602d6d51313':
frameworks/base: Track owner in appropriate owners list of Uri
2011-01-24 14:34:46 -08:00
Jaikumar Ganesh
8c00b22fdd
am f6439749: (-s ours) am 1c9761e3: Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
...
* commit 'f643974954c47c95cd84c774db7f1e3997ee9c96':
Do Not Merge Connect other profiles when priority is auto connect.
2011-01-24 14:34:40 -08:00
John Reck
66304eadd8
am 3cc8a3a4: (-s ours) am 398a589c: Merge "DO NOT MERGE - Create db path if it doesn\'t exit" into gingerbread
...
* commit '3cc8a3a47ede49b8699c2a839626a44f2d57cd73':
DO NOT MERGE - Create db path if it doesn't exit
2011-01-24 14:34:30 -08:00
Jeff Hamilton
27f4479ef1
am 0c5e2b3f: am dc54a8c7: Merge "API changes for NFC." into gingerbread
...
* commit '0c5e2b3f1377b3b52c535a1f95899830f5de0347':
API changes for NFC.
2011-01-24 14:34:09 -08:00
Xavier Ducrohet
43bc28682d
am 5b9936f6: Merge "LayoutLib: Use special view cookie for include-merge case." into honeycomb
...
* commit '5b9936f651a06b4b3c988ee330d12355041eeb00':
LayoutLib: Use special view cookie for include-merge case.
2011-01-24 14:33:28 -08:00
Jeff Hamilton
7ffec41c72
Merge "Merge commit '446aea40' into manualmerge" into honeycomb-plus-aosp
2011-01-24 14:32:13 -08:00
Jeff Hamilton
ac655f8d12
Merge commit '446aea40' into manualmerge
...
Conflicts:
api/current.xml
Change-Id: Ic58c56929d8281eca2e801903d9ab98d03e7f975
2011-01-24 16:31:38 -06:00
Xavier Ducrohet
02c8c923c1
Merge "LayoutLib: Use special view cookie for include-merge case." into honeycomb
2011-01-24 14:31:28 -08:00
Adam Powell
9ba79184c3
am bffb0a25: Merge "Fix bug 3237638 - make it easy to change a "refresh" AB button/icon into the indeterminate progress icon" into honeycomb
...
* commit 'bffb0a2586751fc409e57cee5382cfd2ec6543de':
Fix bug 3237638 - make it easy to change a "refresh" AB button/icon into the indeterminate progress icon
2011-01-24 14:26:01 -08:00
Adam Powell
8ec254230e
Merge "Fix bug 3237638 - make it easy to change a "refresh" AB button/icon into the indeterminate progress icon" into honeycomb
2011-01-24 14:23:36 -08:00
Andreas Huber
9d86dd3d47
am bc5172fe: Merge "Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder" into honeycomb
...
* commit 'bc5172fe662104e2558b0841fcf82035398e5cac':
Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
2011-01-24 14:00:59 -08:00
Andreas Huber
f22700aad0
Merge "Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder" into honeycomb
2011-01-24 13:57:11 -08:00
Eric Fischer
3735bd182d
am f7358996: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'f7358996d38c3552344e225ce2f3455089be715c':
Import revised translations. DO NOT MERGE
2011-01-24 13:49:25 -08:00
Eric Fischer
fb2c634139
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-01-24 13:46:28 -08:00
Andreas Huber
523558ac43
am c45d3ad0: Merge "The .mkv parser lib leaves some tracks NULL if it doesn\'t support them." into honeycomb
...
* commit 'c45d3ad08469eb4c519a5aeef74f6d914e674144':
The .mkv parser lib leaves some tracks NULL if it doesn't support them.
2011-01-24 13:31:27 -08:00
Andreas Huber
622ed4bf67
Merge "The .mkv parser lib leaves some tracks NULL if it doesn't support them." into honeycomb
2011-01-24 13:29:58 -08:00
Huahui Wu
b3cb7d06bd
am 94b8b114: Merge "A few small cleanning-ups." into honeycomb
...
* commit '94b8b114ab9abf5ccad6b85deb08aac2a359915d':
A few small cleanning-ups.
2011-01-24 13:27:25 -08:00
Huahui Wu
ac74723924
Merge "A few small cleanning-ups." into honeycomb
2011-01-24 13:25:17 -08:00
Dianne Hackborn
64cc3a11e1
am 15efe4cb: am a8069f34: Merge "Fixes Keyboard availability in "Providing Resources" documentation page."
...
* commit '15efe4cb4c7d5bd19266ff740b1a3c8a703cd3a9':
Fixes Keyboard availability in "Providing Resources" documentation page.
2011-01-24 13:23:43 -08:00
Daniel Sandler
3dabff9c1f
am 1e25a23f: Merge "Vertically align SSID/PLMN on lockscreen." into honeycomb
...
* commit '1e25a23f9d5319267e48242b1dd655697da4a175':
Vertically align SSID/PLMN on lockscreen.
2011-01-24 13:16:38 -08:00
Daniel Sandler
fb85e51e1c
Merge "Vertically align SSID/PLMN on lockscreen." into honeycomb
2011-01-24 13:14:35 -08:00
Justin Ho
3c8e8a5ddd
am 7040e33c: Merge "Updated checkbox assets for legacy applications" into honeycomb
...
* commit '7040e33c183f431531bd68b23c6d69d31eb1a173':
Updated checkbox assets for legacy applications
2011-01-24 12:58:00 -08:00
Justin Ho
3050e3c0b8
Merge "Updated checkbox assets for legacy applications" into honeycomb
2011-01-24 12:55:29 -08:00
Andreas Huber
98173f3777
am da6f9295: Merge "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)" into honeycomb
...
* commit 'da6f9295840b0e74f61afa273ce2a767d8148af7':
Make AwesomePlayer's reset process more verbose to track down ANRs (again)
2011-01-24 11:16:57 -08:00
Santosh Madhava
b93984ee1c
am 36486912: Merge "Resubmit of \'Fix for isssue 3369932 : stopPreview returns 0\'" into honeycomb
...
* commit '36486912595525a3ec4f0027deeb91d318ec4d9d':
Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'
2011-01-24 11:16:54 -08:00
Joe Onorato
80e42d3d2c
am da34e13b: Merge "Remove unwanted parameter (it was a typo)." into honeycomb
...
* commit 'da34e13bb4ef97832c43489937a26d314437a1d7':
Remove unwanted parameter (it was a typo).
2011-01-24 11:16:43 -08:00
Chet Haase
e3b937ea70
am 67005b05: Merge "Use optimized display lists for all hwaccelerated rendering" into honeycomb
...
* commit '67005b05cc76a38a5b3bf6e83957dd03619e9126':
Use optimized display lists for all hwaccelerated rendering
2011-01-24 11:15:51 -08:00
Daniel Sandler
da0c9d8198
am 78b32fc4: Merge "Smoothly hide the list when there are no notifications." into honeycomb
...
* commit '78b32fc4517f8fef8a73f9b31c9baa2e530ef8bc':
Smoothly hide the list when there are no notifications.
2011-01-24 11:15:42 -08:00
Gilles Debunne
d5c55fb8db
am 7108724d: Merge "New fix for popup behavior in AutoCompleteTextViews." into honeycomb
...
* commit '7108724d4b6a1c2862154cd52ed4fb1e5f001186':
New fix for popup behavior in AutoCompleteTextViews.
2011-01-24 11:15:38 -08:00
satok
3e57487a7b
am 57ffc002: Add a way that subtype will be excluded from a last input method
...
* commit '57ffc00239edcfe733832771e1429fca20182207':
Add a way that subtype will be excluded from a last input method
2011-01-24 11:15:20 -08:00
Andreas Huber
071e5d38da
Merge "Make AwesomePlayer's reset process more verbose to track down ANRs (again)" into honeycomb
2011-01-24 10:45:59 -08:00
Santosh Madhava
f71c66d2b4
Merge "Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'" into honeycomb
2011-01-24 10:45:36 -08:00
Joe Onorato
946566e14b
Merge "Remove unwanted parameter (it was a typo)." into honeycomb
2011-01-24 10:43:55 -08:00