drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,871 Commits 1 Branch 0 Tags
Commit Graph

15278 Commits

Author SHA1 Message Date
Robert Greenwalt
70d2c4d82c Get rid of manual int->ipv4 string generation 
bug:2542681
Change-Id: I67919d7b5dc8d72eeb2dfb9e3906210b1951d4fb
 2011-01-26 13:57:24 -08:00
Robert Greenwalt
9e751f0fb5 Merge "Make the interface with DHCP IPv6 capable." 2011-01-26 11:56:19 -08:00
Joe Onorato
b648c60854 am a4a5ec5e: am 1aadb210: Merge changes I48392c75,Id09437a4,I4a0aa878 into honeycomb 
* commit 'a4a5ec5e748f99c40301c9c422b3d36cb44c6081':
  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:50:38 -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
Kenny Root
bd549fe0bb am 7dbf0696: resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp 
* commit '7dbf0696ef37097f2bcec058f876f7f4ba63d357':
  Make ObbActionListener a on-way call
 2011-01-26 11:43:31 -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
f5240cddbd am 7c55da5d: am f5b27e35: Merge "Fix NPE in YouTube. Bug #3385339" into honeycomb 
* commit '7c55da5db50400400efbcd53a5cdc1a79c04cc63':
  Fix NPE in YouTube. Bug #3385339
 2011-01-26 10:59:11 -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
29a208e12c am ff271a22: am 2ec4af59: am 138757db: Merge "Make OBB results a one-way call" into gingerbread 
* commit 'ff271a2288f375fc7a5854ac0d1f7c969d91996d':
  Make OBB results a one-way call
 2011-01-26 10:13:54 -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
2fbb623afa am 666158e0: am 8b2d4825: Merge "Move last touch point when moving the cursor node." into honeycomb 
* commit '666158e09b694a6883a9d8207fe33de4fe4eca3e':
  Move last touch point when moving the cursor node.
 2011-01-26 10:09:47 -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
4ff8f51ef2 am b774f261: am ff3b3ade: Merge "Revert "Temporary Changes for certification of SCO."" into honeycomb 
* commit 'b774f261ea63c44ec70b5d337b19368269800a06':
  Revert "Temporary Changes for certification of SCO."
 2011-01-26 09:21:53 -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
Robert Greenwalt
0216e61819 Make the interface with DHCP IPv6 capable. 
It doesn't work (yet) for IPv6, but we can remove v4-centric notions from the framework.

bug:2542681
Change-Id: I21c058f5c88d07706c9265bf0ea902fc90357e56
 2011-01-26 09:10:01 -08:00
Jaikumar Ganesh
5a9ac240fe Revert "Temporary Changes for certification of SCO." 
This reverts commit 75c2701454f4506664d9056988c8ce5fd0ca73ba.

Change-Id: Ic63cdbbb06b9ed2d9c48e8b29cc376059ecadebf
 2011-01-26 09:08:50 -08:00
Jaikumar Ganesh
59399e2e4f am b8a1a415: am 8ef1179e: Merge "Improve readability of java docs for the public APIs." into honeycomb 
* commit 'b8a1a415f37680304bf2edb73a5450d6c464334a':
  Improve readability of java docs for the public APIs.
 2011-01-26 09:07:23 -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
e29131cac3 am b69e985b: am ace9233b: Merge "Fix invalidation problem with display lists" into honeycomb 
* commit 'b69e985b9aa059d6cf7498a2350d3f814b4cf711':
  Fix invalidation problem with display lists
 2011-01-26 06:35:02 -08: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
cc6d12d844 am ac9bda01: am c45ec344: Merge "Turn off picture splitting for now." into honeycomb 
* commit 'ac9bda01b1d80c5301619a2c2288ee868b6bd520':
  Turn off picture splitting for now.
 2011-01-26 05:53:20 -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
e9a7d0dfb9 am 5742a277: am b6110a1e: Merge "Make sure the opaque bitmap is opaque. GL doesn\'t like being lied to. Bug #3382992" into honeycomb 
* commit '5742a2771025fc40f00777b5b4aa02765317f5f9':
  Make sure the opaque bitmap is opaque. GL doesn't like being lied to. Bug #3382992
 2011-01-25 22:58:24 -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
0793749661 am b8fc8c26: am 4fbca2b6: Merge "Change AsyncTask.execute() back to using a thread pool..." into honeycomb 
* commit 'b8fc8c26cba829225469a65bf8e35b06de54588e':
  Change AsyncTask.execute() back to using a thread pool...
 2011-01-25 22:09:50 -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
27d209f94a am 7975d8c0: am 0f16477b: Merge "Cleaning up StackView" into honeycomb 
* commit '7975d8c0fec80cb39365cf5cbad4223c5847384f':
  Cleaning up StackView
 2011-01-25 20:23:22 -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