Chet Haase
f8ac62237b
am 235a20a3: am 21d405f5: Merge "Fix for display list problem with listview items." into honeycomb
...
* commit '235a20a3d1b57492ba0fbebb7f9dcce41ef011d0':
Fix for display list problem with listview items.
2011-01-24 18:04:35 -08:00
Chet Haase
235a20a3d1
am 21d405f5: Merge "Fix for display list problem with listview items." into honeycomb
...
* commit '21d405f5fa0ccf75e805e3f9404a53579416e2da':
Fix for display list problem with listview items.
2011-01-24 18:02:05 -08:00
Chet Haase
21d405f5fa
Merge "Fix for display list problem with listview items." into honeycomb
2011-01-24 17:59:35 -08:00
Chet Haase
3b2b0fc257
Fix for display list problem with listview items.
...
We were not correctly invalidating items that were being attached
to listviews.
Change-Id: I5d29a82c4276f09e401c6869ab1e86a3c8281366
2011-01-24 17:53:52 -08:00
Andy Stadler
d532ab13dc
am 2a9deb0d: am 315fae20: Merge "Throw Base64DataException instead of IOException" into honeycomb
...
* commit '2a9deb0d40c4c34930a8313074161b846099c7fc':
Throw Base64DataException instead of IOException
2011-01-24 17:48:23 -08:00
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
b59c861db4
am 45a88352: am a4967fac: Merge "Cleanup script init to fix bogus log printing and reduce memory churn." into honeycomb
...
* commit '45a8835203e165b0fe56ece5f62ee9e2b83a7a37':
Cleanup script init to fix bogus log printing and reduce memory churn.
2011-01-24 17:35:34 -08:00
Jim Miller
9f49df869d
am a9222de2: am 935dedf6: Merge "Fix 3385152: Update lockscreen font." into honeycomb
...
* commit 'a9222de2fc6f52fb4657a91d6f12723b05cb948d':
Fix 3385152: Update lockscreen font.
2011-01-24 17:35:29 -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
Adam Powell
64a16d99df
am 44c3095d: am 532c1455: Merge "Fix bug 3383867 - default height for dropdown list items in framework layouts" into honeycomb
...
* commit '44c3095d1e20ada175ed4517a27972f87cae71df':
Fix bug 3383867 - default height for dropdown list items in framework layouts
2011-01-24 17:29:30 -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
f7b6800f90
am 281d36e8: am d2d31dad: Merge "Fix 3381660: Update PasswordUnlock screen\'s EditText background." into honeycomb
...
* commit '281d36e8f5b52bcc5fe1ef5dfd849433b4dce940':
Fix 3381660: Update PasswordUnlock screen's EditText background.
2011-01-24 17:20:36 -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
James Dong
33bdc67892
am 73b38938: am 9807a7b2: Merge "Reduce the JNI native method visibility" into honeycomb
...
* commit '73b38938a5397c1f89702d4dac00e2f52dc264a8':
Reduce the JNI native method visibility
2011-01-24 17:17:01 -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
63502a7fb2
am 2292fb4a: am 50d4de21: Merge "Fix bug with display lists and layout." into honeycomb
...
* commit '2292fb4afb942b5880ef20bca5b255c5e005fa5e':
Fix bug with display lists and layout.
2011-01-24 17:08:55 -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
5e488111f2
am 191f8ff3: am 85d3ef33: Merge "Fix 3381304: disable key preview in LockScreen\'s qwerty keyboard" into honeycomb
...
* commit '191f8ff3545b891ec395f700771b79689b58e422':
Fix 3381304: disable key preview in LockScreen's qwerty keyboard
2011-01-24 17:06:44 -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
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
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
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