55185 Commits

Author SHA1 Message Date
Daniel Sandler
d5b858639c Update large icon in changed status bar notifications.
Reapply fix from change I6bb72c0b to phones.

Bug: 5071157
Change-Id: I9da5ee6cf72b148e5fef4de6e1c9328ccb4b28b8
2011-07-25 20:28:41 -04:00
satok
142d7575b5 [step4] Change service interface
Change-Id: Iaf86065a2a7f075c670ebdaa60a33a815dcb8113
2011-07-25 11:01:49 +09:00
satok
54e677ffb0 Merge "[Step 2] Add apis for spell checker settings" 2011-07-24 18:47:50 -07:00
satok
562ab585f9 [Step 2] Add apis for spell checker settings
Bug: 5057977

Change-Id: I4617b7f1487349c5de385e7392dbc39c69fa2ebc
2011-07-25 10:23:52 +09:00
Daisuke Miyakawa
c82cc94db0 Merge "Introduce param/column for group count" 2011-07-24 17:53:47 -07:00
Daisuke Miyakawa
15dec3967e Introduce param/column for group count
Bug: 5039532
Change-Id: Ibc604770cb61ca9fd92280e58f1cd1bbf30c216a
2011-07-24 17:43:03 -07:00
Irfan Sheriff
17b8451019 Merge "Fix interface notification race" 2011-07-24 17:14:12 -07:00
James Dong
e432a00051 Merge "Do not wait forever for output buffers in OMXCodec.cpp and error out in case time out happens" 2011-07-24 14:40:08 -07:00
Irfan Sheriff
e8daf2a700 Fix interface notification race
In one use case, I see that if we go straight from
wifi client mode to tethering operation, the interface change notifications
are reported in an order that causes to enter tethered state
without actually tethering through connectivity service.

It is because an interface down notification (from wifi going down) comes after
we have started soft ap and we think we have tethered after calling startTethering
and switch to Tethered state

Instead, we should make sure tethering has started before going to Tethered state.

Change-Id: Iba7e8fab0feeb5637d40938862a8638871df8b02
2011-07-24 14:35:03 -07:00
Jean-Michel Trivi
d40e2c67ed Merge "QueryCodecs() signature change" 2011-07-24 12:59:35 -07:00
repo sync
da6e4a7d9d Merge "Updated: Wi-Fi p2p framework" 2011-07-24 12:57:17 -07:00
Gloria Wang
508e86e757 Merge "Do not change the number of bytes while converting 8-bit samples to 16-bit, because this number will be used later to calculate mCurrentPos. Fix for bug 5063703." 2011-07-24 12:07:20 -07:00
repo sync
55bc5f3e04 Updated: Wi-Fi p2p framework
First stage. Get the bones in right now even though
we are not ready on the native side.

Once, we have things underneath working - we will further update the
framework

Change-Id: I4a7dab5cd4267373dc5f8989ae4122f91c384ed5
2011-07-24 10:08:47 -07:00
Wink Saville
895de9269f am 051660d4: am deb62be2: Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE
* commit '051660d4d6d293f4b561bc6a772c70aa077a578a':
  Configure RAT dependent retry pattern in GSM DCT.
2011-07-24 09:15:39 -07:00
Kazuhiro Ondo
d2dd1e657c am 9820a9d2: am 4281817f: Allow suggestedRetryTime to indicate no retry is needed.
* commit '9820a9d299dc46f2a9037866ddf61c4782cf9186':
  Allow suggestedRetryTime to indicate no retry is needed.
2011-07-24 09:13:52 -07:00
Wink Saville
051660d4d6 am deb62be2: Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE
* commit 'deb62be2e87b19e9bbbc668f8d9327b12dba4a3b':
  Configure RAT dependent retry pattern in GSM DCT.
2011-07-24 09:13:26 -07:00
Kazuhiro Ondo
9820a9d299 am 4281817f: Allow suggestedRetryTime to indicate no retry is needed.
* commit '4281817f6b624cb51926eb24fa78c68cd9431dce':
  Allow suggestedRetryTime to indicate no retry is needed.
2011-07-24 09:11:42 -07:00
Wink Saville
deb62be2e8 Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE 2011-07-24 09:11:28 -07:00
Kazuhiro Ondo
4281817f6b Allow suggestedRetryTime to indicate no retry is needed.
If suggestedRetryTime is 0x7fffffff then no retry is needed
and the framework should not initiate a retry.

Bug: 4949208
Change-Id: I3756ef6a3e93beec4ee95863cbc111b9952e5e06
2011-07-24 08:10:53 -07:00
Irfan Sheriff
e30c1307fb Merge "Handle hostapd and tether interface changes" 2011-07-23 22:30:36 -07:00
Irfan Sheriff
23eb297c77 Handle hostapd and tether interface changes
The set config will only update hostapd config file right now and we need to restart after that happens.

Also, softap interface is changed to be the regular interface

Bug: 5069108
Change-Id: Ibe80129b58e5339f06f186870bcd8f37569c6db3
2011-07-23 21:06:57 -07:00
Svetoslav Ganov
2182a3b642 Merge "TwoStatePreference does not fire click events." 2011-07-23 19:38:47 -07:00
Mike Lockwood
5db7af968a Merge "Fix USB tethering" 2011-07-23 19:36:32 -07:00
Mike Lockwood
6c2260b3af Fix USB tethering
The previous approach no longer works with the new USB drivers, since the usb0
interface is no longer enabled by default.
This introduced a chicken & egg problem - usb0 will not be enabled until the
user tries to start tethering, but Settings will not enable the checkbox unless
usb0 is enabled.
To fix this we add an explicit call to start USB tethering in the connectivity manager.
This will enable RNDIS if necessary and then bring up tethering once usb0 is enabled.

Change-Id: Iae1f733366aa6b0dafa66d4c97207794173ef54b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-23 21:57:55 -04:00
Kazuhiro Ondo
789df167fa Configure RAT dependent retry pattern in GSM DCT.
In case GSM DCT is used with EHRPD, retry pattern should follow
the ones for CDMA.

Bug: 5058426
Change-Id: Id9badc9ac14fb20ac62c1746061f056fa2f9ed1b
2011-07-23 13:48:12 -07:00
satok
ab45c768bc Merge "Tweak APIs for SpellChecker" 2011-07-22 23:17:51 -07:00
satok
1bedd99761 Tweak APIs for SpellChecker
1. Move getSupellcheckerInfo to SpellCheckerSession
2. Change the interface of getSpellCheckerSession
3. Remove a flag in SuggestionsInfo

Change-Id: I3debe09e213fc0ab74618eb3504383f2a9447fd9
2011-07-23 14:56:04 +09:00
satok
b54ac4ab5b Merge "Display the current ime and subtype name in the ongoing notification" 2011-07-22 20:14:27 -07:00
satok
5bc8e732bd Display the current ime and subtype name in the ongoing notification
Bug: 4903422
Change-Id: I3eaeb3decb75f687ad2af0d80340b819229c3ebe
2011-07-23 12:07:38 +09:00
Fabrice Di Meglio
da89e57130 Merge "Code cleaning" 2011-07-22 19:24:52 -07:00
Svetoslav Ganov
5c3ea06a7a TwoStatePreference does not fire click events.
1. Event were send in onBindView but since we have fixed the bug
   of unattached views firing accessibility events and there is
   no guarantee that the view is attached in onBindView no events
   were sent. Now posting a runnable so on the next run the UI
   tread will send the event i.e. after the view is bound and
   attached.

bug:5008841

Change-Id: I4ed914f7fb65d6896f0c55e7c46e6508d2b2f11f
2011-07-22 18:58:28 -07:00
Fabrice Di Meglio
d794acaa6b Code cleaning
- this was a bit ugly, isnt it?

Change-Id: Ic479c180977d73d333afed7696b2920840d92abf
2011-07-22 18:19:36 -07:00
James Dong
aba28e7fec Merge "Deprecate two methods in MediaRecorder.java class" 2011-07-22 17:59:10 -07:00
Chia-chi Yeh
a7cb825494 Merge "VPN: increase timeout period to 60 seconds for legacy VPN." 2011-07-22 17:14:50 -07:00
Svetoslav Ganov
54c29cf1d1 am 3e930dba: (-s ours) am d1b4c10f: Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE
* commit '3e930dba58442776b3c921b3dc1980fdba2caed9':
  DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.
2011-07-22 17:10:32 -07:00
Svetoslav Ganov
3e930dba58 am d1b4c10f: Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE
* commit 'd1b4c10fedc04384f40ba7fc30115a1380ce014f':
  DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.
2011-07-22 17:07:28 -07:00
Svetoslav Ganov
d1b4c10fed Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE 2011-07-22 17:05:26 -07:00
Romain Guy
c69aea2409 Merge "Fix the build" 2011-07-22 16:46:59 -07:00
Romain Guy
c9bcebe969 Fix the build
Change-Id: Icdf7e25fff5f1dc0836e67368f6797b60164e8ae
2011-07-22 16:46:34 -07:00
Pannag Sanketi
65cdc2b7b6 Merge "Connect MediaRecorder Native to SurfaceMediaSource" 2011-07-22 16:42:41 -07:00
Jamie Gennis
bbb85c8e4e Merge changes Ibd261f7b,Ifdd234ef,I0e2f0bc3
* changes:
  SurfaceTexture: add the abandon method.
  SurfaceTexture: add a deadlock scenario test
  SurfaceMediaSource: remove getAllocator method
2011-07-22 16:24:03 -07:00
Romain Guy
5bae58dff9 Merge "Nested alpha animations should cause invalidates too Bug #5041061" 2011-07-22 16:04:00 -07:00
Romain Guy
d4745a689f Nested alpha animations should cause invalidates too
Bug #5041061

Change-Id: I96835449b6b5537872afda90956c5d06d826e841
2011-07-22 16:03:07 -07:00
Chia-chi Yeh
7ef8611b5f VPN: increase timeout period to 60 seconds for legacy VPN.
Some VPN needs more time than others in order to create the secure tunnel.
For example, L2TP/IPSec PSK on average needs 15 seconds on WiFi. On mobile
connection, variation gets larger, and it sometimes needs more than 30
seconds. This change increases timeout period from 30 to 60 seconds.

Change-Id: I6006fd254a7bc91c22f63d2f3f20ea79ee9b05e2
2011-07-22 15:46:52 -07:00
Mathias Agopian
556d0476e1 Merge "Fix typo which caused invalid rotations to be returned with NATIVE_WINDOW_TRANSFORM_HINT" 2011-07-22 15:27:47 -07:00
Mathias Agopian
a5ed1454c4 Fix typo which caused invalid rotations to be returned with NATIVE_WINDOW_TRANSFORM_HINT
Bug: 4487161
Change-Id: Ib2dfbbef15397b6d90695bd27f25849ca20704f1
2011-07-22 15:25:20 -07:00
Jean-Michel Trivi
a05f099301 QueryCodecs() signature change
Restore QueryCodecs() signature exactly as used by third-party libs.
Add an alternative function to select HW only codecs.

Change-Id: Ibb2cb4dd36fc0c6599eb93aa5751c216397e3b6f
2011-07-22 14:51:51 -07:00
Gloria Wang
75cfd5b879 Do not change the number of bytes while converting 8-bit samples to 16-bit,
because this number will be used later to calculate mCurrentPos.
Fix for bug 5063703.

Change-Id: I75a78ef694482aa426d82a6c5f3d2ce570a9c19e
2011-07-22 14:42:28 -07:00
Adam Powell
c97b1c227a Merge "Fix bug 5027071 - Action menu parent consistency" 2011-07-22 14:28:39 -07:00
Jamie Gennis
5ef59bc764 SurfaceTexture: add the abandon method.
This change adds the 'abandon' method to the SurfaceTexture C++ class.
This method may be used to put the SurfaceTexture in an abandoned state,
causing all ISurfaceTexture methods to fail.

Change-Id: Ibd261f7b73f44e2bec36a8508bf92113cfb7cf95
2011-07-22 14:20:41 -07:00