Irfan Sheriff
1e8b3e4e76
am 11954872: am 5af3405f: am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2
...
* commit '1195487228e1eb6c8859368286168051bd505b2f':
Fix lease duration handling
2011-06-15 14:10:51 -07:00
Irfan Sheriff
1195487228
am 5af3405f: am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2
...
* commit '5af3405f0d24c853bd10eb239c081e31972d3e1d':
Fix lease duration handling
2011-06-15 14:07:54 -07:00
Irfan Sheriff
5af3405f0d
am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2
...
* commit 'ecda5461603b6de77beb045dfdf82dad7ae48d61':
Fix lease duration handling
2011-06-15 14:04:23 -07:00
Marco Nelissen
181aafd75c
am 9c3c3004: am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp
...
* commit '9c3c3004c4206da3f2579e863ce89a2f99269dd6':
Ignore duplicate WAP push PDU source/destination port if configured
2011-06-15 13:44:56 -07:00
Martijn Coenen
554344ee74
Merge "Added vcard query parameter for not attaching photo."
2011-06-15 13:31:53 -07:00
Irfan Sheriff
56878760c3
Fix lease duration handling
...
Convert lease time in seconds to long before alarm
set up and add sanity check
Change-Id: I99524c97d9a643ffa8234d016d0e819a284977a1
2011-06-15 12:58:18 -07:00
Marco Nelissen
9c3c3004c4
am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp
...
* commit 'd8f9a83cab34de38981dc3ba5ca9df8dda02dbc0':
Ignore duplicate WAP push PDU source/destination port if configured
2011-06-15 12:20:57 -07:00
Chia-chi Yeh
f8905fd13d
VPN: change some strings in VPN notifications.
...
Also remove a small piece of dead code.
Change-Id: Idd10f3d72a92228951278bf360d08ba9bede02d2
2011-06-15 11:06:52 -07:00
Debashish Chatterjee
45d937ed0a
Merge "Modified Voicemail.SOURCE_DATA value to match with the constant name."
2011-06-15 10:45:03 -07:00
Jeff Sharkey
1274f2b46c
Merge "Include template in data warning/limit intents."
2011-06-15 10:36:22 -07:00
Fabrice Di Meglio
0acb8d3011
Merge "Fix Gravity start/end"
2011-06-15 10:34:09 -07:00
Jeff Sharkey
14711eb5b6
Include template in data warning/limit intents.
...
When launching warning/limit UI, include the template that triggered
the notification. Also move actions and extra into contract class.
Change-Id: Id2e63fd2d2e36a137a3fd8f889c7256038ca5f2e
2011-06-15 10:29:17 -07:00
Elliott Hughes
c905dd3e92
Merge "de_DE "Mai" isn't an abbreviation."
2011-06-15 10:24:29 -07:00
Gilles Debunne
0656bc32fa
Merge "Bug 4579629. Send before and after text when suggestion is picked."
2011-06-15 09:46:55 -07:00
John Reck
194369721a
Merge "Support for getting the background color"
2011-06-15 09:12:14 -07:00
Marco Nelissen
d8f9a83cab
resolved conflicts for merge of d027329c to gingerbread-plus-aosp
...
Change-Id: I169c415bf998b9935ab36812511573db05717b91
2011-06-15 08:58:38 -07:00
Martijn Coenen
037d3ffa20
Added vcard query parameter for not attaching photo.
...
Change-Id: Ia4968ba54d00c368240f50fa43bcc647ccf2c199
2011-06-15 16:07:22 +02:00
Narayan Kamath
ed2ea731e5
Merge "Fix a bug in TextToSpeech."
2011-06-15 05:43:34 -07:00
Debashish Chatterjee
7658408160
Modified Voicemail.SOURCE_DATA value to match with the constant name.
...
Change-Id: I3a83b553ace640a91cd07e89785d52d5b7cd86ca
2011-06-15 13:22:34 +01:00
Narayan Kamath
d0648ed060
Fix a bug in TextToSpeech.
...
Check that the requested engine is enabled.
Change-Id: I8436b0b7b7f441fe3473601fb9c46181e90750e0
2011-06-15 12:35:51 +01:00
Jeff Sharkey
497e4437af
Data usage warning and limit notifications.
...
Watch for network statistics to cross NetworkPolicy warning or limit,
and show notifications to user as needed. Currently checks during
any statistics update, but will eventually move to event registration
through netd when kernel supports.
Fixed accounting bug in getSummaryForNetwork(). Only apply UID policy
to applications; applying to system processes could break critical
services like RIL.
Change-Id: Iac0f20e910e205f3cbc54ec96395ff268b1aa379
2011-06-14 22:43:08 -07:00
Adam Powell
484a6c5b24
Merge "Make FastScroller behave kinder and gentler when an app decides to return null from SectionIndexer#getSections()"
2011-06-14 22:11:26 -07:00
Jeff Brown
5ab3cbc9d8
Merge "Add support for disabling pointer gestures."
2011-06-14 22:08:50 -07:00
Jeff Brown
474dcb5c3d
Add support for disabling pointer gestures.
...
Made it possible for individual windows to disable pointer gestures
while the window has focus using a private API.
Cleaned up the InputReader configuration code to enable in-place
reconfiguration of input devices without having to reopen them all.
This change makes changing the pointer speed somewhat nicer since the
pointer doesn't jump back to the origin after each change.
Change-Id: I9727419c2f4cb39e16acb4b15fd7fd84526b1239
2011-06-14 22:07:31 -07:00
Adam Powell
f49971ec06
Make FastScroller behave kinder and gentler when an app decides to
...
return null from SectionIndexer#getSections()
Change-Id: I9132073f149e13051db13d2e563bd7c1a316046e
2011-06-14 22:00:01 -07:00
Jaikumar Ganesh
c04c457eb7
Merge "Refactor Bluetooth Profile."
2011-06-14 21:33:03 -07:00
Jaikumar Ganesh
f8789167e9
Refactor Bluetooth Profile.
...
Move connect / disconnect / set and get priority
functions down the interface as they are not generic enough
for all profiles.
Change-Id: I2656e1bdbc8046c53bb0dfbd9172f5f10b57aa7d
2011-06-14 21:29:52 -07:00
Dianne Hackborn
15856f7b62
am 27bad6f3: am baa89d38: am f930232f: Fix a major problem in fragment lifecycle.
...
* commit '27bad6f33b98e8d7417a6ce4d7f09b2fa1146379':
Fix a major problem in fragment lifecycle.
2011-06-14 21:01:45 -07:00
Dianne Hackborn
27bad6f33b
am baa89d38: am f930232f: Fix a major problem in fragment lifecycle.
...
* commit 'baa89d3839f70bd31e5219c636ac24a4cc29928d':
Fix a major problem in fragment lifecycle.
2011-06-14 20:57:48 -07:00
Amith Yamasani
0daf40ca9a
am 2bcd9c6e: am eb5e633a: am 608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
...
* commit '2bcd9c6e7b4fe6c465811e9b8ac48acec23cb341':
Stability fixes for PreferenceFragments.
2011-06-14 20:56:23 -07:00
Dianne Hackborn
baa89d3839
am f930232f: Fix a major problem in fragment lifecycle.
...
* commit 'f930232fd1c8d301d91853c8fe5dca43979ac807':
Fix a major problem in fragment lifecycle.
2011-06-14 20:54:40 -07:00
Dianne Hackborn
f930232fd1
Fix a major problem in fragment lifecycle.
...
When animating away a fragment, we were not putting it through
the last part of its lifecycle (onDestroy() etc).
Also, retained fragments that have a target were broken. Oops.
Change-Id: I5a669b77a2f24b581cde2a0959acf62edb65e326
2011-06-14 20:47:44 -07:00
Dianne Hackborn
938ef7aeb7
Merge "resolved conflicts for merge of e95c07bd to master"
2011-06-14 20:41:27 -07:00
Adam Powell
c391a9888c
Merge "Fix bug 4521549 - Crash in ScrollingTabContainerView, when using a tab with null text"
2011-06-14 20:29:03 -07:00
Adam Powell
251df77861
Fix bug 4521549 - Crash in ScrollingTabContainerView, when using a tab
...
with null text
Change-Id: I6c287c95bafa732018048c11933ddba82fa26d9f
2011-06-14 20:24:34 -07:00
Eric Rowe
7af75afb2c
Fix external storage bug for BT stress tests
...
Change-Id: Ib6cfe80449037cfee5072145fb3a4ae0e79abf06
2011-06-14 17:26:44 -07:00
Romain Guy
85407fac7b
Merge "Add TextureView.getBitmap()"
2011-06-14 17:08:36 -07:00
Fabrice Di Meglio
67f8de04fc
Fix Gravity start/end
...
- fix missing attribute value change
- update BiDiTest app
Change-Id: I0bb8a1ebf0b6097b7b8d488580fea6e882202e23
2011-06-14 17:08:32 -07:00
Nick Pelly
15329918e6
Merge "minor documentation fixes"
2011-06-14 17:06:54 -07:00
Romain Guy
77a811610f
Add TextureView.getBitmap()
...
This API can be used to get a Bitmap copy of the content of a
TextureView.
Change-Id: I07522216c353720fba5cab333174f58f484eb911
2011-06-14 17:06:53 -07:00
Ben Dodson
542f2409d9
minor documentation fixes
...
Change-Id: I8ff5ad7c310fdbf0ade9d66e075d09e293182b89
2011-06-14 16:40:23 -07:00
Fabrice Di Meglio
e460e6d718
Merge "Add View.getResolvedLayoutDirection()"
2011-06-14 16:23:06 -07:00
Fabrice Di Meglio
c0053223be
Add View.getResolvedLayoutDirection()
...
- update Callback2 interface
- update Gravity.getAbsoluteGravity() and Gravity.apply() to be more generic
by changing "boolean isRtl" parameter to "int layoutDirection"
- fix BiDiTests for RTL FrameLayout
Change-Id: I97bb456c22d5fd3ecb34f08564ce4dbed37e7459
2011-06-14 16:16:39 -07:00
Dianne Hackborn
3fe9cc5ea6
resolved conflicts for merge of e95c07bd to master
...
Change-Id: I9af0c08a9f1c1f68661efe051a66835e850b76f6
2011-06-14 16:13:26 -07:00
John Reck
9b90d553bb
Support for getting the background color
...
Change-Id: I58a52f79e5a50dbb2cd1ba81d13e95ed9a1b7095
2011-06-14 15:53:46 -07:00
Amith Yamasani
2bcd9c6e7b
am eb5e633a: am 608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
...
* commit 'eb5e633a2488456874f829263fa6cb96588d25aa':
Stability fixes for PreferenceFragments.
2011-06-14 15:42:36 -07:00
Amith Yamasani
eb5e633a24
am 608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
...
* commit '608a200d2ed19540bb356d54e96f72c8c6b089b1':
Stability fixes for PreferenceFragments.
2011-06-14 15:38:31 -07:00
Amith Yamasani
608a200d2e
Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
2011-06-14 15:35:13 -07:00
Dianne Hackborn
e95c07bd8a
am 7c7f8e18: am 0a8a2324: Merge "Fix issue #4603422 : Compatibility mode button doesn\'t always update" into honeycomb-mr2
...
* commit '7c7f8e18dee8b582ec8e30a1412903ceec2ef5f5':
Fix issue #4603422 : Compatibility mode button doesn't always update
2011-06-14 15:22:12 -07:00
Dianne Hackborn
7c7f8e18de
am 0a8a2324: Merge "Fix issue #4603422 : Compatibility mode button doesn\'t always update" into honeycomb-mr2
...
* commit '0a8a2324239d7604e2a68349585aa67b59b25f4c':
Fix issue #4603422 : Compatibility mode button doesn't always update
2011-06-14 15:14:34 -07:00