Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,716 Commits 3 Branches 0 Tags
b774f261ea63c44ec70b5d337b19368269800a06
Commit Graph

14837 Commits

Author SHA1 Message Date
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
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
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
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
Gilles Debunne
4df103cf3d Merge "A long press on the selection handle no longer selects the word." into honeycomb 2011-01-25 15:59:01 -08:00
Brad Fitzpatrick
6af61b8435 am a206efcf: Merge "android.os.Message: respect sPoolSize" 
* commit 'a206efcf8d2e56cbd0d1de125b29b45fc6cc8431':
  android.os.Message: respect sPoolSize
 2011-01-25 15:44:33 -08:00
Gilles Debunne
874d77c62e A long press on the selection handle no longer selects the word. 
Bug 3371448.

Change-Id: I360e6259f5f58a6f251efbe031ac46a76b7168e7
 2011-01-25 15:29:13 -08:00
Costin Manolache
d606045070 If 'customTokens', let authenticator handle notification. 
Bug: 3377952
Change-Id: Iffb0ed01c39b42838cf88fd1b332c4b41c3194ec
 2011-01-25 15:28:44 -08:00
Dianne Hackborn
a58552e03d am f95bd0fe: Merge "Argh forget to include my final part of the change." into honeycomb 
* commit 'f95bd0feb57f1503be7c08083c0a4d22286256e8':
  Argh forget to include my final part of the change.
 2011-01-25 15:25:39 -08:00
Dianne Hackborn
f95bd0feb5 Merge "Argh forget to include my final part of the change." into honeycomb 2011-01-25 15:23:13 -08:00
Dianne Hackborn
1a904dedbb am 8fca2ecc: Merge "New extra for GET_CONTENT." into honeycomb 
* commit '8fca2eccb03b9b8d71ec4a7ec088d617edec4e73':
  New extra for GET_CONTENT.
 2011-01-25 15:19:17 -08:00
Dianne Hackborn
8fca2eccb0 Merge "New extra for GET_CONTENT." into honeycomb 2011-01-25 15:17:50 -08:00
Dianne Hackborn
c4d0e6fcea New extra for GET_CONTENT. 
Change-Id: Ib367c02619ee301d9651dd70d35f7d57aa8a0cbc
 2011-01-25 15:16:55 -08:00
Brad Fitzpatrick
2405c278ef android.os.Message: respect sPoolSize 
Also rename some static members from mFoo to sFoo.

Bug: http://code.google.com/p/android/issues/detail?id=13866
Change-Id: I5c5075eb6f529d1534c7aa72b6881873cd08676a
 2011-01-25 14:54:31 -08:00
Dianne Hackborn
f812fee071 Argh forget to include my final part of the change. 
Change-Id: I1e2711e1ecde0350047f1edef9a59947ff5749eb
 2011-01-25 14:54:29 -08:00
Adam Powell
e0c148484e am 5dcc9bd7: Merge "Fix bug 3387855 - Menu flashes on left side of screen" into honeycomb 
* commit '5dcc9bd7261d6b19135bf972cf603b355b5316f4':
  Fix bug 3387855 - Menu flashes on left side of screen
 2011-01-25 14:50:34 -08:00
Jeff Brown
391ef42c92 am 3168a137: Merge "Fix surface frame size reporting." into honeycomb 
* commit '3168a13723ff0f3f87937457fe33c3518caa4bb9':
  Fix surface frame size reporting.
 2011-01-25 14:48:14 -08:00
Gilles Debunne
7a41782195 am 47fc854a: Merge "Fix for a call to startActivity from outside of an app." into honeycomb 
* commit '47fc854ae9947e0fe5ca0e33e22a41618ba7523b':
  Fix for a call to startActivity from outside of an app.
 2011-01-25 14:48:08 -08:00
Adam Powell
5dcc9bd726 Merge "Fix bug 3387855 - Menu flashes on left side of screen" into honeycomb 2011-01-25 14:46:47 -08:00
Jeff Hamilton
eb645a15b9 am f126ad3b: Merge "Use classnames instead of ints for NFC techs." into gingerbread 
* commit 'f126ad3b6484ef62eed202f1f49cc4557c0a3848':
  Use classnames instead of ints for NFC techs.
 2011-01-25 14:41:55 -08:00
Adam Powell
e2b03a62e5 Fix bug 3387855 - Menu flashes on left side of screen 
Post popup menu click events rather than executing inline so that the
popup can close undisturbed.

Change-Id: I01481bd37d7921c10c6b8b484eab33f0d25447ff
 2011-01-25 14:40:36 -08:00
Jeff Hamilton
f126ad3b64 Merge "Use classnames instead of ints for NFC techs." into gingerbread 2011-01-25 14:35:46 -08:00
Jeff Hamilton
d88e9aa575 Use classnames instead of ints for NFC techs. 
This makes the system more flexible and allows
adding new technology types without having to
update the API.

Change-Id: Iaee6b633965e501a70e8afc3f1d54d9d94a4d05a
 2011-01-25 16:32:26 -06:00
Jeff Brown
3168a13723 Merge "Fix surface frame size reporting." into honeycomb 2011-01-25 14:21:00 -08:00
Gilles Debunne
47fc854ae9 Merge "Fix for a call to startActivity from outside of an app." into honeycomb 2011-01-25 14:20:09 -08:00
Dianne Hackborn
a290977312 am 4426f643: Merge "Fix issue #3385839: Fragment.onCreateView is passing in activity..." into honeycomb 
* commit '4426f643ec3833e830bc2f9b8af5088343de1315':
  Fix issue #3385839: Fragment.onCreateView is passing in activity...
 2011-01-25 14:08:10 -08:00