Winson Chung
38fe6ff45a
am 2c070bae: Merge "Re-enabling queued unbinding of services after requests to the service. (3394210)" into honeycomb
...
* commit '2c070bae4493cd1976c5086ec4cbf6ce10482742':
Re-enabling queued unbinding of services after requests to the service. (3394210)
2011-01-26 12:32:50 -08:00
Winson Chung
2c070bae44
Merge "Re-enabling queued unbinding of services after requests to the service. (3394210)" into honeycomb
2011-01-26 12:30:26 -08:00
Jaikumar Ganesh
48f7377980
am e9b644fc: Merge "Fix some unmatched javadoc tags." into honeycomb
...
* commit 'e9b644fcef08b0716efd3843ca7152e75cde3447':
Fix some unmatched javadoc tags.
2011-01-26 12:25:29 -08:00
Jaikumar Ganesh
e9b644fcef
Merge "Fix some unmatched javadoc tags." into honeycomb
2011-01-26 12:23:15 -08:00
Winson Chung
16c8d8a558
Re-enabling queued unbinding of services after requests to the service. (3394210)
...
- Fix for crash when detaching from window
- Potential fix for occasional IllegalStateException when updating List based widgets
Change-Id: I3d3f2bb691552a1136111043db686c4926b510c6
2011-01-26 12:09:27 -08:00
Joe Onorato
a4a5ec5e74
am 1aadb210: Merge changes I48392c75,Id09437a4,I4a0aa878 into honeycomb
...
* commit '1aadb2108d7614d9d1ff61b41c6c31cb8d211ab9':
Expose the window flags for lights out mode.
Make TabletStatusBar call into StatusBarManagerService when it goes out of lights out mode on its own.
Make FLAG_FULLSCREEN not go into lights out mode anymore.
2011-01-26 11:48:48 -08:00
Joe Onorato
1aadb2108d
Merge changes I48392c75,Id09437a4,I4a0aa878 into honeycomb
...
* changes:
Expose the window flags for lights out mode.
Make TabletStatusBar call into StatusBarManagerService when it goes out of lights out mode on its own.
Make FLAG_FULLSCREEN not go into lights out mode anymore.
2011-01-26 11:46:58 -08:00
Jaikumar Ganesh
0706fed520
Fix some unmatched javadoc tags.
...
Bug: 3392175
Change-Id: I84aa86c07060bc4ba399fd5c8f7cda162b432031
2011-01-26 11:46:56 -08:00
Kenny Root
7dbf0696ef
resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp
...
Change-Id: Ie9b0166b0260ee7eea7bdd275e64f2714024bf1c
2011-01-26 11:10:36 -08:00
Kenny Root
2c1d0967ba
Merge "Make ObbActionListener a on-way call" into honeycomb
2011-01-26 11:01:14 -08:00
Romain Guy
7c55da5db5
am f5b27e35: Merge "Fix NPE in YouTube. Bug #3385339 " into honeycomb
...
* commit 'f5b27e35c1e0e46ffd882606d0783875e1a1ff7b':
Fix NPE in YouTube. Bug #3385339
2011-01-26 10:56:08 -08:00
Romain Guy
f5b27e35c1
Merge "Fix NPE in YouTube. Bug #3385339 " into honeycomb
2011-01-26 10:54:23 -08:00
Romain Guy
d30b36d3cd
Fix NPE in YouTube.
...
Bug #3385339
Change-Id: Id7b307994e343cdb808161a7fae590536f04252e
2011-01-26 10:54:43 -08:00
Joe Onorato
14782f705e
Expose the window flags for lights out mode.
...
I hadn't wanted to do this, but it makes porting the FLAG_FULLSCREEN
stuff over to this simpler because you don't have to go find a view
to proxy through.
This change also clears the flag everywhere when the window manager
notifies the views that the change has come back.
Change-Id: I48392c7550925bcca50c5bb9e1f263e99de6c7bc
2011-01-26 10:47:39 -08:00
Joe Onorato
644f9c3ad9
Make FLAG_FULLSCREEN not go into lights out mode anymore.
...
Change-Id: I4a0aa8789f537717f82df4efb6a35108e1ab1784
2011-01-26 10:32:18 -08:00
Kenny Root
ff271a2288
am 2ec4af59: am 138757db: Merge "Make OBB results a one-way call" into gingerbread
...
* commit '2ec4af59209ab3a7088a001bbbcb10ef0b846564':
Make OBB results a one-way call
2011-01-26 10:11:21 -08:00
Leon Scroggins
666158e09b
am 8b2d4825: Merge "Move last touch point when moving the cursor node." into honeycomb
...
* commit '8b2d4825e1d7ca22aab9ae9fdfa1ecd34f154e22':
Move last touch point when moving the cursor node.
2011-01-26 10:08:17 -08:00
Leon Scroggins
8b2d4825e1
Merge "Move last touch point when moving the cursor node." into honeycomb
2011-01-26 10:06:42 -08:00
Kenny Root
2ec4af5920
am 138757db: Merge "Make OBB results a one-way call" into gingerbread
...
* commit '138757db4f19cb626ef5c1d371d4fca004304a08':
Make OBB results a one-way call
2011-01-26 09:25:43 -08:00
Jaikumar Ganesh
b774f261ea
am ff3b3ade: Merge "Revert "Temporary Changes for certification of SCO."" into honeycomb
...
* commit 'ff3b3ade7fa1da60d391d1a746cdc0868c24f4bf':
Revert "Temporary Changes for certification of SCO."
2011-01-26 09:19:31 -08:00
Kenny Root
138757db4f
Merge "Make OBB results a one-way call" into gingerbread
2011-01-26 09:17:28 -08:00
Jaikumar Ganesh
5a9ac240fe
Revert "Temporary Changes for certification of SCO."
...
This reverts commit 75c2701454 .
Change-Id: Ic63cdbbb06b9ed2d9c48e8b29cc376059ecadebf
2011-01-26 09:08:50 -08:00
Jaikumar Ganesh
b8a1a415f3
am 8ef1179e: Merge "Improve readability of java docs for the public APIs." into honeycomb
...
* commit '8ef1179efce1c8b1107df707afdce8f85404d39e':
Improve readability of java docs for the public APIs.
2011-01-26 09:04:47 -08:00
Jaikumar Ganesh
8ef1179efc
Merge "Improve readability of java docs for the public APIs." into honeycomb
2011-01-26 09:02:12 -08:00
Leon Scroggins
cef1c59efc
Move last touch point when moving the cursor node.
...
Bug:3241968
Bug:3387455
The code was already in place, but needs to happen before we
return if mHeightCanMeasure == false.
Change-Id: Ic07dac4c4471bf4e2189f3fee322adeb23703f41
2011-01-26 11:13:24 -05:00
Chet Haase
b69e985b9a
am ace9233b: Merge "Fix invalidation problem with display lists" into honeycomb
...
* commit 'ace9233b11e9be0d894fcf36cdee4c6b0a20d3bd':
Fix invalidation problem with display lists
2011-01-26 06:32:59 -08:00
Chet Haase
ace9233b11
Merge "Fix invalidation problem with display lists" into honeycomb
2011-01-26 06:30:48 -08:00
Patrick Scott
ac9bda01b1
am c45ec344: Merge "Turn off picture splitting for now." into honeycomb
...
* commit 'c45ec3440bcdc00542e5e08cfa7ba29593cb7609':
Turn off picture splitting for now.
2011-01-26 05:51:07 -08:00
Patrick Scott
c45ec3440b
Merge "Turn off picture splitting for now." into honeycomb
2011-01-26 05:48:53 -08:00
Chet Haase
77785f9d25
Fix invalidation problem with display lists
...
It was previously the case that a view marked ~DRAWN must be
invalidated correctly already, so we would not mark any flags.
Display lists added new logic such that an undrawn node must still
be checked to see if its cache has been marked invalid. If not,
we must mark it invalid to make sure that a future rendering call
will cause the view to refresh its display list, thus refreshing its
child node tree's display lists, since that's where the invalidate
call must have originated.
Change-Id: I0f73c85459174c0e3f16d703f7eb914a706c808a
2011-01-25 23:22:09 -08:00
Romain Guy
5742a27710
am b6110a1e: Merge "Make sure the opaque bitmap is opaque. GL doesn\'t like being lied to. Bug #3382992 " into honeycomb
...
* commit 'b6110a1ef41337a5f3042c7e08b63274cee4faf6':
Make sure the opaque bitmap is opaque. GL doesn't like being lied to. Bug #3382992
2011-01-25 22:56:10 -08:00
Romain Guy
b6110a1ef4
Merge "Make sure the opaque bitmap is opaque. GL doesn't like being lied to. Bug #3382992 " into honeycomb
2011-01-25 22:54:06 -08:00
Romain Guy
f90f8171e6
Make sure the opaque bitmap is opaque. GL doesn't like being lied to.
...
Bug #3382992
The result still looks wrong but it works as designed, unfortunately.
Change-Id: I6108e199fa336cb01faaabf6c75faa3b71c2339b
2011-01-25 22:53:24 -08:00
Dianne Hackborn
b8fc8c26cb
am 4fbca2b6: Merge "Change AsyncTask.execute() back to using a thread pool..." into honeycomb
...
* commit '4fbca2b6138c52405fd7fb241bbf3c21fddd04bb':
Change AsyncTask.execute() back to using a thread pool...
2011-01-25 22:08:16 -08:00
Dianne Hackborn
4fbca2b613
Merge "Change AsyncTask.execute() back to using a thread pool..." into honeycomb
2011-01-25 22:05:38 -08:00
Dianne Hackborn
96438cd658
Change AsyncTask.execute() back to using a thread pool...
...
...for now.
Change-Id: I1fe64f3e3a575f85add11dfe4d405f0c3a4a49de
2011-01-25 21:42:37 -08:00
Adam Cohen
7975d8c0fe
am 0f16477b: Merge "Cleaning up StackView" into honeycomb
...
* commit '0f16477b2d2432a294801a12ac513cd41b00d03c':
Cleaning up StackView
2011-01-25 20:20:45 -08:00
Adam Cohen
0f16477b2d
Merge "Cleaning up StackView" into honeycomb
2011-01-25 20:19:17 -08:00
Jaikumar Ganesh
4c2e07d2fa
am 7f5d652b: Merge "Do Not Merge. Don\'t connect to non keyboard HID devices." into honeycomb
...
* commit '7f5d652b9c92950170f12f0e5a4641076ed75c20':
Do Not Merge. Don't connect to non keyboard HID devices.
2011-01-25 18:44:22 -08:00
Jaikumar Ganesh
7f5d652b9c
Merge "Do Not Merge. Don't connect to non keyboard HID devices." into honeycomb
2011-01-25 18:42:12 -08:00
Jaikumar Ganesh
55b6b862c8
Do Not Merge. Don't connect to non keyboard HID devices.
...
Bug: 3385950
Change-Id: I2cfb17467c3d2fd383747111cd990d39f10f5136
2011-01-25 17:38:11 -08:00
Kenny Root
b7db2726e9
Make OBB results a one-way call
...
OBB result back to an application needs to be a one-way binder call.
Bug: 3353699
Change-Id: I0e625914d18a001c2fa9d764ea6463f34cf96743
2011-01-25 17:29:59 -08:00
Adam Cohen
78db1aa911
Cleaning up StackView
...
Change-Id: I38cd8a5f2d25973d3f97551be0a873ca35044ed9
2011-01-25 17:09:34 -08:00
Jaikumar Ganesh
c8fa4ff838
Improve readability of java docs for the public APIs.
...
Change-Id: I0a0f1be04ed2ea2c14498a1a2ed4b050191ec95b
2011-01-25 16:53:39 -08:00
Brad Fitzpatrick
4786418091
am 6af61b84: am a206efcf: Merge "android.os.Message: respect sPoolSize"
...
* commit '6af61b843511bc5b669d30b980c4a9e2682da47c':
android.os.Message: respect sPoolSize
2011-01-25 16:21:29 -08:00
Costin Manolache
f7f46dda1e
am b324911b: Merge "If \'customTokens\', let authenticator handle notification." into honeycomb
...
* commit 'b324911b473d20d10c0107273721791bc8b04568':
If 'customTokens', let authenticator handle notification.
2011-01-25 16:14:42 -08:00
Costin Manolache
b324911b47
Merge "If 'customTokens', let authenticator handle notification." into honeycomb
2011-01-25 16:13:12 -08:00
Jeff Hamilton
95f7c85499
Merge "resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-01-25 16:02:19 -08:00
Gilles Debunne
f5c7cbadd5
am 4df103cf: Merge "A long press on the selection handle no longer selects the word." into honeycomb
...
* commit '4df103cf3d134bc0e428656e07c43eda2687ecdb':
A long press on the selection handle no longer selects the word.
2011-01-25 16:01:37 -08:00
Jeff Hamilton
437ff39c74
resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp
...
Change-Id: Idc241a61ea3f506f8c0877f4dcdabb89a2635c13
2011-01-25 18:00:41 -06:00