Adam Cohen
dcf7cf4ca4
am 068b7f02: am 75b20380: Merge "Making default widget padding public API" into ics-mr1
...
* commit '068b7f02a35e969c1607f8a35c422c93ee72c8a3':
Making default widget padding public API
2011-11-09 21:50:54 +00:00
Robert Greenwalt
75f9808e55
am 604019c8: Merge "Fix build." into ics-mr1
...
* commit '604019c8d45b8c56cf48b03dbd92cfbdd29c48c1':
Fix build.
2011-11-09 19:34:50 +00:00
Adam Powell
c31c42abb6
am 8689afbd: Merge "Fix bug 5544103 - Spinner text doesn\'t look dimmed when disabled" into ics-mr1
...
* commit '8689afbd63db3b1af6058709da843ea9d6433b21':
Fix bug 5544103 - Spinner text doesn't look dimmed when disabled
2011-11-09 19:34:47 +00:00
Steve Block
d951473859
Merge "Clean up JavaDoc for WebView.addJavascriptInterface()"
2011-11-09 09:43:53 -08:00
Steve Block
4cd73c5bfd
Clean up JavaDoc for WebView.addJavascriptInterface()
...
Bug: 5461416
Change-Id: Ic83e0e4035f6230134e4f36938e53f106c468876
2011-11-09 17:04:49 +00:00
Robert Greenwalt
c1b3cbe164
resolved conflicts for merge of ea54b760 to master
...
Change-Id: Ifcdfd6ffd82db1293936a8a3b5715dd767fb43f8
2011-11-09 09:03:59 -08:00
Tom Taylor
81b10fd74e
am 1366c756: Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1
...
* commit '1366c756d28cdbb6c7c07959dfb4c93c81a9539d':
Add new secure setting for controlling Messaging notifications
2011-11-09 14:34:18 +00:00
Kristian Monsen
b69ce80383
Merge "Part of fix for bug 5584571 Add HTTP request header with app name"
2011-11-09 03:35:01 -08:00
Kristian Monsen
008c37d8f4
Part of fix for bug 5584571 Add HTTP request header with app name
...
Need the context to get the package name, adding it method here
that can be called from JNI.
Change-Id: I530d81d9d922ea73a3f9d185618a5c4cfde0aca7
2011-11-09 11:23:35 +00:00
Jeff Brown
319369f32f
Merge "Fix JavaDoc typos."
2011-11-08 20:41:09 -08:00
Jeff Brown
603f97f324
Fix JavaDoc typos.
...
Change-Id: Ieabcd5b89c89440f425917319225735445324765
2011-11-08 20:24:21 -08:00
Fabrice Di Meglio
5af447366d
Merge "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"
2011-11-08 15:55:41 -08:00
Adam Cohen
75b2038004
Merge "Making default widget padding public API" into ics-mr1
2011-11-08 10:53:39 -08:00
Robert Greenwalt
604019c8d4
Merge "Fix build." into ics-mr1
2011-11-08 10:31:37 -08:00
Robert Greenwalt
8588e47358
Fix build.
...
Missed a commit that fixed some issues.
bug:5237167
Change-Id: I61e44831e2c3f1cf613ca1387aa95d712b7d2ded
2011-11-08 10:12:25 -08:00
Adam Powell
8689afbd63
Merge "Fix bug 5544103 - Spinner text doesn't look dimmed when disabled" into ics-mr1
2011-11-08 10:06:00 -08:00
Robert Greenwalt
ea54b76085
Merge "Wimax : wimax framework related open source." into ics-mr1
2011-11-08 10:01:07 -08:00
Adam Powell
42b7e99b11
Fix bug 5544103 - Spinner text doesn't look dimmed when disabled
...
Pre-Holo spinners had a far more "buttony" look that expressed the
disabled state clearly, but Holo spinners are more subtle. As a result
we want to mark the contained view representing the current item as
disabled when the spinner itself is disabled.
Express this as a private framework style attribute that cannot be
changed at runtime.
Change-Id: Icff2ef2b8a3b1a96cbf00e4c75eda41a4dada7b3
2011-11-08 09:49:21 -08:00
Tom Taylor
1366c756d2
Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1
2011-11-08 09:00:22 -08:00
John Reck
e43a7c18ec
am 99015a24: Merge "Remove unnecessary memory allocations" into ics-mr1
...
* commit '99015a2464a40097c3e23e07cdf69da0f886aa66':
Remove unnecessary memory allocations
2011-11-08 16:41:32 +00:00
John Reck
99015a2464
Merge "Remove unnecessary memory allocations" into ics-mr1
2011-11-08 08:38:07 -08:00
Ed Heyl
ba1f05d4a8
am 9d6a5162: Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp"
...
* commit '9d6a51623fdabbe993d7b8848794607394ef7cc2':
Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp"
2011-11-08 14:04:18 +00:00
Ed Heyl
9d6a51623f
Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp"
...
This reverts commit ae5839dcad .
2011-11-08 05:58:37 -08:00
Narayan Kamath
f537b25a98
am 98f5500c: Merge "Fix a bug in the network TTS api." into ics-mr1
...
* commit '98f5500c71754dad428e00d569007e0b98dc8aee':
Fix a bug in the network TTS api.
2011-11-08 10:13:39 +00:00
Narayan Kamath
98f5500c71
Merge "Fix a bug in the network TTS api." into ics-mr1
2011-11-08 02:09:18 -08:00
Gilles Debunne
c4c13f9704
am 39896f52: Merge "No more context menu in TextView" into ics-mr1
...
* commit '39896f52a84947ffc2062a2584033ff749d90534':
No more context menu in TextView
2011-11-08 08:53:03 +00:00
Gilles Debunne
39896f52a8
Merge "No more context menu in TextView" into ics-mr1
2011-11-08 00:48:27 -08:00
Matthew Xie
bfd9783556
am 67f1ceb6: Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
...
* commit '67f1ceb616ced4ce9857ee24f43d3c9dd5b289a5':
Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp
2011-11-08 07:00:33 +00:00
Matthew Xie
67f1ceb616
Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
2011-11-07 22:42:00 -08:00
Adam Cohen
4c96a59b43
Making default widget padding public API
...
Change-Id: Ibf4f5dc1a36d84be1acc3ccdc4330276f82aa303
2011-11-07 17:59:23 -08:00
John Reck
aefc28a1b6
Remove unnecessary memory allocations
...
Bug: 5581637
Also delete some dead, unused code
Change-Id: If6efd11f5032141dadbfcd0b3215e89b464e5f35
2011-11-07 17:42:06 -08:00
John Reck
5bbe5e6ad5
am 669e1f80: Merge "Remove nativeRecordButtons" into ics-mr1
...
* commit '669e1f80a718dc2a4d259970b4e85b3c66e8ebc1':
Remove nativeRecordButtons
2011-11-07 23:25:13 +00:00
John Reck
669e1f80a7
Merge "Remove nativeRecordButtons" into ics-mr1
2011-11-07 15:20:38 -08:00
Svetoslav Ganov
e164bab6b8
Merge "NumberPicker does not hide IME when flinged."
2011-11-07 15:03:07 -08:00
Svetoslav Ganov
b52d9729bf
NumberPicker does not hide IME when flinged.
...
Now the IME is hiddedn once the user starts flinging since he is
using another method of updating the current value. This is now
consistent with the case of shown IME and poking the up/down
button.
bug:5174339
Change-Id: Id25934f394314a285b753f0bec7f422034ada90a
2011-11-07 15:02:10 -08:00
Adam Powell
b92a77b562
am b1dbf8e6: Merge "Change the "start deferred" fragment API to "user visible hint"" into ics-mr1
...
* commit 'b1dbf8e605c29ac00dde187579bd8ff8f18d7ba3':
Change the "start deferred" fragment API to "user visible hint"
2011-11-07 23:01:48 +00:00
Adam Powell
b1dbf8e605
Merge "Change the "start deferred" fragment API to "user visible hint"" into ics-mr1
2011-11-07 14:56:36 -08:00
tk.mun
148c7d0de7
Wimax : wimax framework related open source.
...
Integrate wimax network related changes into Android Framework.
- In Connectivity service, start wimax service.
- 4G icon display in StatusBarPolicy.
- DHCP renew add.
- Add radio for wiamx
Change-Id: I2d9012247edfdf49d71ca7e1414afd0006f330ca
Signed-off-by: tk.mun <tk.mun@samsung.com >
bug:5237167
2011-11-07 14:47:40 -08:00
Tom Taylor
03da2f00aa
Add new secure setting for controlling Messaging notifications
...
Bug 5552615
We're adding a new intent to allow 3rd party apps to disable
the Messaging app's notification. We want any app to be able to query
the setting of whether sms notifications are on or off, but only allow
system apps, particularly the Messaging app, to change that setting.
Other apps can change the setting by firing off an intent which brings
up a dialog activity in the Messaging app that'll let them turn off
Messaging notifications.
Change-Id: I4d2721191b86010efb383a24c28d911496440657
2011-11-07 14:16:44 -08:00
John Reck
99f7b7b7b2
Remove nativeRecordButtons
...
Bug: 5572238
Bug: 5558699
Change-Id: I8e275849f4f04c094a93528dd1fb59683d30e9cc
2011-11-07 14:00:05 -08:00
Adam Powell
78fed9b78f
Change the "start deferred" fragment API to "user visible hint"
...
Allow a fragment to set a hint of whether or not it is currently user
visible. This will be used implicitly to defer the start of fragments
that are not user visible until the loaders for visible fragments have
run. This hint defaults to true.
Change-Id: Id1349d319886a277ef07301f64f7b9e12c8729bf
2011-11-07 13:47:13 -08:00
Amith Yamasani
ff92dd69af
am 7919bfb1: Merge "Don\'t show the submit button when it isn\'t enabled." into ics-mr1
...
* commit '7919bfb12365b3f84e232235c35df957039995b7':
Don't show the submit button when it isn't enabled.
2011-11-07 19:01:22 +00:00
Amith Yamasani
7919bfb123
Merge "Don't show the submit button when it isn't enabled." into ics-mr1
2011-11-07 10:57:17 -08:00
Narayan Kamath
6c07a20285
Fix a bug in the network TTS api.
...
bug:5284966
Change-Id: I460bd12c27671ed42681fd4ccad567c08cb8f70f
2011-11-07 16:19:02 +00:00
Robert Greenwalt
08d153fb8e
am fd900f05: am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
...
* commit 'fd900f05fb67046b97701f20626f7fd408fd8990':
Start using IP tool for advanced routing.
2011-11-05 19:33:46 +00:00
Narayan Kamath
928f97b186
am eaa17b76: Merge "Add an API for querying / enabling network TTS support." into ics-mr1
...
* commit 'eaa17b768fcd2624cb5d46a76ade24ebe7e56957':
Add an API for querying / enabling network TTS support.
2011-11-05 19:33:11 +00:00
Chet Haase
2a639347ae
resolved conflicts for merge of aa4d2f69 to master
...
Change-Id: Iadb63ecf52d8bd2911276fa3db55a43c9c378620
2011-11-05 12:01:51 -07:00
Amith Yamasani
d291558b56
am d69c203c: Merge "Close suggestions cursor when SearchView is detached." into ics-mr1
...
* commit 'd69c203cd48c1d0d3be92fb0396656ee8adc1185':
Close suggestions cursor when SearchView is detached.
2011-11-05 16:40:07 +00:00
Flavio Lerda
2e428814cc
am 8f7d88cc: Merge "Add a query parameter to look-up a SIP address." into ics-mr1
...
* commit '8f7d88cc67e1c89c960b932ceafc60d378aa2ad6':
Add a query parameter to look-up a SIP address.
2011-11-05 16:40:01 +00:00
Robert Greenwalt
fd900f05fb
am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
...
* commit '348297abc0e03fb87a1d22465020b580d83fdd61':
Start using IP tool for advanced routing.
2011-11-04 22:55:30 +00:00