Commit Graph

1368 Commits

Author SHA1 Message Date
8bb61e6835 am 58c24412: Merge change 3422 into donut
Merge commit '58c244125fc2d2067bf89e67a154f6ca2421fe36'

* commit '58c244125fc2d2067bf89e67a154f6ca2421fe36':
  Check AirplaneMode when enabling Bluetooth has finished.
2009-06-07 21:44:06 -07:00
58c244125f Merge change 3422 into donut
* changes:
  Check AirplaneMode when enabling Bluetooth has finished.
2009-06-07 21:42:14 -07:00
bd235f10a9 am 8c850b79: Add IRestoreSession interface for the restore flow
Merge commit '8c850b792f2d371fd8a4aff146d9d757ee982539'

* commit '8c850b792f2d371fd8a4aff146d9d757ee982539':
  Add IRestoreSession interface for the restore flow
2009-06-07 21:04:39 -07:00
5c43f735d9 Check AirplaneMode when enabling Bluetooth has finished.
This is part of manual merge from cupcake_dcm to donut.
Should be reviewed by mchan and takaoka.
Original internal CL: 149471-p9
2009-06-08 12:57:55 +09:00
8c850b792f Add IRestoreSession interface for the restore flow
Restore is a fairly complicated, somewhat stateful process, so we introduce
a new interface to encapsulate the various bits and pieces into a nicely
separable component.  In particular, this will make it much cleaner to
open and interrogate an expensive-to-construct transport and then reuse it
for the actual restore process itself.
2009-06-07 19:33:20 -07:00
53c31ed1ff am b4a6188a: Add rough-draft restore API set to IBackupTransport
Merge commit 'b4a6188a74273611abcae05f3a3b1f0547548301'

* commit 'b4a6188a74273611abcae05f3a3b1f0547548301':
  Add rough-draft restore API set to IBackupTransport
2009-06-07 15:35:14 -07:00
b4a6188a74 Add rough-draft restore API set to IBackupTransport
* getAvailableBackups returns the list of backup sets available for restore

* getAppSet() returns the set of apps available from a given backup set

* getRestoreData() streams the full backup data for a given application
(within a given backup set) into a FD; that data will be handed to the
app's backup agent for processing.
2009-06-07 15:30:44 -07:00
4dde34b2f0 am da55569b: Merge change 3417 into donut
Merge commit 'da55569b0aaf98ff4d472d85ae1b038e76e1e9c3'

* commit 'da55569b0aaf98ff4d472d85ae1b038e76e1e9c3':
  Adjust IBackupTransport interface
2009-06-07 14:12:04 -07:00
7b88128e08 Adjust IBackupTransport interface
Instead of just passing a package name to performBackup, pass the whole
PackageInfo struct, explicitly including the list of signatures for the package.
No need to make each transport look this up individually when it's a necessary
part of the backup payload for each app.
2009-06-07 13:55:42 -07:00
4bfa86011a am 4e0b13c9: Merge change 3348 into donut
Merge commit '4e0b13c9a94f2085d44d0fe36fd16e2599477145'

* commit '4e0b13c9a94f2085d44d0fe36fd16e2599477145':
  Fix AlphabetIndexer.getSectionForPosition()
2009-06-05 21:17:24 -07:00
76ff31b201 am d299b819: Add a new attribute to android manifest for defining the GLES version number. This attribute is parsed by the PackageParser into ConfigurationInfo. The major and minor version numbers are defined as the higher and lower order bits.
Merge commit 'd299b8194dde8c4875e5f032918ab35ebad8b1f1'

* commit 'd299b8194dde8c4875e5f032918ab35ebad8b1f1':
  Add a new attribute to android manifest for defining the GLES version number.
2009-06-05 21:17:11 -07:00
fa4d817851 am 7b0d2d93: Merge change 3223 into donut
Merge commit '7b0d2d933d8a601cf6259f25576f5615ff146b33'

* commit '7b0d2d933d8a601cf6259f25576f5615ff146b33':
  Adding new Settings.Secure properties for the Text-To-Speech functionality.
2009-06-05 21:16:59 -07:00
680b30f60c am 39665367: Merge change 3317 into donut
Merge commit '3966536766cbe0bd45570c6785e912131911ff79'

* commit '3966536766cbe0bd45570c6785e912131911ff79':
  Fixes #1899273.
2009-06-05 21:16:47 -07:00
2676375449 resolved conflicts for merge of 716b56 to master 2009-06-05 15:18:51 -07:00
4e0b13c9a9 Merge change 3348 into donut
* changes:
  Fix AlphabetIndexer.getSectionForPosition()
2009-06-05 14:53:00 -07:00
d299b8194d Add a new attribute to android manifest for defining the GLES version number.
This attribute is parsed by the PackageParser into ConfigurationInfo. The major
and minor version numbers are defined as the higher and lower order bits.
2009-06-05 13:49:09 -07:00
7b0d2d933d Merge change 3223 into donut
* changes:
  Adding new Settings.Secure properties for the Text-To-Speech functionality. Those properties are secure to prevent applications from altering the user's settings without his knowledge.
2009-06-05 13:29:21 -07:00
1b111bb6e2 Fix AlphabetIndexer.getSectionForPosition()
This did not properly set the cursor position before reading, which
resulted in wrong return values or exceptions in the cursor.
2009-06-05 12:27:59 -07:00
f62ba452bb Adding new Settings.Secure properties for the Text-To-Speech functionality.
Those properties are secure to prevent applications from altering the user's settings without his knowledge.
2009-06-05 11:29:16 -07:00
3966536766 Merge change 3317 into donut
* changes:
  Fixes #1899273.
2009-06-05 11:27:52 -07:00
834f0391b5 Fixes #1899273.
When a "ghost" stroke was showing, events would be intercepted in ListView. This patch modifies the logic used to detect when to still events: either the current stroke is a gesture, or the previous stroke was a gesture.
2009-06-05 11:24:09 -07:00
716b56817a Merge change 2934 into donut
* changes:
  Don't crash on null edit url.
2009-06-05 10:12:34 -07:00
5e23cbc660 am f9acde27: Include web search providers in Searchables.
Merge commit 'f9acde27486bcc6eea1092073f7b47c31749efd6'

* commit 'f9acde27486bcc6eea1092073f7b47c31749efd6':
  Include web search providers in Searchables.
2009-06-05 09:42:40 -07:00
78084a625a Merge change 3208
* changes:
  Add "locked" column to sms and pdu tables.
2009-06-05 08:47:58 -07:00
6262ae5c9d Implement handling of console messages from WebCore. Default implementation in WebChromeClient is to do nothing. 2009-06-05 12:39:02 +01:00
f9acde2748 Include web search providers in Searchables.
- Along with ACTION_SEARCH we now enumate ACTION_WEB_SEARCH as well so web search providers are covered in the searchables list. This fixes a broken unit test.
- Moved get/setPreferredWebSearchActivity and get-all-web-search-providers implementation to this module when the searchables list gets updated, so that it happens on boot and on package add/remove events and remains up to date. The duplicate code in WebSearchProvider will be removed in a separate change.
- Also made Searchables broadcast an intent when the searchables list got rebuilt, so components such as GlobalSearch/SuggestionSources no longer need to do this on their own.
2009-06-05 10:34:53 +01:00
79525264e5 Merge change 3284
* changes:
  rename string_array.h to StringArray.h and move the implementation from the header file to a new cpp file.
2009-06-05 01:29:08 -07:00
8ed6beb515 rename string_array.h to StringArray.h and move the implementation from the header file to a new cpp file.
StringArray is used in two places in framework/base and in the Sim. Ideally we should get rid of it and use Vector<String8> instead of creating new code.
2009-06-05 01:26:23 -07:00
7805835e0f am 7ebda6f1: Merge change 3265 into donut
Merge commit '7ebda6f110708bdb704f8700a6b3473249b12baf'

* commit '7ebda6f110708bdb704f8700a6b3473249b12baf':
  A workaround to fix rotation issue. I'm remote now and hard to do troubleshooting (i cannot rotate emulator in nx..)
2009-06-05 00:30:10 -07:00
cc784e3258 am 2f1b422d: Merge change 3249 into donut
Merge commit '2f1b422dc8d30da19dfc51911261d92ccccd9edd'

* commit '2f1b422dc8d30da19dfc51911261d92ccccd9edd':
  Add new SHOW_WEB_SUGGESTIONS system setting, referenced by the search settings
2009-06-05 00:30:00 -07:00
9c4125e268 am 54de9063: Merge change 3243 into donut
Merge commit '54de90635e1d0628c396d65e6c948bf4a1529229'

* commit '54de90635e1d0628c396d65e6c948bf4a1529229':
  Fix backup agent unbind
2009-06-05 00:29:36 -07:00
49f372210b am 12bba912: Merge change 3238 into donut
Merge commit '12bba912238f305d385b30c278a4bdbb027b7a03'

* commit '12bba912238f305d385b30c278a4bdbb027b7a03':
  Browser edit fields should report variation WEB_EDIT_TEXT.
2009-06-04 23:48:45 -07:00
fa77935446 am ad8a510f: Merge change 3227 into donut
Merge commit 'ad8a510fcc3b853bd0dadcffb4433c465f2993b4'

* commit 'ad8a510fcc3b853bd0dadcffb4433c465f2993b4':
  Fix int to string mapping of exported properties. The value generated by the
2009-06-04 23:48:22 -07:00
029a8c0372 am b640da8f: Merge change 3204 into donut
Merge commit 'b640da8fcbc63821dfca1ab92f038771a2bf0ab9'

* commit 'b640da8fcbc63821dfca1ab92f038771a2bf0ab9':
  Avoid touching all adapter items when building accessibility event.
2009-06-04 23:45:36 -07:00
1b6aee1515 am 2a318867: Merge change 3203 into donut
Merge commit '2a3188672ab2b65c0ce7c9c598a463e382c47696'

* commit '2a3188672ab2b65c0ce7c9c598a463e382c47696':
  rename a few files to camel-case, add copyright notices
2009-06-04 22:44:18 -07:00
f435729787 am 7835b0b7: Merge change 3192 into donut
Merge commit '7835b0b742a36641a4005663134dc0b5d0678eab'

* commit '7835b0b742a36641a4005663134dc0b5d0678eab':
  Fixes #1882836.
2009-06-04 22:43:59 -07:00
7d53a6bf4d am a4196206: Merge change 3074 into donut
Merge commit 'a41962065a93b63e7161cffd662b564e01a9e189'

* commit 'a41962065a93b63e7161cffd662b564e01a9e189':
  Modify the decoding logic in the FD case when a purgeable flag is set,
2009-06-04 22:42:01 -07:00
d0c3a61b07 am 320b2eee: SearchDialog should only do DialogCursorProtocol stuff when in global search mode.
Merge commit '320b2eeeea426dc06f7bb7f37c3d795babeb6adb'

* commit '320b2eeeea426dc06f7bb7f37c3d795babeb6adb':
  SearchDialog should only do DialogCursorProtocol stuff when in global search mode.
2009-06-04 22:41:22 -07:00
7ebda6f110 Merge change 3265 into donut
* changes:
  A workaround to fix rotation issue. I'm remote now and hard to do troubleshooting (i cannot rotate emulator in nx..)
2009-06-04 18:59:10 -07:00
2f5e6b2d31 A workaround to fix rotation issue. I'm remote now and hard to do troubleshooting (i cannot rotate emulator in nx..) 2009-06-04 18:06:27 -07:00
435e427d69 fix a incorrect merge 2009-06-04 17:30:28 -07:00
48603e7fed Add new SHOW_WEB_SUGGESTIONS system setting, referenced by the search settings
(in a follow-on change). This setting, to be respected by global search, and which
I will also file a bug to the browser to respect, determines whether live web
suggestions will be shown to the user as they type. For privacy reasons, this
could be considered undesirable, as partial queries can then be sent to the user's
chosen search engine, so a setting was required.
2009-06-05 01:07:20 +01:00
55dac1281e Add "locked" column to sms and pdu tables.
A user can lock an SMS message and prevent it from being auto-deleted.
2009-06-04 16:15:33 -07:00
54de90635e Merge change 3243 into donut
* changes:
  Fix backup agent unbind
2009-06-04 16:01:41 -07:00
7a9e348c07 Don't crash on null edit url.
bug=1568060
2009-06-04 15:59:48 -07:00
12bba91223 Merge change 3238 into donut
* changes:
  Browser edit fields should report variation WEB_EDIT_TEXT.
2009-06-04 15:50:05 -07:00
ad8a510fcc Merge change 3227 into donut
* changes:
  Fix int to string mapping of exported properties. The value generated by the mapping in a @ViewDebug.ExportedProperty annotation was always overriden by the resolveId attribute.
2009-06-04 15:12:06 -07:00
a1f3e4aef1 Fix int to string mapping of exported properties. The value generated by the
mapping in a @ViewDebug.ExportedProperty annotation was always overriden by
the resolveId attribute.
2009-06-04 15:10:46 -07:00
88db3448cf Browser edit fields should report variation WEB_EDIT_TEXT.
This will enable the IME to enable/disable prediction features
for browser fields where the exact type is not very well defined.
Part of the fix for #1743620
2009-06-04 15:07:29 -07:00
1885b37913 Fix backup agent unbind
The handwritten binder transaction passing wasn't propagating the agent-destroy
transaction to the client side.  Oops.

Also, remove obsolete run-one-agent code from the backup manager service.
2009-06-04 15:02:37 -07:00