jsh
c6ab6bc543
am be7f0f78: Add remaining retry count to response for PIN/PUK commands.
...
Merge commit 'be7f0f78afde931ce6ea2d4ba61c340fac5722f6'
* commit 'be7f0f78afde931ce6ea2d4ba61c340fac5722f6':
Add remaining retry count to response for PIN/PUK commands.
2009-06-22 10:05:31 -07:00
Bjorn Bringert
0730146c77
am eed76b2a: Remove test for SearchManager activity context restriction.
...
Merge commit 'eed76b2a8ddc41af01cd3ae87c4722f3784c975c'
* commit 'eed76b2a8ddc41af01cd3ae87c4722f3784c975c':
Remove test for SearchManager activity context restriction.
2009-06-22 09:56:43 -07:00
Leon Scroggins
3fe15ea84c
resolved conflicts for merge of 9336f5d9 to master
2009-06-22 12:44:31 -04:00
Android (Google) Code Review
292ae4f642
Merge change 4775 into donut
...
* changes:
Make browser bookmarks permissions part of the public API.
2009-06-22 08:01:58 -07:00
Android (Google) Code Review
02f6bd03a0
am 2c10b5f4: Merge change 4914 into donut
...
Merge commit '2c10b5f483f832523305c11d44035fc7f5d9a54b'
* commit '2c10b5f483f832523305c11d44035fc7f5d9a54b':
Make all static methods in SearchManager non-static.
2009-06-22 07:26:36 -07:00
Android (Google) Code Review
efc227f74a
Merge change 4914 into donut
...
* changes:
Make all static methods in SearchManager non-static.
2009-06-22 07:19:49 -07:00
Android (Google) Code Review
919d27e9ed
am 7306d248: Merge change 4913 into donut
...
Merge commit '7306d248feb2e52593e51944bcaf98c11974e988'
* commit '7306d248feb2e52593e51944bcaf98c11974e988':
Add non-static version of SearchManager.getSuggestions().
2009-06-22 05:55:59 -07:00
Android (Google) Code Review
bdc8ed576e
Merge change 4913 into donut
...
* changes:
Add non-static version of SearchManager.getSuggestions().
2009-06-22 05:53:04 -07:00
Android (Google) Code Review
5678fa46b5
am 9c1b1872: Merge change 4908 into donut
...
Merge commit '9c1b1872faf028bcd70fb3e17eeb29d86ce6bd9a'
* commit '9c1b1872faf028bcd70fb3e17eeb29d86ce6bd9a':
Remove checks for Activity Context when creating SearchManager
2009-06-22 04:48:12 -07:00
Android (Google) Code Review
259da697b7
Merge change 4908 into donut
...
* changes:
Remove checks for Activity Context when creating SearchManager
2009-06-22 04:45:23 -07:00
Android (Google) Code Review
57cac3e88e
am 766d7236: Merge change 4737 into donut
...
Merge commit '766d7236c84f636b816d71189e309e67db1f593a'
* commit '766d7236c84f636b816d71189e309e67db1f593a':
Add prepareToDraw() to Bitmap for fixing http://b/issue?id=1907995 .
2009-06-22 03:50:23 -07:00
Android (Google) Code Review
6ba2b1b2e5
Merge change 4737 into donut
...
* changes:
Add prepareToDraw() to Bitmap for fixing http://b/issue?id=1907995 .
2009-06-22 03:48:29 -07:00
Android (Google) Code Review
6b6c9874a1
am 8570e5fc: Merge change 4907 into donut
...
Merge commit '8570e5fcf15f6b7c22c3023e8b4757c6a880a598'
* commit '8570e5fcf15f6b7c22c3023e8b4757c6a880a598':
Add more debug messages for CameraService.
2009-06-22 03:44:04 -07:00
Android (Google) Code Review
84159b508f
Merge change 4907 into donut
...
* changes:
Add more debug messages for CameraService.
2009-06-22 03:41:19 -07:00
Chih-Chung Chang
d98c516d28
Add more debug messages for CameraService.
2009-06-22 17:06:32 +08:00
Daisuke Miyakawa
ab436aee3d
am 3e3324ba: Merge the change in cupcake_dcm so that Contacts app is able to use it.
...
Merge commit '3e3324bae45ff21615c07507e6918ad21681a6a2'
* commit '3e3324bae45ff21615c07507e6918ad21681a6a2':
Merge the change in cupcake_dcm so that Contacts app is able to use it.
2009-06-21 21:44:01 -07:00
Android (Google) Code Review
132fed07ef
am 77c5c405: Merge change 4894 into donut
...
Merge commit '77c5c405486548fcb3e02f67cfd23117ae78fb85'
* commit '77c5c405486548fcb3e02f67cfd23117ae78fb85':
Set the search bar's AutoCompleteTextView to ellipsize=end.
2009-06-20 23:45:54 -07:00
Android (Google) Code Review
4f15f7a3f5
Merge change 4894 into donut
...
* changes:
Set the search bar's AutoCompleteTextView to ellipsize=end. After Romain's change 4829, we can set this to make hint text ellipsize (and thus not line wrap) in the search dialog.
2009-06-20 23:43:09 -07:00
Android (Google) Code Review
f4991d2226
am 4da7dff5: Merge change 4731 into donut
...
Merge commit '4da7dff5e79e57494b58a97b285c53c111b18c82'
* commit '4da7dff5e79e57494b58a97b285c53c111b18c82':
gsm: Remove PppLink since pppd_gprs service does not exist.
2009-06-20 14:51:26 -07:00
Android (Google) Code Review
5fff2075c4
Merge change 4731 into donut
...
* changes:
gsm: Remove PppLink since pppd_gprs service does not exist.
2009-06-20 14:48:33 -07:00
Android (Google) Code Review
029bbbd810
Merge change 4881
...
* changes:
implement modeview matrix sliding from within scripts.
2009-06-19 18:34:17 -07:00
Android (Google) Code Review
981d285f9d
am 9e71b07c: Merge change 4829 into donut
...
Merge commit '9e71b07cfe88cdb1abf4a01077ca263d7f957c94'
* commit '9e71b07cfe88cdb1abf4a01077ca263d7f957c94':
Fixes #1926784 . Setting android:ellipsize on an EditText now ellipsizes the hint.
2009-06-19 18:20:16 -07:00
Android (Google) Code Review
c560b62cf3
Merge change 4829 into donut
...
* changes:
Fixes #1926784 . Setting android:ellipsize on an EditText now ellipsizes the hint.
2009-06-19 18:18:42 -07:00
Android (Google) Code Review
f84dda74d5
am 79ac8770: Merge change 4834 into donut
...
Merge commit '79ac87704d2e38afb06356704e4b52c739237f40'
* commit '79ac87704d2e38afb06356704e4b52c739237f40':
Fix a bug where wrong variable was used for comparison.
2009-06-19 17:25:55 -07:00
Android (Google) Code Review
70897d2801
Merge change 4834 into donut
...
* changes:
Fix a bug where wrong variable was used for comparison.
2009-06-19 17:24:32 -07:00
Android (Google) Code Review
3a05f1974f
am b92f7040: Merge change 4847 into donut
...
Merge commit 'b92f7040e8294151fd915fd649bf7942a8b67463'
* commit 'b92f7040e8294151fd915fd649bf7942a8b67463':
Add permission tests for IHardwareService.
2009-06-19 17:14:09 -07:00
Android (Google) Code Review
63dd448ac7
Merge change 4847 into donut
...
* changes:
Add permission tests for IHardwareService.
2009-06-19 17:12:55 -07:00
Android (Google) Code Review
1cacf3d48c
am b92c45a4: Merge change 4831 into donut
...
Merge commit 'b92c45a4bc4331378a31bb4bc84de02fa631a247'
* commit 'b92c45a4bc4331378a31bb4bc84de02fa631a247':
Add app version to the backup metadata
2009-06-19 16:44:10 -07:00
Android (Google) Code Review
03428fcc8b
am 1585bd24: Merge change 4828 into donut
...
Merge commit '1585bd24c10d16351f89e32dddbfa799f18db6bd'
* commit '1585bd24c10d16351f89e32dddbfa799f18db6bd':
Report densities in badging, debugging for nine patch bug.
2009-06-19 16:44:07 -07:00
Grace Kloba
f5702d01b9
am 3af8e938: Change addCertificate to take byte[] instead of String as we don\'t know the encoding.
...
Merge commit '3af8e9389e008c0076b86cc6b3c6f005e7473d10'
* commit '3af8e9389e008c0076b86cc6b3c6f005e7473d10':
Change addCertificate to take byte[] instead of String as we don't know the encoding.
2009-06-19 16:43:59 -07:00
Android (Google) Code Review
de083920ea
am 52546575: Merge change 4818 into donut
...
Merge commit '5254657540b0a6ad54be6229b68fa5626e4ef9e5'
* commit '5254657540b0a6ad54be6229b68fa5626e4ef9e5':
Added in Settings.Secure default country and variant for the default TTS language.
2009-06-19 16:43:46 -07:00
Android (Google) Code Review
6bd1b1d5f1
am b4e456bf: Merge change 4785 into donut
...
Merge commit 'b4e456bf1823e2dd8c975ae02451b7b72541c236'
* commit 'b4e456bf1823e2dd8c975ae02451b7b72541c236':
Fix issue #1753079 : running instrumentation in shared processes.
2009-06-19 16:43:39 -07:00
Android (Google) Code Review
2625774d59
Merge change 4843
...
* changes:
checkpoint filmstrip, implemented TLS.
2009-06-19 16:07:59 -07:00
Android (Google) Code Review
51039ae65c
Merge change 4719
...
* changes:
Fix two minor issues. Rename launchID to launchIndex and make util class Matrix public for apps to use.
2009-06-19 16:07:37 -07:00
Android (Google) Code Review
3aaa79e882
Merge change 4831 into donut
...
* changes:
Add app version to the backup metadata
2009-06-19 15:38:41 -07:00
Android (Google) Code Review
4018f35e27
Merge change 4828 into donut
...
* changes:
Report densities in badging, debugging for nine patch bug.
2009-06-19 15:37:03 -07:00
Dianne Hackborn
be1bc0a1f9
Report densities in badging, debugging for nine patch bug.
...
The aapt tool now reports all available densities like it already did
for locales. Also this includes more resource data output, which I
was using to examine bug #1867049 (which at this point I am unable to
reproduce).
2009-06-19 15:13:28 -07:00
Android (Google) Code Review
1667686778
Merge change 4688
...
* changes:
Copies the Contacts.Intents class to ContactsContract.
2009-06-19 14:56:13 -07:00
Android (Google) Code Review
bfbe9a73e6
am 4d1b5bd1: Merge change 4808 into donut
...
Merge commit '4d1b5bd148d0830d2acc03bafbe58dfd17e5b3f8'
* commit '4d1b5bd148d0830d2acc03bafbe58dfd17e5b3f8':
Fixes #1928566 . Prevents runtime restart upon configuration change.
2009-06-19 14:49:49 -07:00
Android (Google) Code Review
9a5575470e
am 066e6bfd: Merge change 4792 into donut
...
Merge commit '066e6bfd01a5ddd4748eacdc82fee5374e2af929'
* commit '066e6bfd01a5ddd4748eacdc82fee5374e2af929':
when we reset a paint, it should return to the state it was in when it was first created.
2009-06-19 14:49:44 -07:00
The Android Open Source Project
e84495e2d8
merge 9ebd737e w/conflicts
2009-06-19 14:47:58 -07:00
Android (Google) Code Review
cca55acd69
Merge change 4818 into donut
...
* changes:
Added in Settings.Secure default country and variant for the default TTS language.
2009-06-19 14:43:37 -07:00
Android (Google) Code Review
51f57c706d
Merge change 4785 into donut
...
* changes:
Fix issue #1753079 : running instrumentation in shared processes.
2009-06-19 14:24:39 -07:00
Android (Google) Code Review
31e3a43c3c
Merge change 4815
...
* changes:
GoogleFeedback handles errors in core apps.
2009-06-19 13:59:48 -07:00
Android (Google) Code Review
7d5b42816b
Merge change 4811
...
* changes:
Process new property definitions for JIT-specific options for apps performance tuning and debugging.
2009-06-19 13:53:53 -07:00
Android (Google) Code Review
af1d9f56d7
Merge change 4808 into donut
...
* changes:
Fixes #1928566 . Prevents runtime restart upon configuration change.
2009-06-19 13:31:14 -07:00
Android (Google) Code Review
e7d9b98ec0
Merge change 4792 into donut
...
* changes:
when we reset a paint, it should return to the state it was in when it was first created. for java, this means setting its text-encoding to UTF16...
2009-06-19 13:30:15 -07:00
Android (Google) Code Review
e9d45a1fd6
Merge change 4793 into donut
...
* changes:
dpi changes for webview
2009-06-19 13:24:44 -07:00
Android (Google) Code Review
6c94e5ebef
am b00518d8: Merge change 4796 into donut
...
Merge commit 'b00518d81550c638728b53346a2a25f0a80a1049'
* commit 'b00518d81550c638728b53346a2a25f0a80a1049':
Move USE_LOCATION_FOR_SERVICES to Secure.
2009-06-19 12:57:22 -07:00
Android (Google) Code Review
77862a539c
Merge change 4796 into donut
...
* changes:
Move USE_LOCATION_FOR_SERVICES to Secure.
2009-06-19 12:55:34 -07:00