Andy Stadler
2a9deb0d40
am 315fae20: Merge "Throw Base64DataException instead of IOException" into honeycomb
...
* commit '315fae2028d4ef73c9ba094a71152e6e853e2690':
Throw Base64DataException instead of IOException
2011-01-24 17:46:33 -08:00
Andy Stadler
315fae2028
Merge "Throw Base64DataException instead of IOException" into honeycomb
2011-01-24 17:43:30 -08:00
Jason Sams
45a8835203
am a4967fac: Merge "Cleanup script init to fix bogus log printing and reduce memory churn." into honeycomb
...
* commit 'a4967facf4b496fbc39adeb240182dad6c7dad6a':
Cleanup script init to fix bogus log printing and reduce memory churn.
2011-01-24 17:32:55 -08:00
Jim Miller
a9222de2fc
am 935dedf6: Merge "Fix 3385152: Update lockscreen font." into honeycomb
...
* commit '935dedf6631f1cd197796a6fd28c4d39b1d3da74':
Fix 3385152: Update lockscreen font.
2011-01-24 17:32:43 -08:00
Jason Sams
a4967facf4
Merge "Cleanup script init to fix bogus log printing and reduce memory churn." into honeycomb
2011-01-24 17:30:38 -08:00
Jim Miller
935dedf663
Merge "Fix 3385152: Update lockscreen font." into honeycomb
2011-01-24 17:29:23 -08:00
Adam Powell
44c3095d1e
am 532c1455: Merge "Fix bug 3383867 - default height for dropdown list items in framework layouts" into honeycomb
...
* commit '532c145540950fd3fa35d9099abdd2e4cb7d5776':
Fix bug 3383867 - default height for dropdown list items in framework layouts
2011-01-24 17:26:50 -08:00
Adam Powell
532c145540
Merge "Fix bug 3383867 - default height for dropdown list items in framework layouts" into honeycomb
2011-01-24 17:24:25 -08:00
Jim Miller
281d36e8f5
am d2d31dad: Merge "Fix 3381660: Update PasswordUnlock screen\'s EditText background." into honeycomb
...
* commit 'd2d31dadb02b45bf938761bfb6264dc599d81b3d':
Fix 3381660: Update PasswordUnlock screen's EditText background.
2011-01-24 17:17:18 -08:00
Adam Powell
5df3426a44
Fix bug 3383867 - default height for dropdown list items in framework layouts
...
Change-Id: I8a7553c3dc6b8c0eb95445c796c8298d1cdecc01
2011-01-24 17:15:52 -08:00
James Dong
73b38938a5
am 9807a7b2: Merge "Reduce the JNI native method visibility" into honeycomb
...
* commit '9807a7b27047c4108e3b2f802a814d4f746898cc':
Reduce the JNI native method visibility
2011-01-24 17:14:51 -08:00
Jim Miller
d2d31dadb0
Merge "Fix 3381660: Update PasswordUnlock screen's EditText background." into honeycomb
2011-01-24 17:13:30 -08:00
James Dong
9807a7b270
Merge "Reduce the JNI native method visibility" into honeycomb
2011-01-24 17:12:36 -08:00
Chet Haase
2292fb4afb
am 50d4de21: Merge "Fix bug with display lists and layout." into honeycomb
...
* commit '50d4de21ee6a2ee62c7ad89dfdfd82d1045e7a58':
Fix bug with display lists and layout.
2011-01-24 17:07:13 -08:00
Jim Miller
191f8ff354
am 85d3ef33: Merge "Fix 3381304: disable key preview in LockScreen\'s qwerty keyboard" into honeycomb
...
* commit '85d3ef337bdd21109e9c29356a6df96aacb3f849':
Fix 3381304: disable key preview in LockScreen's qwerty keyboard
2011-01-24 17:04:51 -08:00
Chet Haase
50d4de21ee
Merge "Fix bug with display lists and layout." into honeycomb
2011-01-24 17:03:30 -08:00
Jim Miller
85d3ef337b
Merge "Fix 3381304: disable key preview in LockScreen's qwerty keyboard" into honeycomb
2011-01-24 17:03:07 -08:00
Chet Haase
5af048c791
Fix bug with display lists and layout.
...
requestLayout() and forceLayout() should force the INVALIDATED
flag to be set, which causes a view's display list to be regenerated
on the next drawing operation. This is necessary when containers change
due to layout requests.
Change-Id: I5b18b5936b59f0605f93c8f45baf83a76dab4e5e
2011-01-24 17:00:32 -08:00
Jeff Brown
747aee5ab9
am 8bb7e488: Merge "Fix regression setting input windows." into honeycomb
...
* commit '8bb7e488e2564b75d8d920850891675090debcca':
Fix regression setting input windows.
2011-01-24 17:00:28 -08:00
Jeff Brown
8bb7e488e2
Merge "Fix regression setting input windows." into honeycomb
2011-01-24 16:58:17 -08:00
Andy Stadler
c5a0ce242f
Throw Base64DataException instead of IOException
...
* Define Base64DataException
* Throw it from Base64InputStream & Base64OutputStream
* This enables callers to disambiguate "bad data" from "broken stream",
which makes it more possible to do proper retry logic.
Bug: 3365205
Change-Id: I332e7c008f92b333400d1b4dcaef5aedc7c10ef4
2011-01-24 16:47:56 -08:00
Jeff Brown
2e44b0788f
Fix regression setting input windows.
...
Change-Id: I24d58a02f69ae40f03b133d487354a883585e93e
2011-01-24 16:44:18 -08:00
Jim Miller
e57c0bd4c6
Fix 3381660: Update PasswordUnlock screen's EditText background.
...
This updates the assets for the password field to use a lighter
background. It also moves them into the proper location for xlarge
device.
Change-Id: Iab084a067589d730a7138188be79543e9fb57168
2011-01-24 16:20:29 -08:00
Stephen Hines
f2401bddcd
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
3dd0908a65
Merge "Add missing functions to math library." into honeycomb
2011-01-24 16:14:43 -08:00
James Dong
98dcca909a
Reduce the JNI native method visibility
...
bug -3385135
Change-Id: I568b53d2279622b44ca5b8a23a8691ca3395f9a5
2011-01-24 15:56:11 -08:00
Jim Miller
2dbba00260
Fix 3385152: Update lockscreen font.
...
Change-Id: Ie72cded40cf408627d7a3deddd7b14c42528a1a0
2011-01-24 15:51:52 -08:00
Jeff Brown
eebc944fd1
am aaa55d3f: Merge "New orientation listener." into honeycomb
...
* commit 'aaa55d3f45744814907d0809befb49281ced462e':
New orientation listener.
2011-01-24 15:33:46 -08:00
Jeff Brown
aaa55d3f45
Merge "New orientation listener." into honeycomb
2011-01-24 15:31:22 -08:00
Svetoslav Ganov
f6e7d59222
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
33322052ed
Merge "DatePicker is picking the wrong date" into honeycomb
2011-01-24 15:26:42 -08:00
Adam Powell
efc2714dea
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
09176dcb3d
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
1914971c6b
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
8801ad3526
Merge "Disable focus controller when WebView loses focus." into honeycomb
2011-01-24 15:02:10 -08:00
Gilles Debunne
c46491fc2f
am 7c8c6d68: Typo in InputMethodManager\'s documentation
...
* commit '7c8c6d689280ecfbd151a2e0cb40341768470676':
Typo in InputMethodManager's documentation
2011-01-24 15:01:02 -08:00
Adam Powell
4ce35419ce
Fix bug 3242393 - overscroll effect missing from lists which drag but
...
are always visible
Change-Id: I20d73c452c7b98f1a046e356d0c6cdbfc8e5fe7a
2011-01-24 14:55:00 -08:00
Gilles Debunne
287035f574
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
b77e727a25
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
7c8c6d6892
Typo in InputMethodManager's documentation
...
Change-Id: I711e6d24462e336546b789fac0b9c6f529ebe260
2011-01-24 14:48:14 -08:00
Gilles Debunne
88b5953ab2
Merge "NULL inputType text fields should never show the IME." into honeycomb
2011-01-24 14:46:57 -08:00
Gilles Debunne
705a27a97c
Merge "Non-editable TextViews should not display a cursor." into honeycomb
2011-01-24 14:46:42 -08:00
Leon Scroggins
b4ffd11284
Disable focus controller when WebView loses focus.
...
Bug:3370821
Change-Id: Ia26a54e1c5ec050d76e60762f9a5eb4502d8c6e3
2011-01-24 17:43:47 -05:00
Adam Powell
89d90299b0
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
c831e3192c
Merge "Fix bug 3382994 - android.view.WindowManager$BadTokenException" into honeycomb
2011-01-24 14:35:11 -08:00
Dianne Hackborn
81ac92df33
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
4290211eef
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
80a9791b1d
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
9f0fefeb5b
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
b84e351733
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