3136 Commits

Author SHA1 Message Date
Android (Google) Code Review
31390c7528 Merge change 4131 into donut
* changes:
  Fix the jni initializer.
2009-06-12 19:00:22 -07:00
Joe Onorato
03f4df4b3b Fix the jni initializer. 2009-06-12 18:59:25 -07:00
Android (Google) Code Review
be3615bded Merge change 4112 into donut
* changes:
  Fix bug #1812041: activity manager crash with bad args.
2009-06-12 18:03:11 -07:00
Android (Google) Code Review
bf0010b5e2 Merge change 4085 into donut
* changes:
  Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput.
2009-06-12 16:22:55 -07:00
Joe Onorato
1cf587496f Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput. 2009-06-12 16:21:24 -07:00
Eric Fischer
7351dd113f Use locale-appropriate formatting to display application sizes like "252KB".
In particular allow the French and Polish translators to put a space between
the number and the unit.
2009-06-12 16:06:37 -07:00
Dianne Hackborn
75b038545e Fix bug #1812041: activity manager crash with bad args.
There was old code that would kill the system process in some cases when there
was a bad activity token.  This is really no longer used, except in a few
places where it allows apps to kill the system.  So just get rid of it and
make the world a better place.
2009-06-12 15:43:26 -07:00
Ken Shirriff
7014a96145 Move meta feed handling to CalendarSyncAdapter
Removes obsolete LIVE_CONTENT_URI.  Now calendar list updates are obtained
through a sync.
bug=1886271
2009-06-12 15:43:00 -07:00
Android (Google) Code Review
6c98c13b2e Merge change 4104 into donut
* changes:
  Journal backup requests so that they won't be lost in a crash
2009-06-12 15:19:50 -07:00
Guang Zhu
903f311fdc Adjust order of file/section list in output diff 2009-06-12 15:03:45 -07:00
Cary Clark
f958fccf47 send click in webview before sending key
Add click check to passToJavaScript if webTextView
receives a key but the field does not yet have webkit focus.
2009-06-12 17:33:37 -04:00
Amith Yamasani
430555acae Add a Gservices setting to have a "use location for better search". 2009-06-12 14:19:00 -07:00
Scott Main
110b50ca51 AI 149839: make the home page's announcement block expandable...
primarily, this is to handle various lengths of text due to translations,
  but also allows us to be more flexible WRT the content for the top section.

Automated import of CL 149839
2009-06-12 14:02:42 -07:00
Christopher Tate
cde87f45e0 Journal backup requests so that they won't be lost in a crash
When an application requests a backup via dataChanged(), we now journal that
fact on disk.  The journal persists and is only removed following a successful
backup pass.  When the backup manager is started at boot time, it looks for any
existing journal files and schedules a backup for the apps listed in them, on
the expectation that the device shut down or crashed before a backup could be
performed.
2009-06-12 13:57:39 -07:00
Android (Google) Code Review
7504da0368 Merge change 4080 into donut
* changes:
  Fix data connection issues.
2009-06-12 13:46:00 -07:00
Jaikumar Ganesh
bbf7c00e06 Fix data connection issues.
a)Fix cleanup connection being called twice when switching to wifi.
b) Reset the reconnect timer when voice call ends and APN is changed.
2009-06-12 12:14:08 -07:00
Grace Kloba
7180efed89 Add <keygen> support for VPN. 2009-06-12 11:55:20 -07:00
Android (Google) Code Review
cca860fa6b am 3d4b7065: Merge change 4047 into donut
Merge commit '3d4b7065e960cdaecc8d9fd609c2e508a1f9d8f5'

* commit '3d4b7065e960cdaecc8d9fd609c2e508a1f9d8f5':
  Fix issue #899198	MODE_RINGER_STREAMS_AFFECTED does not restore volumes correctly
2009-06-12 11:43:59 -07:00
Android (Google) Code Review
5f80742306 am d670b8c6: Merge change 3981 into donut
Merge commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a'

* commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a':
  Removed trailing whitespaces.
2009-06-12 11:43:55 -07:00
Android (Google) Code Review
6599426f74 Merge change 4017 into donut
* changes:
  Make the date format preference work again.
2009-06-12 11:10:56 -07:00
Romain Guy
cafdea61a8 Fixes #1914574. An NPE could be causes in lists by ViewGroup.dispatchDraw().
ViewGroup was trying to access the AttachInfo without checking whether the
info object is null. The object can be null at varioous times in the lifecycle
of a list.
2009-06-12 10:51:36 -07:00
Romain Guy
763a572388 Hide gestures API. 2009-06-12 10:28:28 -07:00
Eric Fischer
3287695823 Make the date format preference work again.
It is only used for numeric dates -- spelled-out dates have such a complex
variety of formats that they can only be meaningfully formatted from
locale strings.

In addition, the preference is left null when initializing, on the assumption
that the locale will still specify a more useful numeric format than we can
guess as part of a build-wide configuration.

But if the user has specified a format, the date will be formatted in the
order they asked for, with locale-appropriate punctuation substituted in.
2009-06-12 10:06:24 -07:00
Android (Google) Code Review
451a37ed2d Merge change 3618
* changes:
  Fix bug 1875344 cut 2: adding option to show/noshow away presence when device is idle.
2009-06-12 10:03:18 -07:00
Ramanan Rajeswaran
e8939bb8f1 resolved conflicts for merge of a798dd86 to donut 2009-06-12 09:49:16 -07:00
Android (Google) Code Review
3d4b7065e9 Merge change 4047 into donut
* changes:
  Fix issue #899198	MODE_RINGER_STREAMS_AFFECTED does not restore volumes correctly
2009-06-12 08:33:59 -07:00
Android (Google) Code Review
d670b8c61e Merge change 3981 into donut
* changes:
  Removed trailing whitespaces.
2009-06-12 08:32:09 -07:00
Android (Google) Code Review
69b0db0654 am 83bb56c3: Merge change 3424 into donut
Merge commit '83bb56c389d003162093eef0aaee251cefc1deed'

* commit '83bb56c389d003162093eef0aaee251cefc1deed':
  Add the VPN services package, VPN service base classes and L2tpIpsecService.
2009-06-12 08:26:32 -07:00
Satish Sampath
64420d4f17 am 7f50c08f: Show proper suggestion item hilite on selection.
Merge commit '7f50c08fb998786a2963e979cd5b4347e64808e3'

* commit '7f50c08fb998786a2963e979cd5b4347e64808e3':
  Show proper suggestion item hilite on selection.
2009-06-12 08:26:25 -07:00
Android (Google) Code Review
bf85d63cb8 am 78f0f8cb: Merge changes 3953,3954 into donut
Merge commit '78f0f8cb2efe9410127c39201e240f6d438eb53c'

* commit '78f0f8cb2efe9410127c39201e240f6d438eb53c':
  Make the file backup helper not crash if a file you requested
  Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.
2009-06-12 08:26:05 -07:00
Android (Google) Code Review
32c79898c0 am e8966e12: Merge change 4008 into donut
Merge commit 'e8966e126388223de119c909d572fb8d1406a3ac'

* commit 'e8966e126388223de119c909d572fb8d1406a3ac':
  Fixes #1886237. Views drawing cache was not generated properly.
2009-06-12 08:25:54 -07:00
Android (Google) Code Review
3835736988 am f229aff1: Merge change 3967 into donut
Merge commit 'f229aff118dc53c3a06f0b4120d9ce22f4c2dd6e'

* commit 'f229aff118dc53c3a06f0b4120d9ce22f4c2dd6e':
  Update control files (pass/fail/nontext/crash) to results from CRB45
2009-06-12 08:25:35 -07:00
Android (Google) Code Review
fbca18574c am cb9534f9: Merge change 3907 into donut
Merge commit 'cb9534f92007b47d86cccc306dc75ca2d64bd197'

* commit 'cb9534f92007b47d86cccc306dc75ca2d64bd197':
  Support SMS cell broadcasting for GSM in RIL.java
2009-06-12 08:25:29 -07:00
Android (Google) Code Review
ea5f83f433 am 657c80b1: (-s ours) Merge change 3775 into donut
Merge commit '657c80b146f8d6319bf059f4aea2fce3b15a50b6'

* commit '657c80b146f8d6319bf059f4aea2fce3b15a50b6':
  DO NOT MERGE.
2009-06-12 08:24:51 -07:00
Eric Laurent
9bcf401d13 Fix issue #899198 MODE_RINGER_STREAMS_AFFECTED does not restore volumes correctly
The problem is that setRingerModeInt() does not handle streams not affected by ringer mode: when enabling "Alarm in silent mode" while in silent mode, setRingerModeInt is called after alarm streamis removed from ringer mode affected streams, and nothing is done.

The fix constists in also processing streams that are not affected by ringer mode and to restore last audible volume for them. It does not arm reapplying the volume for streams the are never affected by ringer mode as we don't do this very often.

The other problem noted in the bug report (ringer volume always restored to non zero value when exiting silent mode even if set to zero before) is also fixed: a new parameter is added to setIndex() and setStreamVolumeInt() to explicitely request to store the volume index as last audible instead of doing it automatically if index > 0.
2009-06-12 06:09:28 -07:00
Android (Google) Code Review
83bb56c389 Merge change 3424 into donut
* changes:
  Add the VPN services package, VPN service base classes and L2tpIpsecService.
2009-06-12 05:33:40 -07:00
Android (Google) Code Review
1324d5b32c am 116e8ef1: Merge change 3949 into donut
Merge commit '116e8ef1f88ce1ead23777826dec5bd98bf99708'

* commit '116e8ef1f88ce1ead23777826dec5bd98bf99708':
  TextToSpeech class cleanups
2009-06-12 04:59:49 -07:00
Android (Google) Code Review
d10a2dec1e am 3cf0dd6a: Merge change 3940 into donut
Merge commit '3cf0dd6ad86e725f5170f6484afa90ba9ea1e4c5'

* commit '3cf0dd6ad86e725f5170f6484afa90ba9ea1e4c5':
  dumpstate: Temporarily disable dumping /proc/slabinfo to avoid kernel crash.
2009-06-12 04:59:38 -07:00
Android (Google) Code Review
26cae05217 am 35733757: Merge change 3935 into donut
Merge commit '35733757bd1644f1fd67dc3a055391d1f167c4f2'

* commit '35733757bd1644f1fd67dc3a055391d1f167c4f2':
  Hook the 12- or 24-hour time format checkbox back up.
2009-06-12 04:59:33 -07:00
Satish Sampath
7f50c08fb9 Show proper suggestion item hilite on selection.
With the new implementation of using a SuggestionItemView, we no longer need to draw a solid background for all items in the suggestion listview. Hence removing the code to draw a default white background, and make the item transparent so the listview-drawn selection hilite shows through.
2009-06-12 11:58:46 +01:00
Hung-ying Tyan
f94b6444a3 Add the VPN services package, VPN service base classes and L2tpIpsecService.
Also add android.security.Keystore. This is a quick solution. Will be
evolved to a more mature implementation.

PATCH SET 2:
+ Add VpnServiceBinder to hide VpnService and its subclasses.
+ Add sendCommand2() to AndroidServiceProxy to work with the latest mtpd.

PATCH SET 3:
+ Rebase to catch up with new commits; no changes made.

PATCH SET 4:
+ Remove/comment out @Override on interface methods to be compilable for Java 1.5.

PATCH SET 5:
+ Add L2tpService.java.
+ Make VpnService to work on SingleServerProfile; add serverIp to
  connect(); set system property "net.vpn.server_ip"; and move
  getPppOptionFilePath() from L2tpIpsecService to VpnService
+ Revise VpnManager to start VpnService without worrying about which
  type (as the type info is in VpnProfile)
+ Remove installation stuff from VpnManager

PATCH SET 6:
+ Fix PATCH SET 5 (the patch was messed up). Please ignore PATCH SET 5.

PATCH SET 7:
+ Fix styles.

PATCH SET 8:
+ Add CANCELLED to VpnState.

PATCH SET 9:
+ Make VpnProfile serializable (in order to save them to persistent storage)

PATCH SET 10:
+ Remove Keystore.java as it's added in another CL.
2009-06-12 15:45:56 +08:00
Android (Google) Code Review
78f0f8cb2e Merge changes 3953,3954 into donut
* changes:
  Make the file backup helper not crash if a file you requested can't be stated.  This means you don't need to know if the files you are backing up exist or not -- we'll figure it out for you.
  Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.
2009-06-11 19:50:05 -07:00
Phil Dubach
56e78d9a04 Fix IntentFilter constructor to properly process the action parameter. 2009-06-11 18:50:40 -07:00
Android (Google) Code Review
e8966e1263 Merge change 4008 into donut
* changes:
  Fixes #1886237. Views drawing cache was not generated properly.
2009-06-11 18:06:17 -07:00
Romain Guy
8506ab4ac0 Fixes #1886237. Views drawing cache was not generated properly.
In compatibility mode, a View's drawing cache was created at the 160 density
scale instead of the right scale.
2009-06-11 18:05:56 -07:00
Nicolas Catania
32f8277488 Removed trailing whitespaces. 2009-06-11 16:54:48 -07:00
Android (Google) Code Review
f229aff118 Merge change 3967 into donut
* changes:
  Update control files (pass/fail/nontext/crash) to results from CRB45
2009-06-11 16:20:22 -07:00
Android (Google) Code Review
cb9534f920 Merge change 3907 into donut
* changes:
  Support SMS cell broadcasting for GSM in RIL.java
2009-06-11 15:54:51 -07:00
Android (Google) Code Review
2fde0e640a Merge change 3958
* changes:
  Fix tearDown event loop - message unref, triggers when bluetoothd crashes.
2009-06-11 15:48:56 -07:00
Jaikumar Ganesh
9b0fe60b88 Fix tearDown event loop - message unref, triggers when bluetoothd crashes. 2009-06-11 15:47:58 -07:00