10237 Commits

Author SHA1 Message Date
Scott Main
08cfb5a201 am 4d4ef4e0: am 9762ff45: am c7d1ee8b: docs only. add new Updating Your SDK doc; update the \'android\' tool documentation.
Merge commit '4d4ef4e02e9dd1cc54bf1db19f96adc01508308d'

* commit '4d4ef4e02e9dd1cc54bf1db19f96adc01508308d':
  docs only.
2009-09-25 11:17:09 -07:00
Katarina Stenstedt
e194c5f35d am ca190523: am dc884053: am 20972da0: New localization document and tutorial
Merge commit 'ca190523d1f19df0b6850908cd422cd7797c0d23'

* commit 'ca190523d1f19df0b6850908cd422cd7797c0d23':
  New localization document and tutorial
2009-09-25 11:17:02 -07:00
Bjorn Bringert
602764a5cf am 3558e360: (-s ours) am 3309940c: am 2f2daf8e: (-s ours) Fix search intent component bug DO NOT MERGE
Merge commit '3558e360641e2c0dd119db573693441533509bcb'

* commit '3558e360641e2c0dd119db573693441533509bcb':
  Fix search intent component bug DO NOT MERGE
2009-09-25 11:16:56 -07:00
Scott Main
fb2fd0fb44 am 2273a31d: am ea1241f0: Merge change 26244 into eclair
Merge commit '2273a31d9b42cb2a31f629e9d6ad559512b290a2'

* commit '2273a31d9b42cb2a31f629e9d6ad559512b290a2':
  docs only.
2009-09-25 11:16:50 -07:00
Christopher Tate
090513ba8f am dbb031ba: am 3656a344: Merge change 26974 into eclair
Merge commit 'dbb031baeef3361feb402a0b239fe433edecc508'

* commit 'dbb031baeef3361feb402a0b239fe433edecc508':
  Disallow concurrent backups; consult transport requestBackupTime()
2009-09-25 11:16:43 -07:00
Peng Zhu
3661750713 am 3aff4fdf: am 56024f26: Merge change 26991 into eclair
Merge commit '3aff4fdf5c3dc1078e132bd6eda3ae980b15611e'

* commit '3aff4fdf5c3dc1078e132bd6eda3ae980b15611e':
  Add null check at isEmergencyNumber().
2009-09-25 11:16:34 -07:00
Nick Pelly
561837422a am b2209a35: am 1a42cfac: Use LM_SECURE when auth && encrypt.
Merge commit 'b2209a35af672c086c28fbcf3a5101bbb10eb523'

* commit 'b2209a35af672c086c28fbcf3a5101bbb10eb523':
  Use LM_SECURE when auth && encrypt.
2009-09-25 11:16:24 -07:00
Nick Pelly
a0c1abcef6 am a7e508eb: am 18b1e79a: Bluetooth API: Do not allow apps to programmatically make BT discoverable.
Merge commit 'a7e508eb55c8f63ff43aea2374a2773893e69321'

* commit 'a7e508eb55c8f63ff43aea2374a2773893e69321':
  Bluetooth API: Do not allow apps to programmatically make BT discoverable.
2009-09-25 11:16:17 -07:00
Jason Sams
10c9b6d19c am c3d72940: am cc89ef3d: Merge change 26971 into eclair
Merge commit 'c3d72940075cecfa3b5a07c7e6f2ae84ee5be0a2'

* commit 'c3d72940075cecfa3b5a07c7e6f2ae84ee5be0a2':
  Implement pause/resume for the RS thread.
2009-09-25 11:15:28 -07:00
Chih-Chung Chang
0cff245456 am 5e367bfe: am 0665ae22: Merge change 26939 into eclair
Merge commit '5e367bfe0726d7d7108279721179dcd6de326ee5'

* commit '5e367bfe0726d7d7108279721179dcd6de326ee5':
  Fix 2101425: Camera crashes spontaneously in preview.
2009-09-25 11:15:04 -07:00
Karl Rosaen
7bc6d80c32 am 57869675: am 0808c961: Merge change 26954 into eclair
Merge commit '578696753510b06d97e189f533f7115555795c0f'

* commit '578696753510b06d97e189f533f7115555795c0f':
  Update layouts to show status (battery, alarm) info on pattern unlock screen.  make buttons dark.
2009-09-25 11:14:58 -07:00
Yu Shan Emily Lau
50ee15793b am 99c156cd: am 7d0bdfaf: Merge change 26948 into eclair
Merge commit '99c156cd9ff67119e20d4ebc851998d68492da05'

* commit '99c156cd9ff67119e20d4ebc851998d68492da05':
  Suppress the testPing as we moved the release test target to the userdebug. This test rely on a mock_media_player.so which build under the eng build
2009-09-25 11:14:52 -07:00
Fred Quintana
120d132475 am 63344cae: am 91a00d3a: fix typo
Merge commit '63344cae94520d789dbe4002dcc3d6ef45d9a040'

* commit '63344cae94520d789dbe4002dcc3d6ef45d9a040':
  fix typo
2009-09-25 11:14:38 -07:00
Fred Quintana
e2f2df4041 am 5dfe9f15: am f5808415: rename misc to birthday
Merge commit '5dfe9f157c174162b3f2a6010a2955c508dab9ff'

* commit '5dfe9f157c174162b3f2a6010a2955c508dab9ff':
  rename misc to birthday
2009-09-25 11:14:31 -07:00
Daisuke Miyakawa
de6bbe7fc1 am 2f24ab9f: am 4579ed28: Merge change 26944 into eclair
Merge commit '2f24ab9fdc2c9d998a94e10a7ae0ce3087cffa7d'

* commit '2f24ab9fdc2c9d998a94e10a7ae0ce3087cffa7d':
  Add "TYPE=" to type attribute when appropriate.
2009-09-25 11:13:53 -07:00
Wei Huang
4e8804fa54 am 8feefb3e: am d35db5ec: Merge change 26946 into eclair
Merge commit '8feefb3e2067cc7d3c5b9c3b776538f264782021'

* commit '8feefb3e2067cc7d3c5b9c3b776538f264782021':
  Fix bug#2144742: guard against 0 length encoded string when attaching a 'from' address for MMS.
2009-09-25 11:13:43 -07:00
Jason Sams
11f0fc5523 am cc8d56f8: am 0d3999f7: Merge change 26942 into eclair
Merge commit 'cc8d56f8c3c55cd592a67c0589af57d6427c0c97'

* commit 'cc8d56f8c3c55cd592a67c0589af57d6427c0c97':
  Minor cleanup of profile and compile logging.
2009-09-25 11:13:37 -07:00
Raphael
e57b3111de am 04165371: am 20b39471: Merge change 26933 into eclair
Merge commit '041653714524b37972169071e7569d2432ae8747'

* commit '041653714524b37972169071e7569d2432ae8747':
  AAPT: Ignore visual source safe files in resources
2009-09-25 11:13:11 -07:00
Mathias Agopian
493e0aff9d am d3d0f03b: am b9c932ba: Merge change 26925 into eclair
Merge commit 'd3d0f03b5a7974ca484b63a57e48ccb987dcc54d'

* commit 'd3d0f03b5a7974ca484b63a57e48ccb987dcc54d':
  minor SurfaceFlinger code cleanup and remove unnecessary tests
2009-09-25 11:13:00 -07:00
Jason Sams
665844ebdc am 0eb14060: am a6a4113d: Merge change 26917 into eclair
Merge commit '0eb14060d01833a2a3d97fc7882e46a14aa39274'

* commit '0eb14060d01833a2a3d97fc7882e46a14aa39274':
  Fix invokables to make sure script pointers are setup before invoking function calls.  Reduce app startup time up to 1s.
2009-09-25 11:12:17 -07:00
Daisuke Miyakawa
0b43103b46 am 5b774984: am b7e89e4c: Merge change 26912 into eclair
Merge commit '5b7749845ed752e3c2c5d30cec5d726b7c64c42c'

* commit '5b7749845ed752e3c2c5d30cec5d726b7c64c42c':
  Add appendType() utility method.
2009-09-25 11:12:11 -07:00
Mathias Agopian
8d9dade093 am a38ff0c2: am 117f574e: Merge change 26911 into eclair
Merge commit 'a38ff0c2631e7a36f3bb01bd104758364d2ea90e'

* commit 'a38ff0c2631e7a36f3bb01bd104758364d2ea90e':
  OpenGL ES doesn't allow glColorPointer with a size parameter other than 4
2009-09-25 11:11:44 -07:00
Nicolas Roard
13e8d6e016 am 08228fda: am dccf22dc: Merge change 26698 into eclair
Merge commit '08228fdaffd4b5d29e2b3172cc535b8e2c22baae'

* commit '08228fdaffd4b5d29e2b3172cc535b8e2c22baae':
  Fix the shortcuts
2009-09-25 11:11:37 -07:00
Bryan Mawhinney
753bc00f15 am cbafa094: am dfb7bc8c: Merge change 26821 into eclair
Merge commit 'cbafa094449f9e6646409b6bd26ba11956b32047'

* commit 'cbafa094449f9e6646409b6bd26ba11956b32047':
  Make removeOnAccountsUpdateListener cope with null handlers.
2009-09-25 11:11:31 -07:00
Fred Quintana
d0bde7ba9b am 93bc8cab: am 531e580a: remove the incorrectly located nickname
Merge commit '93bc8cab98784851b1bb080b57d059ac35fa619a'

* commit '93bc8cab98784851b1bb080b57d059ac35fa619a':
  remove the incorrectly located nickname
2009-09-25 11:11:22 -07:00
Grace Kloba
a0c2e57cc3 am 9f9a0ad5: am f4a36e86: Merge change 26909 into eclair
Merge commit '9f9a0ad5744a934a521578511b59566d05ed1784'

* commit '9f9a0ad5744a934a521578511b59566d05ed1784':
  Not all WebView's host have permission to read the history.
2009-09-25 11:11:16 -07:00
Jack Palevich
afcae16711 am bf0d9041: am b87f24a6: Merge change 26908 into eclair
Merge commit 'bf0d9041202eb52b036a8a5854dd6fef55d87919'

* commit 'bf0d9041202eb52b036a8a5854dd6fef55d87919':
  Fix broken Javadoc link for GLSurfaceView.EGLWindowSurfaceFactory.
2009-09-25 11:10:56 -07:00
jsh
3e6c6265b7 am 54a0c801: am 857ce94b: Merge change 26900 into eclair
Merge commit '54a0c801d56e455278fcfdfd8be27b6dc73c48eb'

* commit '54a0c801d56e455278fcfdfd8be27b6dc73c48eb':
  Print IMEI/MEID in dumpsys.
2009-09-25 11:10:44 -07:00
Dmitri Plotnikov
affabd66e0 am 7f8d14e8: am 6938bb36: Fixing the broken build
Merge commit '7f8d14e83241704d6c5d36d3d594931e86dcffb9'

* commit '7f8d14e83241704d6c5d36d3d594931e86dcffb9':
  Fixing the broken build
2009-09-25 11:10:38 -07:00
Cary Clark
abb34549b2 am f28ffd06: am f18c5393: set the selection after sending a click
Merge commit 'f28ffd0688d83c019e74a7d32759d5734396baa4'

* commit 'f28ffd0688d83c019e74a7d32759d5734396baa4':
  set the selection after sending a click
2009-09-25 11:10:08 -07:00
Dmitri Plotnikov
cde981dbac am 2841a1c1: am f22fc124: Adding timestamp and account to contact-level presence columns.
Merge commit '2841a1c18a90522c5a0b875ead6ec0b6795cef08'

* commit '2841a1c18a90522c5a0b875ead6ec0b6795cef08':
  Adding timestamp and account to contact-level presence columns.
2009-09-25 11:09:57 -07:00
Daisuke Miyakawa
68bb98fb9f am cc2465bb: am f2bed60b: Add final to appropriate variables.
Merge commit 'cc2465bbd5845fb128963f845589c8a6e41c64de'

* commit 'cc2465bbd5845fb128963f845589c8a6e41c64de':
  Add final to appropriate variables.
2009-09-25 11:09:51 -07:00
Daisuke Miyakawa
9bb967ef49 am 577d32a5: am b55e60e1: Fix vCard code.
Merge commit '577d32a57d1b21b40015ac202147e00e8243db63'

* commit '577d32a57d1b21b40015ac202147e00e8243db63':
  Fix vCard code.
2009-09-25 11:09:40 -07:00
Grace Kloba
069e2dda63 am 0eb9ac8f: am 43f99202: Merge change 26896 into eclair
Merge commit '0eb9ac8f5858a9864667749f5de508a38b0c2de2'

* commit '0eb9ac8f5858a9864667749f5de508a38b0c2de2':
  ResultTransport needs a default value. If the thread is
2009-09-25 11:09:27 -07:00
Jason Sams
a8b8ff35d2 am 4368fd87: am a183cb5e: Merge change 26897 into eclair
Merge commit '4368fd87422333183b9281d32405742a188388d9'

* commit '4368fd87422333183b9281d32405742a188388d9':
  Removed last bits of predefined element types from native code.  Predefined types are now constructed at the java layer from standard building blocks.
2009-09-25 11:09:21 -07:00
Jason Sams
a899d53cbf am a8dff109: am e31c0b56: Merge change 26708 into eclair
Merge commit 'a8dff109be0287104bf43afdd18d326e7b11d6d5'

* commit 'a8dff109be0287104bf43afdd18d326e7b11d6d5':
  Remove depricated triangleMesh.
2009-09-25 11:09:10 -07:00
Satish Roddom
0bcd7ef6cc am 3f5db261: am 03d2009b: Merge change 26895 into eclair
Merge commit '3f5db2615f2d14632e5acbcfcd983d4373a5970d'

* commit '3f5db2615f2d14632e5acbcfcd983d4373a5970d':
  Subject issue in MMS message
2009-09-25 11:09:03 -07:00
Jack Palevich
953eaa080e am 726d9074: am d0b58414: Merge change 26891 into eclair
Merge commit '726d9074cf8f038d4ece89f60b008b343c68874e'

* commit '726d9074cf8f038d4ece89f60b008b343c68874e':
  Make tritex test run with latest OpenGL driver.
2009-09-25 11:08:40 -07:00
Lixin Yue
bbdd9f9d9d am 2c01a82f: am bfe1297b: Merge change 26869 into eclair
Merge commit '2c01a82f53e22d98d652308b9bf6d0b6d14b6ff2'

* commit '2c01a82f53e22d98d652308b9bf6d0b6d14b6ff2':
  Add call log support to pim.vcard.VCardComposer
2009-09-25 11:08:34 -07:00
Jack Palevich
a1c0028640 am c055f173: am 1267b0e1: Merge change 26882 into eclair
Merge commit 'c055f173c9211b27184c56ce385df5278db4011c'

* commit 'c055f173c9211b27184c56ce385df5278db4011c':
  Publish minor additions to GLSurfaceView API.
2009-09-25 11:08:15 -07:00
Grace Kloba
d38d3682b2 am 34b9dab1: am bb6aba19: Merge change 26876 into eclair
Merge commit '34b9dab1ba1db40378a3f425d0591d17e2fb91be'

* commit '34b9dab1ba1db40378a3f425d0591d17e2fb91be':
  Restrict touch to the view height with the title. This
2009-09-25 11:08:05 -07:00
Christopher Tate
c5486b3e7c am 2b091c88: am 4cc86e1a: Clear the device\'s data from the transport when backup is disabled
Merge commit '2b091c882d64947b4dabc08d7284c42b9f051959'

* commit '2b091c882d64947b4dabc08d7284c42b9f051959':
  Clear the device's data from the transport when backup is disabled
2009-09-25 11:07:45 -07:00
Karl Rosaen
75ae374510 am 512fb951: am bb339ead: Merge change 26867 into eclair
Merge commit '512fb951a15ed45d432515b49acef2c2132195f8'

* commit '512fb951a15ed45d432515b49acef2c2132195f8':
  fix bug where siilent mode dissapears when it triggers instead of animating off to the left edge.
2009-09-25 11:07:27 -07:00
Leon Clarke
1a7412c09f am cf3a289f: am a3a840f9: Merge change 26830 into eclair
Merge commit 'cf3a289fedae593b4f0e4a12672efe33866016b5'

* commit 'cf3a289fedae593b4f0e4a12672efe33866016b5':
  Coloring clicked-on links
2009-09-25 11:07:21 -07:00
Amith Yamasani
f9721f67e4 am 80ab1b71: am c15255a9: Add a PRIVACY_SETTINGS action to launch the new Privacy settings screen.
Merge commit '80ab1b7198cfad400af752e52541d29ee2f7ce23'

* commit '80ab1b7198cfad400af752e52541d29ee2f7ce23':
  Add a PRIVACY_SETTINGS action to launch the new Privacy settings screen.
2009-09-25 11:06:30 -07:00
Karl Rosaen
1ad17a16d9 am b9393eae: am 9f8d59ee: Merge change 26714 into eclair
Merge commit 'b9393eae369ecad7b136153099498787caf7d7cd'

* commit 'b9393eae369ecad7b136153099498787caf7d7cd':
  Update RotarySelector to support vertical orientation, and add resolution specific assets (removing old ones).
2009-09-25 11:06:24 -07:00
Ben Murdoch
1753cadf37 am 349236c6: am b4ef3334: Merge change 26593 into eclair
Merge commit '349236c61caab356a33475f7813dc5eaa88d28fc'

* commit '349236c61caab356a33475f7813dc5eaa88d28fc':
  Change the way DRT determines if it is ready to continue to the next test when running in automated mode.
2009-09-25 11:06:10 -07:00
Jeff Hamilton
073f29e821 am 919dc738: am 13ab701e: Merge change 26856 into eclair
Merge commit '919dc7389f7b7558497e766dade90608ac5ef132'

* commit '919dc7389f7b7558497e766dade90608ac5ef132':
  Make the new ContactsContract APIs public.
2009-09-25 11:05:59 -07:00
Mike Reed
ec44a6932a am e493bf79: am 9251c344: Merge change 26851 into eclair
Merge commit 'e493bf7985ad4cac7bafcfa788eb281b694967aa'

* commit 'e493bf7985ad4cac7bafcfa788eb281b694967aa':
  use new setDither on ImageRef to retain that setting for purgeable images
2009-09-25 11:05:07 -07:00
Daniel Sandler
9a17c56aae am 5e616a5e: am 1ee4aeaa: New high-res framework assets (drop dated Sep-24).
Merge commit '5e616a5eed1e6e22d8914f47ecf70a48ca2ad21a'

* commit '5e616a5eed1e6e22d8914f47ecf70a48ca2ad21a':
  New high-res framework assets (drop dated Sep-24).
2009-09-25 11:05:01 -07:00