Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,039 Commits 3 Branches 0 Tags
4ec730cabb68ee8347c6aa5dc929b09651275aca
Commit Graph

8051 Commits

Author SHA1 Message Date
Jaikumar Ganesh
c4bdb6d5a0 am ea6f6755: am ef95aceb: Merge "Removing STOPSHIP logs." into froyo 
Merge commit 'ea6f6755ce15133238938bd9626b69e5f655a49c' into kraken

* commit 'ea6f6755ce15133238938bd9626b69e5f655a49c':
  Removing STOPSHIP logs.
 2010-05-18 14:53:39 -07:00
Jaikumar Ganesh
ea6f6755ce am ef95aceb: Merge "Removing STOPSHIP logs." into froyo 
Merge commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2' into froyo-plus-aosp

* commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2':
  Removing STOPSHIP logs.
 2010-05-18 14:51:40 -07:00
Jaikumar Ganesh
ef95acebdc Merge "Removing STOPSHIP logs." into froyo 2010-05-18 14:48:05 -07:00
Jaikumar Ganesh
af21fa61c2 Removing STOPSHIP logs. 
Bug: 2694602
Change-Id: Id56e1ddcf5ea76de32238cd6761f2caf053f1fa1
 2010-05-18 14:36:48 -07:00
Dianne Hackborn
dc8a7f69d7 Add new API to take over a window's Surface. 
Change-Id: Iad6245faadc95f19ea63c8e229a1c02e9188f69e
 2010-05-18 10:46:33 -07:00
Scott Main
8473259ddb am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo 
Merge commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca' into kraken

* commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca':
  docs: fix markup error
 2010-05-18 09:07:39 -07:00
Scott Main
74e151c54c am 5f1d1002: Merge "docs: fix markup error" into froyo 
Merge commit '5f1d100298dfafbd996b6deff457e6d1de4008a0' into froyo-plus-aosp

* commit '5f1d100298dfafbd996b6deff457e6d1de4008a0':
  docs: fix markup error
 2010-05-18 09:02:09 -07:00
Scott Main
e3b9f8b9b2 docs: fix markup error 
Change-Id: I59a42f47483d76b6a3220b1d88e9d6bd96f83daf
 2010-05-18 08:43:11 -07:00
Scott Main
9719fe11a1 am fbb285e6: am e64256d6: Merge "docs: revise webview description and add info for targeting screen densities" into froyo 
Merge commit 'fbb285e67f6b150440647d0c484d88edb7bf9be9' into kraken

* commit 'fbb285e67f6b150440647d0c484d88edb7bf9be9':
  docs: revise webview description and add info for targeting screen densities
 2010-05-17 18:04:07 -07:00
Scott Main
fbb285e67f am e64256d6: Merge "docs: revise webview description and add info for targeting screen densities" into froyo 
Merge commit 'e64256d610ec5ea3df5db8a24333a6ce98b83d49' into froyo-plus-aosp

* commit 'e64256d610ec5ea3df5db8a24333a6ce98b83d49':
  docs: revise webview description and add info for targeting screen densities
 2010-05-17 18:01:28 -07:00
Scott Main
8b3cea01bf docs: revise webview description and add info for targeting screen densities 
Change-Id: Ib0293b497adef23330ee3f5f71904ad78a55a3a3
 2010-05-17 17:48:30 -07:00
Mike Lockwood
c5859388bd am 3e9e9696: am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API. 
Merge commit '3e9e9696f147c8df1236c1d7aa9496124864a81c' into kraken

* commit '3e9e9696f147c8df1236c1d7aa9496124864a81c':
  Resurrect flashlight support in obsolete IHardwareService Binder API.
 2010-05-17 14:59:39 -07:00
Mike Lockwood
3e9e9696f1 am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API. 
Merge commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f' into froyo-plus-aosp

* commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f':
  Resurrect flashlight support in obsolete IHardwareService Binder API.
 2010-05-17 14:56:53 -07:00
Mike Lockwood
eb9cbb8fdd Resurrect flashlight support in obsolete IHardwareService Binder API. 
This is to avoid flashlight apps that had been using reflection to access
this API after this class was removed after eclair.

Change-Id: I26ed929abad93345468eb33d4a15977a31ebea7e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-05-17 17:47:20 -04:00
Jean-Baptiste Queru
9eb7a72253 resolved conflicts for merge of f7fb5331 to kraken 
Change-Id: I61258dd7c7e52a6251c1d9499e113401ff375b20
 2010-05-17 13:50:32 -07:00
The Android Open Source Project
f7fb5331e5 merge from open-source master 
Change-Id: Ia0201ec7be4c112569b8775429d1c9674eb3b661
 2010-05-17 08:56:54 -07:00
Romain Guy
c4fee63301 Merge "Fixing indeterminate progress bar animation state." 2010-05-15 12:34:05 -07:00
David Sobreira Marques
52a35433cf Fixing indeterminate progress bar animation state. 
When showing a progress bar instance more than once
it will not animate after the first time.

Change-Id: I5104c551d561755005e533f2ab5257454567bf71
Signed-off-by: David Sobreira Marques <dpsmarques@gmail.com>
 2010-05-15 16:10:18 -03:00
Wu-cheng Li
e339c5edbe Add camera focus distances API. 
Applications can use this API to estimate the distance
between the subject and the camera.

bug:1955650
Change-Id: Ie6c8ea4971759cab6c9bcdda2c5ceb5925791c27
 2010-05-15 12:40:54 +08:00
Scott Main
6c034325a8 am 6d8e4fd8: am b83a283a: docs: add dev guide for backup 
Merge commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf' into kraken

* commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf':
  docs: add dev guide for backup
 2010-05-14 11:56:14 -07:00
Scott Main
6d8e4fd83b am b83a283a: docs: add dev guide for backup 
Merge commit 'b83a283ac178ab0a72f1d811189d79b26097835e' into froyo-plus-aosp

* commit 'b83a283ac178ab0a72f1d811189d79b26097835e':
  docs: add dev guide for backup
 2010-05-14 11:53:44 -07:00
Scott Main
b83a283ac1 docs: add dev guide for backup 
Change-Id: I168f6b15d3441c9cbea2cd9699612476c7244530
 2010-05-14 11:47:42 -07:00
The Android Open Source Project
e28776bbd7 am b1110149: merge from open-source master 
Merge commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9' into kraken

* commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9':
  Use integer for loop counter instead of float
  New test in FrameworkTest for the VelocityTracker class
  Preserve '+' in phone numbers imported from SIM.
 2010-05-13 14:56:02 -07:00
The Android Open Source Project
b1110149cc merge from open-source master 
Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8
 2010-05-13 14:50:16 -07:00
Jaikumar Ganesh
54a8f29523 Merge "Add FLAG_RERAIN_PHONE_NUMBER_FORMATTING." into kraken 2010-05-13 12:20:06 -07:00
Kenny Root
b79781af1e Use integer for loop counter instead of float 
Change-Id: Iafaccbb3a3a7cbe0d67ed6827906d713c37ce89b
 2010-05-13 12:17:15 -07:00
The Android Open Source Project
485b800eac am 1a3b3d48: merge from open-source master 
Merge commit '1a3b3d48413d9134738c9b457292fb2b71a5dfe4' into kraken

* commit '1a3b3d48413d9134738c9b457292fb2b71a5dfe4':
  Add some documentation about the thread safety of Cursor and some of the SQLite* classes.
 2010-05-13 09:53:16 -07:00
The Android Open Source Project
1a3b3d4841 merge from open-source master 
Change-Id: I51b4eccfde8e74c69ab8e0c051bb8ea718ee7101
 2010-05-13 09:04:45 -07:00
Costin Manolache
c195965893 am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo 
Merge commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02' into kraken

* commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02':
  Bug 2680071: Rename the Cloud to Device
 2010-05-12 19:10:01 -07:00
Costin Manolache
fa2e3dcd85 am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo 
Merge commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e' into froyo-plus-aosp

* commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e':
  Bug 2680071: Rename the Cloud to Device
 2010-05-12 19:06:39 -07:00
Costin Manolache
8ea9f130d2 Merge "Bug 2680071: Rename the Cloud to Device" into froyo 2010-05-12 19:04:27 -07:00
Jeff Hamilton
f3ca9a5c7e Add some documentation about the thread safety of Cursor and some of the SQLite* classes. 
Change-Id: Icae51052d1c942d7d60bb958d3703411da001079
 2010-05-12 16:44:19 -07:00
Costin Manolache
8d83f9e31b Bug 2680071: Rename the Cloud to Device 
Change-Id: I12ab32de393e44a499e3f9e3a0b38f4682156ff5
 2010-05-12 16:16:34 -07:00
Grace Kloba
2fb3b394fb am bfc63c7b: 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 'bfc63c7b83160fd3e771e5187d317348e72d6c27' into kraken

* commit 'bfc63c7b83160fd3e771e5187d317348e72d6c27':
  The default AlertDialog allows cancel. But the default
 2010-05-12 15:35:37 -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
The Android Open Source Project
d6e24ca28b am 4adacd23: merge from open-source master 
Merge commit '4adacd23d4c91569b16fe50419f1a91f68d805bd' into kraken

* commit '4adacd23d4c91569b16fe50419f1a91f68d805bd':
  Add support for EVDO Rev B
 2010-05-12 14:56:00 -07:00
The Android Open Source Project
4adacd23d4 merge from open-source master 
Change-Id: If6730b50627b2231bd345e594d8d30a37557849e
 2010-05-12 14:53:25 -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
Costin Manolache
8579a4d726 am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo 
Merge commit '625de488973f262e56d3ee6825a8cf1ebaee089b' into kraken

* commit '625de488973f262e56d3ee6825a8cf1ebaee089b':
  Bug 2673557: rename datamessaging
 2010-05-12 07:55:32 -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
Costin Manolache
e2055fe425 Merge "Bug 2673557: rename datamessaging" into froyo 2010-05-11 11:42:58 -07:00
Keith Ito
8528fcb199 am a8d8cb12: am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo 
Merge commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4' into kraken

* commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4':
  Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
 2010-05-11 10:24:03 -07:00
Nicolas Roard
2f68be5417 am 373b4913: am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149) 
Merge commit '373b4913ab5398736551ab718eb8c39d6f76e5d0' into kraken

* commit '373b4913ab5398736551ab718eb8c39d6f76e5d0':
  Fix the 'wobbling fixed elements' bug.
 2010-05-11 10:24:00 -07:00
Dianne Hackborn
7d5cea988b am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo 
Merge commit '7e76b6d191e1173bd85337a2861d9914922f5a0d' into kraken

* commit '7e76b6d191e1173bd85337a2861d9914922f5a0d':
  Hopefully fix issue #2662536: Why is launcher being killed?
 2010-05-11 10:23:56 -07:00
Keith Ito
a8d8cb12b3 am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo 
Merge commit 'be65399baf23855094596e27c25763ff92e9e027' into froyo-plus-aosp

* commit 'be65399baf23855094596e27c25763ff92e9e027':
  Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
 2010-05-11 10:19:06 -07:00
Nicolas Roard
373b4913ab am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149) 
Merge commit 'f78acacb0d7a8e4d9e85a1cd6eed0f6bb38d6776' into froyo-plus-aosp

* commit 'f78acacb0d7a8e4d9e85a1cd6eed0f6bb38d6776':
  Fix the 'wobbling fixed elements' bug.
 2010-05-11 10:18:59 -07:00
Dianne Hackborn
7e76b6d191 am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo 
Merge commit '6d00151c519d5c131cc1480978fe4417cc7bcc79' into froyo-plus-aosp

* commit '6d00151c519d5c131cc1480978fe4417cc7bcc79':
  Hopefully fix issue #2662536: Why is launcher being killed?
 2010-05-11 10:18:55 -07:00
Naveen Kalla
0a5174a6e9 Add support for EVDO Rev B 
Change-Id: I8588e8b342c51f4b79bced8ef8fe60d57f07aefa
 2010-05-11 10:12:07 -07:00
Keith Ito
be65399baf Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo 2010-05-10 20:41:47 -07:00
Nicolas Roard
f78acacb0d Fix the 'wobbling fixed elements' bug. 
Cherry-picked from master.
This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149)

Bug:2665696
Change-Id: I0a044661ff21ef601ba34782db8acdc9531f98e7
 2010-05-10 19:31:54 -07:00