Commit Graph

1398 Commits

Author SHA1 Message Date
Mathias Agopian
1a0c4cd5d8 Merge commit 'goog/master' into merge_master 2009-06-05 15:45:39 -07:00
Mathias Agopian
4fcd9c7003 get rid of LogSocket which wasn't even implemented (enabled) 2009-06-05 15:11:23 -07:00
Android (Google) Code Review
32ca56e23b Merge change 3354
* changes:
  break dependency on utils/ZipEntry.h and utils/ZipFile.h, get rid of inet_address.h and Socket.h which were not used
2009-06-05 15:02:02 -07:00
Mathias Agopian
7e83f043d9 break dependency on utils/ZipEntry.h and utils/ZipFile.h, get rid of inet_address.h and Socket.h which were not used 2009-06-05 14:56:35 -07:00
Satish Sampath
29cd601829 am 0e74aa0f: Fix broken Searchables unit tests.
Merge commit '0e74aa0f7ed90d46e0bdde02bf9b7b29c6b95bd8'

* commit '0e74aa0f7ed90d46e0bdde02bf9b7b29c6b95bd8':
  Fix broken Searchables unit tests.
2009-06-05 11:40:59 -07:00
Satish Sampath
25cf68b1f8 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
Android (Google) Code Review
fb3deb7304 Merge change 3208
* changes:
  Add "locked" column to sms and pdu tables.
2009-06-05 08:47:58 -07:00
Android (Google) Code Review
c5992f071d 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
Mathias Agopian
861aa2f0c9 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
Android (Google) Code Review
31ff12b53d 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
Android (Google) Code Review
b10fcdc7c1 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
Christopher Tate
1ba244fb65 am 0032ce80: Fix back_up_files() error detection when opening/CRCing the file
Merge commit '0032ce80ac127e6bfb25d727162eee4af208dc77'

* commit '0032ce80ac127e6bfb25d727162eee4af208dc77':
  Fix back_up_files() error detection when opening/CRCing the file
2009-06-05 00:29:50 -07:00
Android (Google) Code Review
4fb7b9dba3 am 54de9063: Merge change 3243 into donut
Merge commit '54de90635e1d0628c396d65e6c948bf4a1529229'

* commit '54de90635e1d0628c396d65e6c948bf4a1529229':
  Fix backup agent unbind
2009-06-05 00:29:36 -07:00
Android (Google) Code Review
6fb4be4f76 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
Android (Google) Code Review
8a50ed6fa9 am 35c46680: Merge change 3226 into donut
Merge commit '35c46680852268d6b7b51dadf3d5349d146ccdcd'

* commit '35c46680852268d6b7b51dadf3d5349d146ccdcd':
  Update a javadoc comment suggesting the use of a deprecated class.
2009-06-04 23:48:35 -07:00
Android (Google) Code Review
60d751f8a1 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
Android (Google) Code Review
b62ca2bbce am a80cc6eb: Merge change 3184 into donut
Merge commit 'a80cc6ebe7426792927cddbf191bb7435a06fc5e'

* commit 'a80cc6ebe7426792927cddbf191bb7435a06fc5e':
  The '-D' option for the 'am' command appears to be optional, so reflect that in the usage.
2009-06-04 23:48:17 -07:00
Android (Google) Code Review
4ec82bc258 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
Mathias Agopian
0c97ed3a2e cleanup Debug.h a bit 2009-06-04 23:29:29 -07:00
The Android Open Source Project
73f25710a3 merged 2b5f84a117ee6f51ed21239719afba0f33c182ff w/minor conflicts 2009-06-04 23:08:44 -07:00
Android (Google) Code Review
6d2bc14d24 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
Android (Google) Code Review
cd1a14fdfb am 7835b0b7: Merge change 3192 into donut
Merge commit '7835b0b742a36641a4005663134dc0b5d0678eab'

* commit '7835b0b742a36641a4005663134dc0b5d0678eab':
  Fixes #1882836.
2009-06-04 22:43:59 -07:00
Android (Google) Code Review
d934edfe94 am d84aa185: Merge change 3181 into donut
Merge commit 'd84aa185149edea1f1eba95a2c948930348864fe'

* commit 'd84aa185149edea1f1eba95a2c948930348864fe':
  Unhide inInputShareable in BitmapFactory.Options.
2009-06-04 22:43:49 -07:00
Android (Google) Code Review
06d2ae82f3 am 85dfec8c: Merge change 3174 into donut
Merge commit '85dfec8c35d4e3216591bd2e534bbebd6338b969'

* commit '85dfec8c35d4e3216591bd2e534bbebd6338b969':
  Added bugreport collecting mechanism in case of crashes.
2009-06-04 22:42:45 -07:00
Android (Google) Code Review
001d4b22ef 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
Android (Google) Code Review
c960814fdb am 3d3e307a: Merge change 3126 into donut
Merge commit '3d3e307a63144b1bddd534fefd35a557223d52bf'

* commit '3d3e307a63144b1bddd534fefd35a557223d52bf':
  Fix thread safety in DataConnectionTracker.
2009-06-04 22:41:38 -07:00
Karl Rosaen
e242983e2a 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
The Android Open Source Project
52f68489c6 Empty merge, thru 1c54cf0903, which are already in master
Merge commit '1c54cf0903cd81467ca41ec6733c459e10b22763'
2009-06-04 19:01:38 -07:00
Android (Google) Code Review
c6e2d94b36 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
Mathias Agopian
3d57964a81 fix a bunch of problems with destroying surfaces.
now, all destruction path, go through the purgatory which is emptied when ~ISurface is called, but we also make sure to remove the surface from the current list from there (in case a client forgot to request the destruction explicitely).
2009-06-04 18:46:21 -07:00
Android (Google) Code Review
8a5b84fce0 Merge change 3261
* changes:
  Add support for scripts to return an animation flag.  This allows them to indicate they are generating changing content and the rs thread to sleep if the content is static.
2009-06-04 17:59:58 -07:00
Android (Google) Code Review
cd38a4fbc7 Merge change 3249 into donut
* changes:
  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-04 17:54:44 -07:00
Christopher Tate
173e38d47c Fix back_up_files() error detection when opening/CRCing the file 2009-06-04 17:02:56 -07:00
Android (Google) Code Review
e9f4934470 Merge change 3243 into donut
* changes:
  Fix backup agent unbind
2009-06-04 16:01:41 -07:00
Android (Google) Code Review
6301115aaf Merge change 3238 into donut
* changes:
  Browser edit fields should report variation WEB_EDIT_TEXT.
2009-06-04 15:50:05 -07:00
Android (Google) Code Review
b7978c9852 Merge change 3226 into donut
* changes:
  Update a javadoc comment suggesting the use of a deprecated class.
2009-06-04 15:45:22 -07:00
Android (Google) Code Review
51d4151f42 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
Android (Google) Code Review
3816508d4e Merge change 3184 into donut
* changes:
  The '-D' option for the 'am' command appears to be optional, so reflect that in the usage.
2009-06-04 15:05:48 -07:00
Android (Google) Code Review
77d6c65a5b Merge change 3216
* changes:
  Set the RS thread priority.
2009-06-04 14:45:38 -07:00
Android (Google) Code Review
12e8412d25 Merge change 3204 into donut
* changes:
  Avoid touching all adapter items when building accessibility event.
2009-06-04 14:12:02 -07:00
Android (Google) Code Review
7e4212cabd Merge change 3207 into donut
* changes:
  localize: remove dependency on mkdirs/etc in libhost
2009-06-04 14:10:07 -07:00
Android (Google) Code Review
e0074ad3ce Merge change 3203 into donut
* changes:
  rename a few files to camel-case, add copyright notices
2009-06-04 14:08:29 -07:00
Mathias Agopian
f446ba9dcb rename a few files to camel-case, add copyright notices 2009-06-04 13:53:57 -07:00
Android (Google) Code Review
eb55b12910 Merge change 3192 into donut
* changes:
  Fixes #1882836.
2009-06-04 13:28:20 -07:00
Android (Google) Code Review
882b990004 Merge change 3181 into donut
* changes:
  Unhide inInputShareable in BitmapFactory.Options.
2009-06-04 13:21:03 -07:00
Android (Google) Code Review
b2d4ba5bb2 Merge change 3174 into donut
* changes:
  Added bugreport collecting mechanism in case of crashes.
2009-06-04 11:05:21 -07:00
Android (Google) Code Review
4d797db25b Merge change 3074 into donut
* changes:
  Modify the decoding logic in the FD case when a purgeable flag is set, and lower the threshold of bitmap size for using ashmem().
2009-06-04 10:40:17 -07:00
Android (Google) Code Review
dd8016615e Merge change 3126 into donut
* changes:
  Fix thread safety in DataConnectionTracker.
2009-06-04 10:09:59 -07:00
Android (Google) Code Review
abe8a54ea7 Merge change 3068
* changes:
  Remove handling of ENTER key from WebView.
2009-06-04 09:34:34 -07:00
Android (Google) Code Review
d86345312e Merge change 3149 into donut
* changes:
  Turn off verbose logging in SearchableInfo, which seems to have been left on by accident.
2009-06-04 07:08:45 -07:00