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

21862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Costin Manolache
8d83f9e31b Bug 2680071: Rename the Cloud to Device 
Change-Id: I12ab32de393e44a499e3f9e3a0b38f4682156ff5
 2010-05-12 16:16:34 -07:00
Scott Main
c99c401d93 am 38b523af: Merge "docs: add missing path-permissions document" into froyo 
Merge commit '38b523af5c233dd5f8631ada2cd80b2d75b0efde' into froyo-plus-aosp

* commit '38b523af5c233dd5f8631ada2cd80b2d75b0efde':
  docs: add missing path-permissions document
 2010-05-12 15:33:38 -07:00
Scott Main
8b27c965c8 am f0e4ae56: Merge "docs: fix broken links" into froyo 
Merge commit 'f0e4ae563228db584041d517672aeadacecba61f' into froyo-plus-aosp

* commit 'f0e4ae563228db584041d517672aeadacecba61f':
  docs: fix broken links
 2010-05-12 15:33:35 -07:00
Grace Kloba
bfc63c7b83 am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly. 
Merge commit '336d7dcb105a43ee4de51fd0f26f277c63662f02' into froyo-plus-aosp

* commit '336d7dcb105a43ee4de51fd0f26f277c63662f02':
  The default AlertDialog allows cancel. But the default
 2010-05-12 15:33:30 -07:00
Scott Main
38b523af5c Merge "docs: add missing path-permissions document" into froyo 2010-05-12 15:01:31 -07:00
The Android Open Source Project
79090cb3da merge from open-source master 
Change-Id: Ifb008642faddf6b83769cdaa5bd67d21591b9eaa
 2010-05-12 14:54:38 -07:00
Scott Main
f0e4ae5632 Merge "docs: fix broken links" into froyo 2010-05-12 14:53:35 -07:00
The Android Open Source Project
4adacd23d4 merge from open-source master 
Change-Id: If6730b50627b2231bd345e594d8d30a37557849e
 2010-05-12 14:53:25 -07:00
Scott Main
5dd0fd5c89 docs: fix broken links 
Change-Id: I2720ce4fe30b1e6ff35b91f48a98ead8999ed1ab
 2010-05-12 14:49:38 -07:00
The Android Open Source Project
ccfd99b1e2 merge from open-source master 
Change-Id: Ib092e6ae5151bbcdf56b9b3a7adbaee7bb5df8b5
 2010-05-12 14:39:38 -07:00
Grace Kloba
336d7dcb10 The default AlertDialog allows cancel. But the default 
JSConfim doesn't have a cancel listener. So when
user cancel the dialog, we do not wake up the WebCoreThread.
The same code is already done for JSPrompt dialog correctly.

Fix http://b/issue?id=2679139
 2010-05-12 14:28:07 -07:00
The Android Open Source Project
7d9526445c merge from open-source master 
Change-Id: Ib5ea9745c2b652d64646e3e28c12e63815321ff9
 2010-05-12 14:10:23 -07:00
The Android Open Source Project
2a9ae01f74 merge from open-source master 
Change-Id: I24ecfac151c0ddc27237d711c95b8fe488d7931b
 2010-05-12 12:33:35 -07:00
Naveen Kalla
052203e50c Change license for the UUS Information file. 
Change-Id: Idd77e9078354a46605142c2eb704823aaa7d560d
 2010-05-12 12:02:09 -07:00
The Android Open Source Project
fb234bbe5e merge from open-source master 
Change-Id: I022d0781a232396e2b8a67a420ecf50e64b87d8c
 2010-05-12 11:58:14 -07:00
Scott Main
5385cc20f6 docs: add missing path-permissions document 
Change-Id: I926f6ead8babbb66ead386890c143e1bc3ddf229
 2010-05-12 11:31:03 -07:00
Dirk Dougherty
68b37d1470 am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo 
Merge commit 'a04202b3258845688bcd8c6208222235569df733' into froyo-plus-aosp

* commit 'a04202b3258845688bcd8c6208222235569df733':
  Doc change: remove Google I/O 09 from carousel.
 2010-05-12 11:08:46 -07:00
Dirk Dougherty
a04202b325 Merge "Doc change: remove Google I/O 09 from carousel." into froyo 2010-05-12 11:05:03 -07:00
Dirk Dougherty
b0e243b62a Doc change: remove Google I/O 09 from carousel. 
Change-Id: I5b97ceef5316930266d1b4581217afad74129372
 2010-05-12 10:48:31 -07:00
Scott Main
0d967ff0e2 am 18dc51d4: Merge "docs: fix broken anchor names" into froyo 
Merge commit '18dc51d4137c5cf8364541e25ad9ded203342c6b' into froyo-plus-aosp

* commit '18dc51d4137c5cf8364541e25ad9ded203342c6b':
  docs: fix broken anchor names
 2010-05-12 07:50:59 -07:00
Dirk Dougherty
052e2102df am 0d1b0814: Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files. 
Merge commit '0d1b0814be24f501395bf175fba8691117f782d5' into froyo-plus-aosp

* commit '0d1b0814be24f501395bf175fba8691117f782d5':
  Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.
 2010-05-12 07:50:57 -07:00
Dirk Dougherty
89f74cf66c am 4d5275e7: Merge "Doc change: update diff report 7-> 8" into froyo 
Merge commit '4d5275e723221df67aad00a440dd6a2e9a22caae' into froyo-plus-aosp

* commit '4d5275e723221df67aad00a440dd6a2e9a22caae':
  Doc change: update diff report 7-> 8
 2010-05-12 07:50:53 -07:00
Scott Main
a250e3287d am 827a50dd: Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo 
Merge commit '827a50dda4c1900ab5333f8c2d3705796ff4649d' into froyo-plus-aosp

* commit '827a50dda4c1900ab5333f8c2d3705796ff4649d':
  docs: remove the dashboard from the sidenav for the offline docs
 2010-05-12 07:50:48 -07:00
Brett Chabot
c8e84e12be am b4c9a8f6: Merge "Fix imf tests." into froyo 
Merge commit 'b4c9a8f664f1dd57644e6d6cf2723eff9a505072' into froyo-plus-aosp

* commit 'b4c9a8f664f1dd57644e6d6cf2723eff9a505072':
  Fix imf tests.
 2010-05-12 07:50:44 -07:00
Scott Main
21f18e9633 am bb129dc5: docs: make Notifying the User an expandable list 
Merge commit 'bb129dc57b4a5be24ab7c5e436fa591f61e28d3d' into froyo-plus-aosp

* commit 'bb129dc57b4a5be24ab7c5e436fa591f61e28d3d':
  docs: make Notifying the User an expandable list
 2010-05-12 07:50:41 -07:00
Scott Main
d522b270a9 am a225e3b1: docs: add quickview box with "see also" links for some articles 
Merge commit 'a225e3b1cd02da0f748f1a8e7341c727eff28085' into froyo-plus-aosp

* commit 'a225e3b1cd02da0f748f1a8e7341c727eff28085':
  docs: add quickview box with "see also" links for some articles
 2010-05-12 07:50:36 -07:00
Scott Main
0130e38376 am 6bc3304b: Merge "docs: remove allowBackup attribute from documentation" into froyo 
Merge commit '6bc3304b74ba41bf9fd132d48c7bb764d631d3fa' into froyo-plus-aosp

* commit '6bc3304b74ba41bf9fd132d48c7bb764d631d3fa':
  docs: remove allowBackup attribute from documentation
 2010-05-12 07:50:30 -07:00
Xavier Ducrohet
d9712b69ce am b1235a57: Merge "Hide two audio focus methods." into froyo 
Merge commit 'b1235a57a09174179553acecef2370354bdcbf41' into froyo-plus-aosp

* commit 'b1235a57a09174179553acecef2370354bdcbf41':
  Hide two audio focus methods.
 2010-05-12 07:50:19 -07:00
Marco Nelissen
bbafdc6403 am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, since it isn\'t needed, and causes a sqlite constraint exception. Bug 2671792." into froyo 
Merge commit '836b2d75ef86487ecae0ae834ecbab324fd99471' into froyo-plus-aosp

* commit '836b2d75ef86487ecae0ae834ecbab324fd99471':
  Don't clear the _data column in the audio_meta table, since it isn't
 2010-05-12 07:50:14 -07:00
Dianne Hackborn
b6e1ec19dd am 037cd341: Merge "Fix issue #2676378: Activity Manager Crash on FRF40" into froyo 
Merge commit '037cd3413a925c6f449050096a7cd4aab3207612' into froyo-plus-aosp

* commit '037cd3413a925c6f449050096a7cd4aab3207612':
  Fix issue #2676378: Activity Manager Crash on FRF40
 2010-05-12 07:50:09 -07:00
Scott Main
84a30dbff1 am 5cdf5fdc: docs: add document about app install location 
Merge commit '5cdf5fdcba846bd4659084f5f9e5a1e367dbea5d' into froyo-plus-aosp

* commit '5cdf5fdcba846bd4659084f5f9e5a1e367dbea5d':
  docs: add document about app install location
 2010-05-12 07:50:02 -07:00
Dirk Dougherty
712f640814 am 8acb68e9: Merge "Doc Change: Docs for NDK r4." into froyo 
Merge commit '8acb68e9aae7f6766b88440ede6598da63db9fdd' into froyo-plus-aosp

* commit '8acb68e9aae7f6766b88440ede6598da63db9fdd':
  Doc Change: Docs for NDK r4.
 2010-05-12 07:49:57 -07:00
Scott Main
9c68959240 am c80b95a8: Merge "docs: announce froyo and update IO message" into froyo 
Merge commit 'c80b95a85ae31eba80870cb3416fd2c25821c056' into froyo-plus-aosp

* commit 'c80b95a85ae31eba80870cb3416fd2c25821c056':
  docs: announce froyo and update IO message
 2010-05-12 07:49:51 -07:00
Mike Lockwood
d2084bb689 am e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo 
Merge commit 'e1d7dca608ced72c75bf906c7267a1ef30349826' into froyo-plus-aosp

* commit 'e1d7dca608ced72c75bf906c7267a1ef30349826':
  LocationManagerService: Call updateNetworkState on providers that are disabled.
 2010-05-12 07:49:45 -07:00
Andreas Huber
b003ad17bf am e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo 
Merge commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc' into froyo-plus-aosp

* commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc':
  Support for customizable socket-read timeouts through the HTTP response.
 2010-05-12 07:49:39 -07:00
Andreas Huber
227e443a43 am d6ad7c85: Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo 
Merge commit 'd6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e' into froyo-plus-aosp

* commit 'd6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e':
  Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)
 2010-05-12 07:49:31 -07:00
Costin Manolache
625de48897 am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo 
Merge commit 'e2055fe4258f8085a88328579c852ec26d77bb10' into froyo-plus-aosp

* commit 'e2055fe4258f8085a88328579c852ec26d77bb10':
  Bug 2673557: rename datamessaging
 2010-05-12 07:49:16 -07:00
Jean-Michel Trivi
0c73adb1de am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo 
Merge commit '3e90c76c12803cd1b116030fd124b7b870d25342' into froyo-plus-aosp

* commit '3e90c76c12803cd1b116030fd124b7b870d25342':
  Update javadoc in android.media.AudioManager to not hide the
 2010-05-12 07:49:10 -07:00
Dirk Dougherty
6d405cfcfe am fe089334: Merge "Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo 
Merge commit 'fe08933450f4be42c9b3eac900c64f23857ecd17' into froyo-plus-aosp

* commit 'fe08933450f4be42c9b3eac900c64f23857ecd17':
  Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride.
 2010-05-12 07:49:00 -07:00
Jean-Michel Trivi
ea37d9b489 am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the completion listen 
Merge commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c' into froyo-plus-aosp

* commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c':
  Fix bug 2670395 and 2599698
 2010-05-12 07:48:50 -07:00
Wu-cheng Li
d8c33747af am 78624e41: Add remove method in CameraParameters class. 
Merge commit '78624e41da166712aaa5ae47e4d3467337ac810a' into froyo-plus-aosp

* commit '78624e41da166712aaa5ae47e4d3467337ac810a':
  Add remove method in CameraParameters class.
 2010-05-12 07:48:41 -07:00
Marc Capdevielle
ade63a0555 New test in FrameworkTest for the VelocityTracker class 2010-05-12 09:31:55 +02:00
Johan Alfven
6c3da7fbc2 Corrected debug message in WindowManager 
When WindowManager reports "Key dispatching timed out"
it prints out information about the window state that was
present at the time the key was sent to that window.
There is a minor error in the class representing the
recorded window state so that the currently focused window
is printed instead of the recorded focused window.

Change-Id: I29a5471ef725e30f812ffd57fd4597ce81c0c7f2
 2010-05-12 09:01:56 +02:00
Scott Main
18dc51d413 Merge "docs: fix broken anchor names" into froyo 2010-05-11 20:13:26 -07:00
Dirk Dougherty
0d1b0814be Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files. 
Change-Id: I7abf541316f2796079cf646a3294db535fcaaa8a
 2010-05-11 20:07:32 -07:00
Dirk Dougherty
4d5275e723 Merge "Doc change: update diff report 7-> 8" into froyo 2010-05-11 19:53:04 -07:00
Dirk Dougherty
a25528fc62 Doc change: update diff report 7-> 8 
Change-Id: I376622ae9afff8effc1153129eb68a8f53436ad4
 2010-05-11 19:35:15 -07:00
Scott Main
9280c34465 docs: fix broken anchor names 
Change-Id: I9eafcddf55c56a95ac3ee631ae9216ff544759fc
 2010-05-11 19:29:00 -07:00
Scott Main
827a50dda4 Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo 2010-05-11 19:25:19 -07:00
Brett Chabot
b4c9a8f664 Merge "Fix imf tests." into froyo 2010-05-11 19:17:04 -07:00