Satish Sampath
100cf76cc2
am 35379abd: Added attribute queryAfterZeroResults to searchables.
...
Merge commit '35379abd46b68a4efa20035c6c8b9d1faceb4dcc'
* commit '35379abd46b68a4efa20035c6c8b9d1faceb4dcc':
Added attribute queryAfterZeroResults to searchables.
2009-06-11 11:41:23 -07:00
Joe Onorato
0ad6120dad
Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.
...
This took quite a bit of refactoring.
2009-06-11 11:29:57 -07:00
Android (Google) Code Review
67182a34f0
Merge change 3015 into donut
...
* changes:
make sms calculateLength radio-independent
2009-06-11 11:27:53 -07:00
Android (Google) Code Review
cc3c1ce09c
Merge change 3828 into donut
...
* changes:
Renaming the Tts class to TextToSpeech for clarity. Switching to HashMap for parameter lists to pass key-value parameter pairs. Using TODO instead of FIXME in comments. Removing methods that don't belong anymore to the TTS interface now the feature becomes part of the platform.
2009-06-11 11:26:49 -07:00
Android (Google) Code Review
00d0608a0c
Merge change 3910
...
* changes:
resolved conflicts for merge of 174231 to master
2009-06-11 10:56:08 -07:00
Mike LeBeau
82067767cc
resolved conflicts for merge of 174231 to master
2009-06-11 18:50:27 +01:00
Android (Google) Code Review
f137e59841
Merge change 3899 into donut
...
* changes:
GpsLocationProvider: Add hooks for GPS location injection.
2009-06-11 09:54:58 -07:00
Android (Google) Code Review
af8c5de6c4
Merge change 3809
...
* changes:
Add a search uri constant for mms/sms.
2009-06-11 09:46:54 -07:00
Android (Google) Code Review
1c6ad98017
am db8a6ae6: Merge change 3709 into donut
...
Merge commit 'db8a6ae6bbd8cbb17fb79085ffb9d3fc539fe5c2'
* commit 'db8a6ae6bbd8cbb17fb79085ffb9d3fc539fe5c2':
Provide the Keystore feature in the framework.
2009-06-11 07:57:37 -07:00
Satish Sampath
326737eaa7
am aba34d96: Fix display of the selection background for search results.
...
Merge commit 'aba34d96fda75cbaaae19ce6296266feb24ce365'
* commit 'aba34d96fda75cbaaae19ce6296266feb24ce365':
Fix display of the selection background for search results.
2009-06-11 07:57:27 -07:00
Android (Google) Code Review
f83ecdc976
Merge change 3879 into donut
...
* changes:
ACTV: getWindowVisibility() instead of private attach count
2009-06-11 04:53:01 -07:00
Android (Google) Code Review
9371ede119
Merge change 3709 into donut
...
* changes:
Provide the Keystore feature in the framework.
2009-06-11 02:37:01 -07:00
Chung-yih Wang
8fcbada742
Provide the Keystore feature in the framework.
...
-- added the keystore library for Java application.
-- changed the marshalling of the keystore function return.
2009-06-11 17:28:40 +08:00
Android (Google) Code Review
b683057757
am a05487dd: Merge change 3800 into donut
...
Merge commit 'a05487dd856222bacf57a41f2dfe1194d3776f05'
* commit 'a05487dd856222bacf57a41f2dfe1194d3776f05':
Add SUGGEST_SPINNER_WHILE_REFRESHING column constant to the SearchManager
2009-06-11 01:03:05 -07:00
Scott Main
a3f10e05e1
am b4ee0f93: am aa25df24: AI 149729: fix search functionatilty for offline docs... the file references weren\'t using the local root. BUG=1909300
...
Merge commit 'b4ee0f930928fbbc425f29d3e3e09455cdc6cf85'
* commit 'b4ee0f930928fbbc425f29d3e3e09455cdc6cf85':
AI 149729: fix search functionatilty for offline docs...
2009-06-11 01:02:49 -07:00
Android (Google) Code Review
cd2281eea5
Merge change 3800 into donut
...
* changes:
Add SUGGEST_SPINNER_WHILE_REFRESHING column constant to the SearchManager for use in implementing Google suggestion refreshing in global search.
2009-06-11 00:59:06 -07:00
Christopher Tate
ebb2fa137d
am 9bbc21a7: Flesh out restore interface on manager; work up most of LocalTransport
...
Merge commit '9bbc21a773cbdfbef2876a75c32bda5839647751'
* commit '9bbc21a773cbdfbef2876a75c32bda5839647751':
Flesh out restore interface on manager; work up most of LocalTransport
2009-06-11 00:56:29 -07:00
Android (Google) Code Review
472f6f8364
am b6391d63: Merge change 3857 into donut
...
Merge commit 'b6391d6377883586995127c9926c1b5b8035fd60'
* commit 'b6391d6377883586995127c9926c1b5b8035fd60':
Allow arrays of values for power profile data.
2009-06-11 00:45:27 -07:00
Jean-Michel Trivi
54f5c506bd
am b3c5a878: Made the platform TTS service aware of the path for the default TTS library to load.
...
Merge commit 'b3c5a8785bc643843117752d37769a1edfe9a9e2'
* commit 'b3c5a8785bc643843117752d37769a1edfe9a9e2':
Made the platform TTS service aware of the path for the default TTS library to load.
2009-06-11 00:45:21 -07:00
Android (Google) Code Review
84209bf20b
am 238bf47a: Merge change 3826 into donut
...
Merge commit '238bf47a850532233ed51362dca95facf8680770'
* commit '238bf47a850532233ed51362dca95facf8680770':
LocationManagerService: Fix logic error removing multiple dead receivers.
2009-06-11 00:45:02 -07:00
Scott Main
19f4695f6b
am aa25df24: AI 149729: fix search functionatilty for offline docs... the file references weren\'t using the local root. BUG=1909300
...
Merge commit 'aa25df2452f68d2f732ad620a97fd47b3802fa2e' into donut
* commit 'aa25df2452f68d2f732ad620a97fd47b3802fa2e':
AI 149729: fix search functionatilty for offline docs...
2009-06-11 00:01:42 -07:00
Android (Google) Code Review
88a33d55b0
Merge change 3857 into donut
...
* changes:
Allow arrays of values for power profile data.
2009-06-10 19:50:22 -07:00
Android (Google) Code Review
9f008ae738
Merge change 3850
...
* changes:
Fix bug with bad conversion of java strings to C strings for object names. Update test app to test object defines.
2009-06-10 19:09:37 -07:00
Android (Google) Code Review
809bae9aac
Merge change 3849
...
* changes:
Fix build error due to bad path generation in makefile for generated tools. Implemented by JoeO
2009-06-10 19:09:07 -07:00
Android (Google) Code Review
6aa29183cb
Merge change 3841
...
* changes:
Fix botched merge from commit b61498d1ac8e25f0024dcde46b41bcf0d8336d89
2009-06-10 18:06:18 -07:00
Android (Google) Code Review
4e1d7a0adf
Merge change 3826 into donut
...
* changes:
LocationManagerService: Fix logic error removing multiple dead receivers.
2009-06-10 17:32:21 -07:00
Android (Google) Code Review
bfecc578a9
am 1d7d5db7: Merge change 3799 into donut
...
Merge commit '1d7d5db74f14e871c7be719a0cddf52a5a40dcbf'
* commit '1d7d5db74f14e871c7be719a0cddf52a5a40dcbf':
Turned on the windows media related test cases as the binary already integrated.
2009-06-10 17:20:04 -07:00
Christopher Tate
1dc5293b6f
am c7b31e3c: The rest of the basic flow for restore
...
Merge commit 'c7b31e3c3cd71129557d4bf9e3fbcebb9235aba5'
* commit 'c7b31e3c3cd71129557d4bf9e3fbcebb9235aba5':
The rest of the basic flow for restore
2009-06-10 17:19:57 -07:00
Android (Google) Code Review
d39165e63c
am 2795c2d6: Merge change 3806 into donut
...
Merge commit '2795c2d6b73f6e72565569f7d4f2f4b34e526bba'
* commit '2795c2d6b73f6e72565569f7d4f2f4b34e526bba':
Fix a couple null pointer exceptions in CDMA voice call handling.
2009-06-10 17:19:54 -07:00
Android (Google) Code Review
be7629e5f1
Merge change 3799 into donut
...
* changes:
Turned on the windows media related test cases as the binary already integrated.
2009-06-10 17:10:05 -07:00
The Android Open Source Project
0ff324309a
Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base
2009-06-10 16:43:38 -07:00
Android (Google) Code Review
6107a61a8f
Merge change 3806 into donut
...
* changes:
Fix a couple null pointer exceptions in CDMA voice call handling.
2009-06-10 16:38:12 -07:00
Android (Google) Code Review
dd083ef70b
am 1f35bf18: Merge change 3795 into donut
...
Merge commit '1f35bf18ade606810843c8ec10445fc884d686cb'
* commit '1f35bf18ade606810843c8ec10445fc884d686cb':
URI/extra data for inline scheme.
2009-06-10 16:31:52 -07:00
Mitsuru Oshima
31d99a51cc
am e5fb3288: resolution support fix/improvement * adding compatibility menu * backup gravity * set expanable=true if the screen size is hvga * density. * added "supports any density" mode. I\'ll add sdk check later. * disallow to catch orientation c
...
Merge commit 'e5fb328825995aa33b5b7ecf8b5bee2b17f81715'
* commit 'e5fb328825995aa33b5b7ecf8b5bee2b17f81715':
resolution support fix/improvement
2009-06-10 16:31:36 -07:00
Android (Google) Code Review
7958dc86e2
am ca436e24: Merge change 3782 into donut
...
Merge commit 'ca436e24dec0fa258a8a756c3e7d07bcb096c5b3'
* commit 'ca436e24dec0fa258a8a756c3e7d07bcb096c5b3':
Reimport Portuguese translations.
2009-06-10 16:31:33 -07:00
Android (Google) Code Review
ba5c9ae759
am f50ab7f4: Merge change 3777 into donut
...
Merge commit 'f50ab7f46296786f575b2d171ec05a661d129015'
* commit 'f50ab7f46296786f575b2d171ec05a661d129015':
Process the response of RIL_REQUEST_REPORT_SMS_MEMORY_STATUS.
2009-06-10 16:31:29 -07:00
Android (Google) Code Review
5e817bf3c1
am a45711aa: Merge change 3765 into donut
...
Merge commit 'a45711aaebc514290fdf0c93f07a3120dc160ddb'
* commit 'a45711aaebc514290fdf0c93f07a3120dc160ddb':
Add a gservices flag to limit the size of protobufs we can gzip
2009-06-10 16:31:27 -07:00
Android (Google) Code Review
8c7467bd2e
am 732912a1: Merge change 3730 into donut
...
Merge commit '732912a103e985520dba9c022a40bc21b4c4ced5'
* commit '732912a103e985520dba9c022a40bc21b4c4ced5':
Restructuring the TTS files so that it works as a Service
2009-06-10 16:31:23 -07:00
Romain Guy
7ae696157f
resolved conflicts for merge of f31cbb to master
2009-06-10 16:30:18 -07:00
Android (Google) Code Review
f7aadd905a
Merge change 3808
...
* changes:
Split renderscript java code from test apps. Update makefiles.
2009-06-10 16:24:47 -07:00
Android (Google) Code Review
d3280bca2d
Merge change 3795 into donut
...
* changes:
URI/extra data for inline scheme.
2009-06-10 16:24:01 -07:00
Android (Google) Code Review
436a369649
Merge change 3796
...
* changes:
Added data restriction constants to ContactsContract.
2009-06-10 16:14:18 -07:00
Android (Google) Code Review
e6b57de70d
am 4a60b887: Merge change 3761 into donut
...
Merge commit '4a60b887d4b9744126e62b094a9597ee8e924640'
* commit '4a60b887d4b9744126e62b094a9597ee8e924640':
Added support to record page load time for each url.
2009-06-10 15:33:08 -07:00
Android (Google) Code Review
07c6bbf089
am b11e670e: Merge change 3754 into donut
...
Merge commit 'b11e670e56b30022dbaaa921390005a95dfd337b'
* commit 'b11e670e56b30022dbaaa921390005a95dfd337b':
Fix some 12- vs 24-hour problems in the FormatDateRange strings.
2009-06-10 15:33:04 -07:00
Android (Google) Code Review
6adce14324
am 684a2edb: Merge change 3577 into donut
...
Merge commit '684a2edbe192a2a76684c5d6855773196d2e1a2e'
* commit '684a2edbe192a2a76684c5d6855773196d2e1a2e':
Make aapt Error out when an overlay adds a string.
2009-06-10 15:32:56 -07:00
Eric Fischer
fac61b00be
am c0c0b684: am a8c3821e: AI 149721: Import Portuguese translations.
...
Merge commit 'c0c0b6844e4e4cd3b872a80e51416cfd9ca124d9'
* commit 'c0c0b6844e4e4cd3b872a80e51416cfd9ca124d9':
AI 149721: Import Portuguese translations.
2009-06-10 15:32:46 -07:00
Android (Google) Code Review
00801c24af
Merge change 3782 into donut
...
* changes:
Reimport Portuguese translations.
2009-06-10 15:20:55 -07:00
Android (Google) Code Review
f3a33dc9e0
Merge change 3777 into donut
...
* changes:
Process the response of RIL_REQUEST_REPORT_SMS_MEMORY_STATUS.
2009-06-10 15:17:15 -07:00
Android (Google) Code Review
79f105e807
Merge change 3765 into donut
...
* changes:
Add a gservices flag to limit the size of protobufs we can gzip
2009-06-10 15:11:52 -07:00
Android (Google) Code Review
b17caeb749
Merge change 3730 into donut
...
* changes:
Restructuring the TTS files so that it works as a Service
2009-06-10 15:09:37 -07:00