Gilles Debunne
8f8aac5e8a
Merge "Pixel were missing on the last line of text when using MaxLines." into honeycomb
2011-01-31 18:14:05 -08:00
Tadashi G. Takaoka
2a7ade6d7c
Merge "Update hard keyboard status on closing input methods panel" into honeycomb
2011-01-31 18:04:11 -08:00
Dianne Hackborn
36dad9b86c
am b04ec6a8: (-s ours) am 7a7ed2b2: Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread
...
* commit 'b04ec6a8a7e6a684eb4b8d434c87b76bbac9c80c':
Do not check features in PackageManagerService DO NOT MERGE
2011-01-31 17:58:08 -08:00
Dianne Hackborn
b04ec6a8a7
am 7a7ed2b2: Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread
...
* commit '7a7ed2b21233480d63a1f6b3830e3b0c1c6a3298':
Do not check features in PackageManagerService DO NOT MERGE
2011-01-31 17:55:11 -08:00
Dharmaray Kundargi
a573b563b3
Fix issue 3408285. Fix issue in Thread safe in Java.
...
Change-Id: Ifddcecfc2d7b1bd3e8a91c4850c169e1fb7c65ae
2011-01-31 17:54:55 -08:00
Svetoslav Ganov
78ed7b801d
Merge "Clean up of the DatePicker"
2011-01-31 17:53:00 -08:00
Jamie Gennis
770e4e1e92
Merge "Clear GL errors before updating a SurfaceTexture."
2011-01-31 17:51:08 -08:00
Eric Fischer
5bf5569996
am 3efb3153: (-s ours) am a019d15b: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '3efb3153137d310851346807fcc04e71144c5413':
Import revised translations. DO NOT MERGE
2011-01-31 17:48:57 -08:00
Jeff Brown
c623fff00c
Merge "Fix keyboard hidden flag." into honeycomb
2011-01-31 17:45:56 -08:00
Dianne Hackborn
7a7ed2b212
Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread
2011-01-31 17:41:54 -08:00
Dianne Hackborn
6cf32312aa
Merge "Do not check features in PackageManagerService" into honeycomb
2011-01-31 17:41:09 -08:00
Wink Saville
9b9e6778dd
Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices.
...
bug: 3198435
Change-Id: I1a19863c106a9394dbc941f396400e31dca95b92
2011-01-31 17:33:05 -08:00
Ashish Sharma
e982f711a3
Merge "Fix a minor documentation bug in TrafficStats."
2011-01-31 17:32:40 -08:00
Eric Fischer
122106cb9b
Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb
2011-01-31 17:27:30 -08:00
Jeff Brown
597eec8c3d
Fix keyboard hidden flag.
...
Configuration.hardKeyboardHidden should be set to
HARDKEYBOARDHIDDEN_YES when no keyboard is present or when it is
disabled. The code in PhoneWindowManager.adjustConfigurationLw
does the right thing. It also takes care of setting keyboardHidden
correctly when only a soft keyboard is available.
So it turns out that all we need to do to disable the hard keyboard
is to set Configuration.keyboard to KEYBOARD_NOKEYS *before* asking
the policy to adjust the configuration.
Bug: 3406101
Change-Id: I3519d02af30d8068198cb3d6b8fdde601c2fe8b4
2011-01-31 17:12:25 -08:00
Kenny Root
4c3915a0f7
Do not check features in PackageManagerService
...
PackageManagerService shouldn't check features that a package declares
that it uses because this will cause problems in the future when we add
more features that older phones didn't explicitly declare. We must rely
on markets to know about phones and filter them for us to avoid this
situation.
Bug: 3409434
Change-Id: I419a5b936be3572b83a485081a6c81b2f1c8741c
2011-01-31 16:59:12 -08:00
Tadashi G. Takaoka
e385f0c771
Update hard keyboard status on closing input methods panel
...
Bug: 3391067
Change-Id: Ib337cea0031020ab7ca019b30cd2ceb47a7664d5
2011-02-01 09:54:54 +09:00
satok
076d059b54
Merge "Not to update IME when Settings version is older than the last updated version." into honeycomb
2011-01-31 16:53:05 -08:00
Svetoslav Ganov
13427a04de
Clean up of the DatePicker
...
1. Removed a duplicate DatePicker stylable.
2. Fixed a bug that if the user wrongly desires to have the
calendar view and spinners hidden despite that DataPicker
ovrrides such incorrect choice to show at least the spinners
the min adn max date attributes are igonored.
Change-Id: I6307db71aca837ad790aea59fa70ead393feb066
2011-01-31 16:37:33 -08:00
Justin Ho
90a9ab56e0
Merge "Updating notification title close asset" into honeycomb
2011-01-31 16:36:09 -08:00
Kenny Root
fa2ae1ad1a
Do not check features in PackageManagerService DO NOT MERGE
...
PackageManagerService shouldn't check features that a package declares
that it uses because this will cause problems in the future when we add
more features that older phones didn't explicitly declare. We must rely
on markets to know about phones and filter them for us to avoid this
situation.
Bug: 3409434
Change-Id: I0d51b2de33d8110edc6824af4b5b8c901f96077f
2011-01-31 16:27:38 -08:00
Justin Ho
6c01a26743
Updating notification title close asset
...
Change-Id: Id985d9f71b427b353d4f7a390c84fd40e8d43fc4
2011-01-31 16:27:28 -08:00
Andreas Huber
537fa17f21
Merge "Disconnect HTTP live sessions as soon as the request comes in." into honeycomb
2011-01-31 16:23:27 -08:00
Gilles Debunne
0ad4f0963a
Merge "Patches for the Paste window behavior." into honeycomb
2011-01-31 16:22:25 -08:00
Svetoslav Ganov
c4df1f6a48
am b5d9b6ae: am 1c91433f: Merge "Set time dialog display changes AM/PM at 1 instead of 12" into honeycomb
...
* commit 'b5d9b6aec8565b13c45ce875d7e7b8e3ea3648f9':
Set time dialog display changes AM/PM at 1 instead of 12
2011-01-31 16:19:07 -08:00
Adam Powell
06a7d2e66e
am 3c7a6174: am 5f639d5a: Merge "Fix bug 3408834 - actionbar stays gone when leaving reader in lightsout mode" into honeycomb
...
* commit '3c7a617455410c3c164f9aeac522baa94e056651':
Fix bug 3408834 - actionbar stays gone when leaving reader in lightsout mode
2011-01-31 16:19:04 -08:00
Andreas Huber
17ab86cdb1
Disconnect HTTP live sessions as soon as the request comes in.
...
Instead of waiting until pending events have been processed.
Change-Id: Id758f5508a514561e18aade82175d69e9156965e
related-to-bug: 3409681
2011-01-31 16:18:49 -08:00
Eric Fischer
3efb315313
am a019d15b: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'a019d15b667a72d7cb29afc7f153d5c517abcb76':
Import revised translations. DO NOT MERGE
2011-01-31 16:18:27 -08:00
Svetoslav Ganov
b5d9b6aec8
am 1c91433f: Merge "Set time dialog display changes AM/PM at 1 instead of 12" into honeycomb
...
* commit '1c91433f7c61860319fa5d524b503c2631a7f2d3':
Set time dialog display changes AM/PM at 1 instead of 12
2011-01-31 16:15:26 -08:00
Adam Powell
3c7a617455
am 5f639d5a: Merge "Fix bug 3408834 - actionbar stays gone when leaving reader in lightsout mode" into honeycomb
...
* commit '5f639d5a5134b994ee77207ac931bdafe95c6d66':
Fix bug 3408834 - actionbar stays gone when leaving reader in lightsout mode
2011-01-31 16:15:20 -08:00
Svetoslav Ganov
1c91433f7c
Merge "Set time dialog display changes AM/PM at 1 instead of 12" into honeycomb
2011-01-31 16:11:59 -08:00
Adam Powell
5f639d5a51
Merge "Fix bug 3408834 - actionbar stays gone when leaving reader in lightsout mode" into honeycomb
2011-01-31 16:11:51 -08:00
Eric Fischer
a019d15b66
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-01-31 16:08:52 -08:00
satok
4d733290a1
Not to update IME when Settings version is older than the last updated version.
...
- Check if just old version or not.
- Sometimes, ContentObserver.onChange is called before finishing to save the actual value.
This can be verified by checking the system settings version. If the version is not updated,
cached value will be returned from Settings.Secure, and this should not be handled.
Bug: 3406300
Change-Id: Ie3f5b484b5574e10a41dfc209ed31271a474b828
2011-02-01 09:01:58 +09:00
Gilles Debunne
7ad1a8e6c2
am e19246a3: am 11f9647e: Merge "Hint text is visible when using center gravity." into honeycomb
...
* commit 'e19246a38b76645bde43858945e78fcd2370b394':
Hint text is visible when using center gravity.
2011-01-31 15:46:56 -08:00
Dianne Hackborn
f5bf36c443
am 8a92eeb8: (-s ours) am 13684548: (-s ours) am e6c6b760: DO NOT MERGE Fix issue #3408542 : "resizeable" attribute required to get out of compat mode
...
* commit '8a92eeb8d8b27486d81089bfba5f51945ad89b21':
DO NOT MERGE Fix issue #3408542 : "resizeable" attribute required to get out of compat mode
2011-01-31 15:46:05 -08:00
Raphael
3d23e1b8d6
am 60e1eb4b: am 03245a8e: Merge "LayoutLib.Create: support Outer_Inner_Delegate renaming." into honeycomb
...
* commit '60e1eb4bfa6205cb2b307f9d2e9858f6e8cbb7ca':
LayoutLib.Create: support Outer_Inner_Delegate renaming.
2011-01-31 15:46:00 -08:00
Justin Ho
81e5beab84
am c15d7f63: am 53fe1045: Merge "Updated fallback sound for Honeycomb tablet" into honeycomb
...
* commit 'c15d7f63f047149e3fee0f2fc57539fb32856260':
Updated fallback sound for Honeycomb tablet
2011-01-31 15:45:55 -08:00
Jean-Baptiste Queru
c0e95048b9
Don't crash zygote if webcore fails to load
...
Change-Id: I88271fb62c0cc7c6d768009a713f20d9dfbfb5eb
2011-01-31 15:43:19 -08:00
Jamie Gennis
f27bbc238c
Merge "Clear all EGL errors when entering EGL funcs."
2011-01-31 15:40:06 -08:00
Jamie Gennis
79d01fe823
Clear GL errors before updating a SurfaceTexture.
...
Change-Id: Ibdac657ae9e9ccae53c63abed9caf1f1513915c2
2011-01-31 15:35:29 -08:00
Gilles Debunne
e19246a38b
am 11f9647e: Merge "Hint text is visible when using center gravity." into honeycomb
...
* commit '11f9647e03d4e1141bc4312626c8dc9116f1f470':
Hint text is visible when using center gravity.
2011-01-31 15:32:40 -08:00
Gilles Debunne
11f9647e03
Merge "Hint text is visible when using center gravity." into honeycomb
2011-01-31 15:29:56 -08:00
Gilles Debunne
3ce726eb94
Patches for the Paste window behavior.
...
Bug 3409440
Change-Id: Id266bb83aa6e1912817995881daa9c24a1553c32
2011-01-31 15:20:50 -08:00
Adam Powell
d76cee2b09
Fix bug 3408834 - actionbar stays gone when leaving reader in
...
lightsout mode
Fix an opportunity for race conditions when the action bar is
shown/hidden rapidly.
Change-Id: I91c0666cad3afd8a4d870d642f971949fba0d333
2011-01-31 15:05:05 -08:00
Jamie Gennis
c999a4ca96
am 9abd7a33: am b799314e: Merge "Add SurfaceTexture docs for getTransformMatrix." into honeycomb
...
* commit '9abd7a33009567a5f0da090fbf96f9cde389a7b8':
Add SurfaceTexture docs for getTransformMatrix.
2011-01-31 15:02:46 -08:00
Svetoslav Ganov
be17a7f269
Set time dialog display changes AM/PM at 1 instead of 12
...
bug:3408128
Change-Id: Ifb17cbc0f448281cebb20296dcc58766cde02965
2011-01-31 15:02:26 -08:00
Jean-Baptiste Queru
74e5fe5909
am 5131763c: am 27badee3: (-s ours) am a6fb375c: am 056340ac: Merge "stubs"
...
* commit '5131763c58be3ac78a28532261cdc8fc3af010ef':
stubs
2011-01-31 15:01:25 -08:00
Jamie Gennis
4a702faf5b
am cf675303: am 8df2c424: Merge "Fix a multithreading bug in libagl\'s EGL." into honeycomb
...
* commit 'cf675303927d8008c5952759d534dcc6c0ca3d4a':
Fix a multithreading bug in libagl's EGL.
2011-01-31 15:01:21 -08:00
Dianne Hackborn
fe86a7f64c
am 723453a7: am e9da0c1d: Merge "Fix issue #3408542 : "resizeable" attribute required to get out of compat mode" into honeycomb
...
* commit '723453a7a77180b47720d3b5e8a9752349b77e2f':
Fix issue #3408542 : "resizeable" attribute required to get out of compat mode
2011-01-31 15:01:16 -08:00