42562 Commits

Author SHA1 Message Date
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
Jeff Brown
d1953bcbc7 am 747aee5a: am 8bb7e488: Merge "Fix regression setting input windows." into honeycomb
* commit '747aee5ab96503796e55fcd444c440197cecd39a':
  Fix regression setting input windows.
2011-01-24 17:02:14 -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
Stephen Hines
8bd05bb72a am f2401bdd: am 3dd0908a: Merge "Add missing functions to math library." into honeycomb
* commit 'f2401bddcd68f796ff03610cade9ffbb46fde800':
  Add missing functions to math library.
2011-01-24 16:46:49 -08:00
Jeff Brown
2e44b0788f Fix regression setting input windows.
Change-Id: I24d58a02f69ae40f03b133d487354a883585e93e
2011-01-24 16:44:18 -08:00
Jeff Brown
76a23f8b2e resolved conflicts for merge of eebc944f to master
Change-Id: I969cf69d2bd6901742d2cdf1bd44344ee7ba9fc7
2011-01-24 16:43:28 -08:00
Andreas Huber
ca1cf59f49 am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
* commit 'efebdf4bd4da35bc50c7d81450c8473697f6654a':
  DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
2011-01-24 16:30:12 -08:00
Svetoslav Ganov
9bb7bf6327 am f6e7d592: am 33322052: Merge "DatePicker is picking the wrong date" into honeycomb
* commit 'f6e7d592224851b7d623180bb2ea780234580cee':
  DatePicker is picking the wrong date
2011-01-24 16:24:32 -08:00
Leon Scroggins
a9f57c645b Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-01-24 16:22:06 -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
Andreas Huber
efebdf4bd4 DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
Change-Id: I6c27c00a6e13cb3635e61089c0db0989f5810c37
related-to-bug: 3384367
2011-01-24 15:59:14 -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
Mike Lockwood
a6b1cd5acf Merge "libutils: Fix race condition in Thread::requestExitAndWait()" 2011-01-24 15:26:31 -08:00
Mike Lockwood
4a7f412e1d libutils: Fix race condition in Thread::requestExitAndWait()
Hold a reference to the thread in requestExitAndWait() so the
condition variable it is waiting on will not be destroyed before
its wait() call returns.

Change-Id: If8b6cf84117203926a4180f43f0224469e92a500
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-24 15:25:38 -08:00
Jim Miller
e4c2d806a8 Fix 3382123: Set default state of LockScreen portrait kb
This sets the default state of the portrait keyboard to
"gone" to agree with the landscape keyboard.

Change-Id: I1e6a21b07c27ef739bfde4558b958c48b4fc56df
2011-01-24 15:24:01 -08:00
Adam Powell
440d23a20d am efc2714d: am 1914971c: Merge "Fix bug 3242393 - overscroll effect missing from lists which drag but are always visible" into honeycomb
* commit 'efc2714dea3daa2fce376aecfe6d31d194c39b3d':
  Fix bug 3242393 - overscroll effect missing from lists which drag but are always visible
2011-01-24 15:08:45 -08:00
Leon Scroggins
62e4af1656 am 09176dcb: am 8801ad35: Merge "Disable focus controller when WebView loses focus." into honeycomb
* commit '09176dcb3d01b014eeb73ab3d643ac36c717dd75':
  Disable focus controller when WebView loses focus.
2011-01-24 15:06:30 -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
Gilles Debunne
ad18453037 am c46491fc: am 7c8c6d68: Typo in InputMethodManager\'s documentation
* commit 'c46491fc2fdaa8cddaa2a4f83f50630b7d2e2a74':
  Typo in InputMethodManager's documentation
2011-01-24 15:03:12 -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
3a23a82275 am 287035f5: am 88b5953a: Merge "NULL inputType text fields should never show the IME." into honeycomb
* commit '287035f5749e4a5d4f088ee5f215f9ec4d03cc42':
  NULL inputType text fields should never show the IME.
2011-01-24 14:50:29 -08:00
Gilles Debunne
d07eaa2388 am b77e727a: am 705a27a9: Merge "Non-editable TextViews should not display a cursor." into honeycomb
* commit 'b77e727a255da00b2843a0d39efdde91364c8cb1':
  Non-editable TextViews should not display a cursor.
2011-01-24 14:50:26 -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
64c2196b39 am 89d90299: am c831e319: Merge "Fix bug 3382994 - android.view.WindowManager" into honeycomb
* commit '89d90299b0c31277d4fe61f644c09cfab4ae44ee':
  Fix bug 3382994 - android.view.WindowManager$BadTokenException
2011-01-24 14:39:54 -08: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
Dianne Hackborn
8e11b4f4eb am 81ac92df: am 6d92cde2: am 35f4d32d: Merge "frameworks/base: Track owner in appropriate owners list of Uri"
* commit '81ac92df33ba146a51fbbf3d5108379a9eb346b1':
  frameworks/base: Track owner in appropriate owners list of Uri
2011-01-24 14:37:21 -08:00
Jaikumar Ganesh
2f473e4ff9 am 4290211e: (-s ours) am f6439749: (-s ours) am 1c9761e3: Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
* commit '4290211eef80c706faea77da2293ccb486c06009':
  Do Not Merge Connect other profiles when priority is auto connect.
2011-01-24 14:37:18 -08:00
John Reck
8cc4e1b97d am 80a9791b: (-s ours) am 3cc8a3a4: (-s ours) am 398a589c: Merge "DO NOT MERGE - Create db path if it doesn\'t exit" into gingerbread
* commit '80a9791b1d61db62c597fb041208de3ef4fd9221':
  DO NOT MERGE - Create db path if it doesn't exit
2011-01-24 14:37:15 -08:00
Jeff Hamilton
921a40fce9 am 9f0fefeb: am 0c5e2b3f: am dc54a8c7: Merge "API changes for NFC." into gingerbread
* commit '9f0fefeb5ba9717409d04ceff3b36ba5cc4115ad':
  API changes for NFC.
2011-01-24 14:37:10 -08:00
Xavier Ducrohet
7c2462b915 am b84e3517: am 5b9936f6: Merge "LayoutLib: Use special view cookie for include-merge case." into honeycomb
* commit 'b84e351733e380a3759951ca6042c69b6dc584ad':
  LayoutLib: Use special view cookie for include-merge case.
2011-01-24 14:37:04 -08:00