65034 Commits

Author SHA1 Message Date
Eric Fischer
24783fcfb7 Import revised translations. DO NOT MERGE
Change-Id: I06d796d48b50c6a459b6ae8a6dad47730126a49d
2011-12-08 10:31:25 -08:00
The Android Open Source Project
e51c8af93b am 641a5624: Reconcile with ics-mr0-release
* commit '641a5624075ee942b85b17646b57f65377567a06':
  More fixing for issue #5366535: Lockscreen has wrong layout...
  DO NOT MERGE.  Integrate from MR 1 to fix issue #5366535: Lockscreen...
2011-12-08 10:29:00 -08:00
The Android Open Source Project
641a562407 Reconcile with ics-mr0-release
Change-Id: I2b2afc572c36ef210d81af16bd2e52cecdd94079
2011-12-08 10:26:33 -08:00
Gilles Debunne
99324606d1 am a5a98a03: Merge "IOOB is Suggestions" into ics-mr1
* commit 'a5a98a034b4d52c6bbc75e72f74f1a6ea1c61ed5':
  IOOB is Suggestions
2011-12-08 10:01:34 -08:00
Gilles Debunne
2a5a9b4332 am 89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1
* commit '89f2e8a099c32cdbb8409482fe91dabea5a7673e':
  Prevent NPE in SuggestionSpan
2011-12-08 10:01:33 -08:00
Gilles Debunne
a5a98a034b Merge "IOOB is Suggestions" into ics-mr1 2011-12-08 09:59:44 -08:00
Gilles Debunne
89f2e8a099 Merge "Prevent NPE in SuggestionSpan" into ics-mr1 2011-12-08 09:59:29 -08:00
Jeff Tinker
44e73eee08 am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
* commit 'a693a4b5553584a01b8b6b3640dc0393d2d88f28':
  Fix ANRs due to Widevine DRM plugin sniff taking too long.
2011-12-08 00:16:15 -08:00
Jeff Tinker
a693a4b555 Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 2011-12-08 00:13:43 -08:00
Jeff Brown
77741e8a1e am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1
* commit '8e0ecbfc97606ea30d0d8216fea635888f766b9d':
  Shortcut keys should be handled on down, not up.
2011-12-07 23:30:53 -08:00
Jeff Brown
216cc49c5f am e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1
* commit 'e0e9fd981ca71aeaa45c888485c11788456bd838':
  Fix system hotkey handling.
2011-12-07 23:30:51 -08:00
Jeff Brown
8e0ecbfc97 Merge "Shortcut keys should be handled on down, not up." into ics-mr1 2011-12-07 23:29:52 -08:00
Jeff Brown
e0e9fd981c Merge "Fix system hotkey handling." into ics-mr1 2011-12-07 23:29:45 -08:00
Jeff Brown
7bedf24490 Shortcut keys should be handled on down, not up.
Bug: 5720360
Change-Id: I3afc278e576ea992c76f024c8b6bad14b214239c
2011-12-07 21:37:19 -08:00
Jeff Brown
68b909d8ac Fix system hotkey handling.
Fixed a problem where the key up for the ALT or META key was not
delivered to the task switcher dialog because it was deemed
to be inconsistent with the window's observed state.  Consequently
the dialog would not be dismissed when the key was released.

Moved global hotkey handling for META+* shortcuts and ALT/META-TAB
into the window manager policy's interceptKeyBeforeDispatching
method.  This change prevents applications from hijacking these
keys.

The original idea was that these shortcuts would be handled only
if the application did not handle them itself.  That way certain
applications, such as remote desktop tools, could deliberately
override some of these less important system shortcuts.
Unfortunately, that does make the behavior inconsistent across
applications.  What's more, bugs in the onKeyDown handler of
applications can cause the shortcuts to not work at all, for
no good reason.

Perhaps we can add an opt-in feature later to enable specific
applications to repurpose these keys when it makes sense.

Bug: 5720358
Change-Id: I22bf17606d12dbea6549c60d20763e6608576cf7
2011-12-07 21:37:16 -08:00
Dave Burke
86436a3ed0 am ef8913c0: Merge "Remove dangerous and useless optimization Bug #5525888" into ics-mr1
* commit 'ef8913c035e679ea8b8891e26db1fa571e9b9d54':
  Remove dangerous and useless optimization Bug #5525888
2011-12-07 20:41:49 -08:00
Dave Burke
ef8913c035 Merge "Remove dangerous and useless optimization Bug #5525888" into ics-mr1 2011-12-07 20:40:10 -08:00
Jeff Tinker
d0d19db1ca Fix ANRs due to Widevine DRM plugin sniff taking too long.
Add a Widevine-specific format sniffer to avoid having to
refetch data from the remote server.

Change-Id: I5fdb21fe7a0d6e74f2a6f06e6fbf8070b068ac60
related-to-bug: 5725548
2011-12-07 20:23:20 -08:00
Scott Main
2c76efc514 Created Android University lesson for Multiple APKs.
Change-Id: I577f76f7b40069d3d5300cf0d40bedb2ab775821
2011-12-07 20:21:38 -08:00
Wink Saville
41fcce6101 am 234a5ef6: Merge "When the SIM_READY set current preferred network type." into ics-mr1
* commit '234a5ef66275087aff9cfb94adc7608e9f358f11':
  When the SIM_READY set current preferred network type.
2011-12-07 20:17:24 -08:00
Wink Saville
234a5ef662 Merge "When the SIM_READY set current preferred network type." into ics-mr1 2011-12-07 20:15:45 -08:00
Wink Saville
975d348c18 When the SIM_READY set current preferred network type.
This looks to fix a problem where the nv_data.bin file
file gets corrupted. When greping a radio log for "md5" if something
like following is seen:

  RIL(s)  : load_md5_state: MD5 state 1
  RIL(s)  : check_md5:
  RIL(s)  : compute_md5: path /efs/nv_data.bin
  RIL(s)  : check_md5: MD5 fail. orignal md5 '628647a8e5c6cac2d586199417c0103c' computed md5 '58a635cbaf5fe4ffb2797aeaa2b32709' (rild)
  RIL(s)  : check_md5:
  RIL(s)  : compute_md5: path /efs/.nv_data.bak

It means that corruption was detected and a back version was used
which is ok. Apparently that backup version can have the default
network type revert to 2G only thus causing the symptoms reported
in b/5695729 where after taking an OTA 2G becomes the default.

By calling setCurrentPreferredNetworkType when the sim is ready we
can reset the the network type to 3G.

Note: I also tried calling setCurrentPreferredNetworkType in
EVENT_RADIO_AVAILABLE but that didn't work and we would see
the response to setPreferredNetworkType failing as the ril wasn't ready.

  RILJ    : setCurrentPreferredNetworkType: 0
  RILJ    : [0004]> REQUEST_SET_PREFERRED_NETWORK_TYPE : 0
  RILJ    : [0004]< REQUEST_SET_PREFERRED_NETWORK_TYPE error: com.android.internal.telephony.CommandException: RADIO_NOT_AVAILABLE


Bug: 5695729
Change-Id: Ibbd29cda0b201a8c08f4dcfa5cec211611e1d599
2011-12-07 20:07:54 -08:00
Jaikumar Ganesh
ddf8a0e629 am d426c338: Merge "Reduce likelihood of crash in state machine." into ics-mr1
* commit 'd426c338a66f63f8e5528ac38ec5b61625f2c897':
  Reduce likelihood of crash in state machine.
2011-12-07 19:51:26 -08:00
Jaikumar Ganesh
d426c338a6 Merge "Reduce likelihood of crash in state machine." into ics-mr1 2011-12-07 19:50:03 -08:00
Svetoslav Ganov
234484a9fb NumberPicker getting stuck if scroll wheel not wrapable.
1. If the number picker was not wrapping the selector wheel
   it was incorrectly initializing the fling scroller and
   the error was proportional to the difference of the
   current value and the max size. As a result if the number
   picker gets stuck for a very long time.

2. The alpha of the selector wheel paint was not reset on
   every subsequent fling so if the wheel was fading out
   and a new fling is performed the selector wheel is
   dimmed during the fling, rather bright.

bug:5728363

Change-Id: Ia90a6af86f162bda1b28f43f7ba7e4a9f5051b78
2011-12-07 19:35:15 -08:00
Romain Guy
c7ee3cab56 Remove dangerous and useless optimization
Bug #5525888

Change-Id: I553828c0da09b15d0dce3727e4c26a9d0bcf72ea
2011-12-07 19:10:04 -08:00
John Wang
7be6a4fd7f am ca0a68cc: Merge "Correct the dialing number of structured MMI." into ics-mr1
* commit 'ca0a68cc8afd023c94bcd5a1f3f2b2f9407fbe3b':
  Correct the dialing number of structured MMI.
2011-12-07 18:51:20 -08:00
John Wang
ca0a68cc8a Merge "Correct the dialing number of structured MMI." into ics-mr1 2011-12-07 18:49:28 -08:00
Gilles Debunne
035b9c4099 am 2df13452: Merge "Insert into user dict with the correct locale" into ics-mr1
* commit '2df13452e05745a3da624c34018da983173c32c4':
  Insert into user dict with the correct locale
2011-12-07 18:42:07 -08:00
Gilles Debunne
2df13452e0 Merge "Insert into user dict with the correct locale" into ics-mr1 2011-12-07 18:41:04 -08:00
Jaikumar Ganesh
a544d467f2 Reduce likelihood of crash in state machine.
Reduce likelihood of crash when state machine has quit and someone
sends a message using one of the public functions.

Bug: 5724844

Change-Id: I6582a1d19113e6ed545c8ab20adb0a414d8784a7
2011-12-07 18:07:29 -08:00
Adam Powell
b723999beb am cf6a6522: Merge "Raise touch slop value from previous experiment" into ics-mr1
* commit 'cf6a6522fdbce05896d3a551f7cd6243857ceced':
  Raise touch slop value from previous experiment
2011-12-07 17:57:16 -08:00
Adam Powell
cf6a6522fd Merge "Raise touch slop value from previous experiment" into ics-mr1 2011-12-07 17:55:35 -08:00
Adam Powell
6720a87ad1 Raise touch slop value from previous experiment
Change-Id: I7681c401803643f309fd988824602169a830de29
2011-12-07 17:53:46 -08:00
Daniel Sandler
751004993f am 29933fb2: Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1
* commit '29933fb26a4294a9bd30f9227809e28949252833':
  Improve handling of small largeIcons in tablet ticker.
2011-12-07 17:42:09 -08:00
Daniel Sandler
29933fb26a Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1 2011-12-07 17:40:07 -08:00
Joe Malin
549b55ba70 am aa2719df: am 3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
* commit 'aa2719df72225402737009b1cc2e3cfea8e74bc7':
  DOC CHANGE: Add text for android.os.storage
2011-12-07 17:14:44 -08:00
Dianne Hackborn
289df55523 am 0e385ee4: am b32785c6: Merge "More fixing for issue #5366535: Lockscreen has wrong layout..." into ics-mr0
* commit '0e385ee4de901f4c509374fad5bc040a2ac80721':
  More fixing for issue #5366535: Lockscreen has wrong layout...
2011-12-07 17:14:42 -08:00
Dianne Hackborn
36246f4c4e am b259c04d: Merge "Merge commit \'eee12419\' into manualmerge" into ics-mr1
* commit 'b259c04d4321536ef9f5cc9b55079d3bd450eef7':
  DO NOT MERGE.  Integrate from MR 1 to fix issue #5366535: Lockscreen...
2011-12-07 17:12:39 -08:00
Joe Malin
aa2719df72 am 3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
* commit '3937e055708a8618f184feab204fed4bb41f3f6e':
  DOC CHANGE: Add text for android.os.storage
2011-12-07 17:11:59 -08:00
Dianne Hackborn
0e385ee4de am b32785c6: Merge "More fixing for issue #5366535: Lockscreen has wrong layout..." into ics-mr0
* commit 'b32785c6e893743956e28b285b8e6f6fc7aa8edb':
  More fixing for issue #5366535: Lockscreen has wrong layout...
2011-12-07 17:11:57 -08:00
Dianne Hackborn
b259c04d43 Merge "Merge commit 'eee12419' into manualmerge" into ics-mr1 2011-12-07 17:10:34 -08:00
Robert Greenwalt
12bee3b3e2 am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1
* commit 'fbb09ea84f7a9df94358f05f4e680cb363bae663':
  Fix NPE in trimV4AddrZeros.
2011-12-07 17:10:26 -08:00
Robert Greenwalt
fbb09ea84f Merge "Fix NPE in trimV4AddrZeros." into ics-mr1 2011-12-07 17:09:05 -08:00
Amith Yamasani
423900850f am 3b5555fc: Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1
* commit '3b5555fc4483f6813f3df4787d98dd5357851566':
  Make new ringer toggles on power menu accessible and navigable with keyboard.
2011-12-07 16:56:17 -08:00
Robert Greenwalt
0faacf0658 Fix NPE in trimV4AddrZeros.
Change-Id: Id6ab91dabce4a2adba02f2601bc1157e87b782c3
2011-12-07 16:55:38 -08:00
Amith Yamasani
3b5555fc44 Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1 2011-12-07 16:54:31 -08:00
Dianne Hackborn
185d0e7f0a More fixing for issue #5366535: Lockscreen has wrong layout...
...but corrects itself

Change upgrade window to not allow the device to rotate while it is shown.

Change-Id: I75b126ab8806b84a0351e2706ebea10570bde575
2011-12-07 16:42:14 -08:00
Dianne Hackborn
260fdd35c3 DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen...
...has wrong layout but corrects itself

Maybe fix issue #5405788: Device continuously opening and closing...

...the "Complete action using" dialog

I have never been able to reproduce this consistently, but here is
another stab in the twilight.  It looks like during boot we have
a potential race where we could reset the config sequence number after
we had gone through a config change, causing ActivityThread to ignore
a following config change.  Maybe this change will help.

Change-Id: I7199b6de370488e8d897d6a78ff6f15624da862c
2011-12-07 16:42:13 -08:00
John Wang
2690817815 Correct the dialing number of structured MMI.
According to TS 22.030 6.5.2 "Structure of the MMI", the dialing number
can not end with #. The format is like *SC*SI#DN. Correct the mmi pattern
to exclude DN# case. With this fix, processCode() will tread *NNN#DN#,
e.g. *400#16 digit number# in bug 5622718, as USSD and send via
RIL_REQUEST_SEND_USSD.

bug:5622718
Change-Id: Ifc8d0edff4308602a5f3fc651cf116bf6bad3cbc
2011-12-07 16:38:56 -08:00