18266 Commits

Author SHA1 Message Date
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
Daniel Sandler
c88b19fcc8 am 34430260: Merge "Fit and finish on status bar:" into honeycomb
* commit '344302600a87175a9fd2bdfbf38708b1d1759731':
  Fit and finish on status bar:
2011-01-25 18:58:50 -08:00
Daniel Sandler
344302600a Merge "Fit and finish on status bar:" into honeycomb 2011-01-25 18:56:32 -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
Adam Powell
5a6bb13a7a am c5573a5a: Merge "Fix button assets and styles." into honeycomb
* commit 'c5573a5ac40d93b4b74608ee1858d04f74cb24f5':
  Fix button assets and styles.
2011-01-25 18:32:00 -08:00
Adam Powell
4f0d85c0cc Fix button assets and styles.
This fixes some padding issues that broke apps during the last update.

Change-Id: Icdce5231f4497f8f0be0ab842a03cbfdfc501c5a
2011-01-25 18:25:20 -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
Adam Powell
d144b449b1 am d63219f6: Merge "Fix bug 3343940 - Legacy dialogs should use overlay action mode UI" into honeycomb
* commit 'd63219f62248d067462403bed9e0539df53dd2dd':
  Fix bug 3343940 - Legacy dialogs should use overlay action mode UI
2011-01-25 16:34:01 -08:00
Adam Powell
d63219f622 Merge "Fix bug 3343940 - Legacy dialogs should use overlay action mode UI" into honeycomb 2011-01-25 16:27:16 -08:00
Jim Miller
a497e9448e am adc14026: Merge "Fix 3381660: Make modifier keys in PasswordUnlock match IME" into honeycomb
* commit 'adc14026fbd21d5238a47f402c7b316a7aeac92e':
  Fix 3381660: Make modifier keys in PasswordUnlock match IME
2011-01-25 16:24:23 -08:00
Adam Powell
88dd01c756 Fix bug 3343940 - Legacy dialogs should use overlay action mode UI
Change-Id: I0bb2d4cbb0639e01483f1029aa95984d4b29ffc6
2011-01-25 16:21:50 -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
Jim Miller
adc14026fb Merge "Fix 3381660: Make modifier keys in PasswordUnlock match IME" into honeycomb 2011-01-25 16:21:21 -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
Jim Miller
92be52c3ed Fix 3381660: Make modifier keys in PasswordUnlock match IME
Fixed modifier key assets to match Latin IME.
Added background to alphanumeric keyboard.
Added 25% alpha background to numeric keyboard.

Change-Id: I043171a5dec7eeb0c136bb7450fd4023208639dc
2011-01-25 16:05:15 -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
Romain Guy
1495297180 am 5c4c0d50: Merge "Fix documentation typo." into honeycomb
* commit '5c4c0d50fc1653fb6158e20d9b0af0325a80287c':
  Fix documentation typo.
2011-01-25 15:50:18 -08:00
Romain Guy
5c4c0d50fc Merge "Fix documentation typo." into honeycomb 2011-01-25 15:48:17 -08:00
Romain Guy
b8c0e0fd73 Fix documentation typo.
Change-Id: Ide9a6a6843e86fe3ef841f95bdff132cca1f3832
2011-01-25 15:49:52 -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
Justin Ho
55a24b7a4e am 26faf54d: Merge "New contact picture" into honeycomb
* commit '26faf54debfc7386a483eccfcddf1c051c653292':
  New contact picture
2011-01-25 15:33:23 -08:00
Justin Ho
26faf54deb Merge "New contact picture" into honeycomb 2011-01-25 15:31:08 -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
Justin Ho
18cc1f2cb6 New contact picture
Change-Id: Ic601c375df6117c5e974f39d4a75ccef45e6912c
2011-01-25 14:54:08 -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