Commit Graph

8072 Commits

Author SHA1 Message Date
Mathias Agopian
d6ddcb7f00 fix [2677468] some 3rd party GL ES apps get a 32-bits surface by default and fail
force all SurfaceView to 565

Change-Id: I8ebfa1239d8e4fa097c2e544677fb92fa20b39bd
2010-05-24 19:07:08 -07:00
Adam Powell
9a559970a3 am f67c874c: am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
Merge commit 'f67c874c07d2e0ff888cc88679f884a833f89870' into kraken

* commit 'f67c874c07d2e0ff888cc88679f884a833f89870':
  Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
2010-05-24 16:26:06 -07:00
Adam Powell
f67c874c07 am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
Merge commit '7e5e3745cf0103219a13071fbd488c3c01da85d9' into froyo-plus-aosp

* commit '7e5e3745cf0103219a13071fbd488c3c01da85d9':
  Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
2010-05-24 16:23:53 -07:00
Adam Powell
7e5e3745cf Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
Change-Id: I21b37647c5ad16e4f57fdda433e3b3ee2c7c83ad
2010-05-24 15:13:41 -07:00
Wu-cheng Li
185cc455a8 Fix javadoc of camera focus distances API.
bug:1955650
Change-Id: I073eb533dd1d5fcebbaa430de9af2bf4335c406e
2010-05-20 16:33:51 +08:00
The Android Open Source Project
b32a74c73b am ee1cdd0e: merge from open-source master
Merge commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed' into kraken

* commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed':
  Don't allow invalid Uris to be added as observers.
2010-05-19 09:43:20 -07:00
The Android Open Source Project
ee1cdd0e60 merge from open-source master
Change-Id: I1612bf92bf47eb88299ed0e627e6662b23adc35a
2010-05-19 09:36:55 -07:00
The Android Open Source Project
bea97a897b am 2dc7c6c4: merge from open-source master
Merge commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d' into kraken

* commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d':
  Add and document .nomedia constant for MediaStore (Issue 6365)
2010-05-19 09:22:21 -07:00
The Android Open Source Project
2dc7c6c415 merge from open-source master
Change-Id: I94b3aacb3478b1d9e0751c02bb301d5f9a2cf05c
2010-05-19 09:20:22 -07:00
Romain Guy
bcb62f099a Merge "Don't allow invalid Uris to be added as observers." 2010-05-19 09:03:57 -07:00
The Android Open Source Project
b39b0f32d1 am faf9a783: merge from open-source master
Merge commit 'faf9a78363b0c773b95c9b43263d788aee313054' into kraken

* commit 'faf9a78363b0c773b95c9b43263d788aee313054':
  Text disappears when selecting text in text editor.
2010-05-19 08:41:26 -07:00
The Android Open Source Project
faf9a78363 merge from open-source master
Change-Id: I970684d917ea2024871b45abe532c52bb45673c6
2010-05-19 08:39:13 -07:00
The Android Open Source Project
627356cee4 am d6c0bb0f: merge from open-source master
Merge commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa' into kraken

* commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa':
  Removed Calls to deprecated APIs
2010-05-19 08:33:27 -07:00
The Android Open Source Project
d6c0bb0f0f merge from open-source master
Change-Id: I0598edad283a177a5ddcc30e20d2284503e6038e
2010-05-19 08:28:32 -07:00
Anthony Newnam
f51266471c Don't allow invalid Uris to be added as observers.
If a null segment is added, it will cause problems traversing the list
at a later point.

Change-Id: I5aa97b969cac7231e214168af7d3263b1c16f0a0
2010-05-19 07:39:07 -05:00
Romain Guy
e02a63f012 Merge "Add and document .nomedia constant for MediaStore (Issue 6365)" 2010-05-19 00:03:34 -07:00
Romain Guy
7a029da6d6 Merge "Text disappears when selecting text in text editor." 2010-05-19 00:01:55 -07:00
Dianne Hackborn
74323fd1ab Update NativeActivity to allow direct surface access.
No actual native API for using a surface, but it's a step.

Change-Id: I627f26b705abc7a05edf9117411abfacf0fae64a
2010-05-18 18:16:35 -07:00
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
Karl Ostmo
8ce072d579 Add and document .nomedia constant for MediaStore (Issue 6365)
Change-Id: Ic9c4a784187cd1264584992411916a5beeefd864
2010-05-17 14:57:06 -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
Christian Mehlmauer
746a95ab71 Removed Calls to deprecated APIs
Change-Id: I3f9b6a8d3c8a050156a6cc7ea0eb9de33b82f79a
2010-05-17 21:16:20 +02: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