Jim Miller
adc14026fb
Merge "Fix 3381660: Make modifier keys in PasswordUnlock match IME" into honeycomb
2011-01-25 16:21:21 -08:00
Martijn Coenen
59ad6ed879
am 25be5365: Implement canMakeReadonly().
...
* commit '25be53652167300183282d170a00a6df576523f5':
Implement canMakeReadonly().
2011-01-25 16:16:53 -08:00
Nick Pelly
01a2868985
am 92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread
...
* commit '92939376199a08fa0a3b01759579a4979c2a94a2':
Remove attemptDeadServiceRecovery() from TagTechnology's.
2011-01-25 16:16:05 -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
Nick Pelly
30098efbca
resolved conflicts for merge of d64d711d to honeycomb-merge
...
Change-Id: Ibe2c6d9f3d0070fb62f8385a9f49e605be37c885
2011-01-25 16:13:17 -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
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
Dianne Hackborn
4426f643ec
Merge "Fix issue #3385839 : Fragment.onCreateView is passing in activity..." into honeycomb
2011-01-25 14:06:01 -08:00
Jaikumar Ganesh
e4d494b495
am 5cbb1622: Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb
...
* commit '5cbb162262cf2dc1a5763ddbdeb4f8ec50c33dba':
Rename virtual call API to ScoUsingVirtualCall.
2011-01-25 14:00:32 -08:00
Romain Guy
535602fe55
am 3ac1b0f0: Merge "Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339 " into honeycomb
...
* commit '3ac1b0f0d4d78568faf7616b2a8b808bdf5c4882':
Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339
2011-01-25 13:58:08 -08:00
Jaikumar Ganesh
5cbb162262
Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb
2011-01-25 13:56:02 -08:00
Romain Guy
3ac1b0f0d4
Merge "Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339 " into honeycomb
2011-01-25 13:55:14 -08:00
Jaikumar Ganesh
dde68c64fd
Rename virtual call API to ScoUsingVirtualCall.
...
This API makes more sense with regard to headset profile.
Bug: 3381532
Change-Id: Ife07d101a3b04bcddb31e7ae86712e1d97a660c5
2011-01-25 13:49:35 -08:00
Gilles Debunne
a5b43a0492
am c927ec50: Merge "Overscoll bounce amplitude is smaller." into honeycomb
...
* commit 'c927ec50497bf5f477663deb7b366b37185d46b0':
Overscoll bounce amplitude is smaller.
2011-01-25 13:47:24 -08:00
Daniel Sandler
f844dc4fa8
Fit and finish on status bar:
...
- Clock color fixed. [3374581]
- Clock vertically aligned. [3388224]
- Clock uses system font assets now. [3385564]
- Solid version of AndroidClock added to build. [3385564]
- Extraneous background glow removed from notification panel.
- Removed solid black background from notifications. [3388223]
- Added background image behind large notification icons
and increased large size to 64dip [3388434, 3384355]
- Corrected size & leading of notification text [3388577]
Bug: 3374581
Bug: 3384355
Bug: 3385564
Bug: 3388223
Bug: 3388224
Bug: 3388434
Bug: 3388577
Change-Id: I8e443da5758deca412d1ce5944f887b35f6265ed
2011-01-25 16:46:43 -05:00
Adam Powell
41cd1ce1b9
am f72a13ec: Merge "Fix bug 3378333 - Holo-style layout for granting permissions" into honeycomb
...
* commit 'f72a13ec76517ff0be297f194c88ceb0d84b85e8':
Fix bug 3378333 - Holo-style layout for granting permissions
2011-01-25 13:45:19 -08:00
Gilles Debunne
c927ec5049
Merge "Overscoll bounce amplitude is smaller." into honeycomb
2011-01-25 13:44:32 -08:00
Adam Powell
f72a13ec76
Merge "Fix bug 3378333 - Holo-style layout for granting permissions" into honeycomb
2011-01-25 13:42:49 -08:00
Gilles Debunne
d9ed795ca5
Fix for a call to startActivity from outside of an app.
...
Bug 3246715
Regression introduced by https://android-git.corp.google.com/g/#change,86174
Change-Id: Icba170746d196386bd9b0309582f724cb076d937
2011-01-25 13:40:06 -08:00