drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,279 Commits 1 Branch 0 Tags
Commit Graph

10279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
4a2f5c62ea am 13c433f8: am d1cfd259: am c1828d5a: Merge change 3583 into donut 
Merge commit '13c433f88f3d57c49c5682d1f018472ffe331bd9'

* commit '13c433f88f3d57c49c5682d1f018472ffe331bd9':
  implement browser history for tabbed search results...
 2009-09-25 11:25:19 -07:00
Cary Clark
4a045a3762 am 6fb27c5a: am 96cfad5d: check for null before calling native webkit from java webview 
Merge commit '6fb27c5a68ab4de9d7d4caf737da8effa2f63217'

* commit '6fb27c5a68ab4de9d7d4caf737da8effa2f63217':
  check for null before calling native webkit from java webview
 2009-09-25 11:24:51 -07:00
Bryan Mawhinney
5675f5b6f8 am 7e74262a: am 82e62668: Merge change 27038 into eclair 
Merge commit '7e74262ab6b650bd5cca218067de36e42d95952e'

* commit '7e74262ab6b650bd5cca218067de36e42d95952e':
  Redraw search autocomplete dropdown after config change.
 2009-09-25 11:24:20 -07:00
Bjorn Bringert
243d240467 am 079b824c: am 81d84c0c: am 6266e40a: Better JavaDoc for Activity.onSearchRequested(). 
Merge commit '079b824cf05bee18447ace93958e8f7edcb2cf61'

* commit '079b824cf05bee18447ace93958e8f7edcb2cf61':
  Better JavaDoc for Activity.onSearchRequested().
 2009-09-25 11:24:11 -07:00
Bryan Mawhinney
c784380d10 am 067e0164: am 42b7af57: Dismiss QSB dialog when doing an in-app global search. 
Merge commit '067e0164cae268098a5305bbfca401d4e917b78b'

* commit '067e0164cae268098a5305bbfca401d4e917b78b':
  Dismiss QSB dialog when doing an in-app global search.
 2009-09-25 11:23:53 -07:00
Dianne Hackborn
cd02a278e4 am c6cfd0b0: am 3e2ac884: Fix/improve issue #2142662: too easy to click a link/item instead of fling 
Merge commit 'c6cfd0b0cc99d0f78230c7ba95b0e9aeb791c32c'

* commit 'c6cfd0b0cc99d0f78230c7ba95b0e9aeb791c32c':
  Fix/improve issue #2142662: too easy to click a link/item instead of fling
 2009-09-25 11:23:26 -07:00
Dianne Hackborn
212770b632 am 7510aba7: am 896b15ab: Merge change 27016 into eclair 
Merge commit '7510aba7a5a1024394be938c7e8b35de785f7355'

* commit '7510aba7a5a1024394be938c7e8b35de785f7355':
  A variety of work on animations.
 2009-09-25 11:23:16 -07:00
Eric Laurent
df13a337e1 am df9879bf: am e9bd4788: Merge change 26881 into eclair 
Merge commit 'df9879bf1fb8c9785b20bc3fbe0b2ad6e4f09dfd'

* commit 'df9879bf1fb8c9785b20bc3fbe0b2ad6e4f09dfd':
  Fix issue 2142613: ToneGenerator: short tones sometimes don't play on sholes or over A2DP.
 2009-09-25 11:23:04 -07:00
Yu Shan Emily Lau
f5171c13a1 am 384350e8: am 3f790d87: Merge change 27011 into eclair 
Merge commit '384350e8043b02e332ad4bea0a0c1e9b26f2e1bb'

* commit '384350e8043b02e332ad4bea0a0c1e9b26f2e1bb':
  Added the checking for the wma in the memory test.
 2009-09-25 11:22:58 -07:00
Mike Cleron
4b0ee97d67 am f45076dd: am fdf53a46: Merge change 26935 into eclair 
Merge commit 'f45076dd37a649c9bdf10aaf5bc42793c72b497d'

* commit 'f45076dd37a649c9bdf10aaf5bc42793c72b497d':
  Fix bug 2129190
 2009-09-25 11:22:49 -07:00
Ray Chen
7945105cc1 am d503453c: am 80d8ace4: Merge change 26997 into eclair 
Merge commit 'd503453ca093a1aac3781cdf6d86fd0700de6600'

* commit 'd503453ca093a1aac3781cdf6d86fd0700de6600':
  Fix issue 2128896 The thumbnail generated after picture capture with max zoom is overlapped with previous thumbnail.
 2009-09-25 11:17:22 -07:00
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