5240 Commits

Author SHA1 Message Date
Mike LeBeau
e39900ca7a Merge commit '4182e684' into manualmerge
Conflicts:
	core/java/android/widget/AutoCompleteTextView.java
2009-07-22 17:31:09 -07:00
Android (Google) Code Review
4182e68496 Merge change 8255 into donut
* changes:
  Add new hidden API setForceIgnoreOutsideTouch to AutoCompleteTextView for use by SearchDialog. SearchDialog wants to be able to say a dropdown should not always be visible but still let it ignore outside touch when it does show.
2009-07-22 16:13:40 -07:00
Xavier Ducrohet
f57117b733 am eba337ad: Reimplement TypedArray.getLayoutDimension(int, int) for the layout bridge.
Merge commit 'eba337ad09ba93b31f4e9ec8f99be3ae2811bf89'

* commit 'eba337ad09ba93b31f4e9ec8f99be3ae2811bf89':
  Reimplement TypedArray.getLayoutDimension(int, int) for the layout bridge.
2009-07-22 16:09:13 -07:00
Xavier Ducrohet
eba337ad09 Reimplement TypedArray.getLayoutDimension(int, int) for the layout bridge. 2009-07-22 15:44:52 -07:00
Android (Google) Code Review
6abef06ed0 Merge change 8134
* changes:
  Adding contact group NOTES and SYSTEM_ID
2009-07-22 15:27:57 -07:00
Android (Google) Code Review
ddbf560cfb Merge change 7954
* changes:
  Added native metadata support.
2009-07-22 15:26:02 -07:00
Mike LeBeau
d4760d77e7 Add new hidden API setForceIgnoreOutsideTouch to AutoCompleteTextView for
use by SearchDialog. SearchDialog wants to be able to say a dropdown should
not always be visible but still let it ignore outside touch when it does
show.

Fixes http://b/1997170
2009-07-22 15:19:59 -07:00
Dmitri Plotnikov
02c5b45565 Adding contact group NOTES and SYSTEM_ID 2009-07-22 15:13:08 -07:00
Android (Google) Code Review
2c33bb19f7 am 98a44df4: Merge change 8235 into donut
Merge commit '98a44df4b4cc8cd28276ad888a7e17f81353ae44'

* commit '98a44df4b4cc8cd28276ad888a7e17f81353ae44':
  * Revert the change that I introduced while refactroing in SurfaceView#dispatchTouchEvent
2009-07-22 15:09:23 -07:00
niko
bc72692780 Added native metadata support.
Metadata.java:
Fixed typo 8k != 8092. The comment was correct though.

In Metadata.h, the new Metadata class is declared in the ns android::media
to limit the chances of conflict with other packages.

The MetadataType in MediaPlayerInterface is gone and moved to Metadata as
an inner typedef.

Similarly the SortedVector<MetadataType> instance have been replace by a
new type Metadata::Filter.

All the keys declared in the java counterpart are also in Metadata.h.

Metadata.cpp:
Contains the implementation of the native metadata packing.

There an associated change in the opencore package that should go in
at the same time as this one.
2009-07-22 15:03:22 -07:00
Android (Google) Code Review
98a44df4b4 Merge change 8235 into donut
* changes:
  * Revert the change that I introduced while refactroing in SurfaceView#dispatchTouchEvent * Don't scale back the event if the canvas is used in SurfaceView.
2009-07-22 14:42:08 -07:00
Mitsuru Oshima
424f668545 * Revert the change that I introduced while refactroing in SurfaceView#dispatchTouchEvent
* Don't scale back the event if the canvas is used in SurfaceView.
2009-07-22 13:54:26 -07:00
Android (Google) Code Review
1193965757 am 0b1a255f: Merge change 8228 into donut
Merge commit '0b1a255f736851342016e657ba6ccf096a9497ea'

* commit '0b1a255f736851342016e657ba6ccf096a9497ea':
  Remove background padding workaround from SuggestionsAdapter
2009-07-22 13:32:58 -07:00
Android (Google) Code Review
0b1a255f73 Merge change 8228 into donut
* changes:
  Remove background padding workaround from SuggestionsAdapter
2009-07-22 13:31:20 -07:00
Android (Google) Code Review
1186bb1eca am ae1ba650: Merge change 8227 into donut
Merge commit 'ae1ba650074ab7b9a73f4430c1fc3576a8199383'

* commit 'ae1ba650074ab7b9a73f4430c1fc3576a8199383':
  Handle null in MatrixCursor.get*()
2009-07-22 13:29:31 -07:00
Android (Google) Code Review
ae1ba65007 Merge change 8227 into donut
* changes:
  Handle null in MatrixCursor.get*()
2009-07-22 13:27:26 -07:00
Bjorn Bringert
6aaeba20d2 Remove background padding workaround from SuggestionsAdapter
Romain has checked in a framework fix,
https://android-git.corp.google.com/g/8218
so the workaround added in
https://android-git.corp.google.com/g/8209
is no longer needed.

Fixes http://b/issue?id=1996635
2009-07-22 21:26:29 +01:00
Bjorn Bringert
f2cec58d90 Handle null in MatrixCursor.get*()
Before, if a column contained null, MatrixCursor.getString()
returned the string "null", and the get<Number>() methods
threw exceptions.

Now, getString() returns null, and get<Number>() return 0.

Fixes http://b/issue?id=1996628
2009-07-22 21:20:51 +01:00
Android (Google) Code Review
c7bebd1537 am 5f2b05ea: Merge change 8220 into donut
Merge commit '5f2b05ea3dfdaf63088ea3776af43b79c5698f09'

* commit '5f2b05ea3dfdaf63088ea3776af43b79c5698f09':
  Fix issue 1996218: Disable use of shared memory buffer by SoundPool.
2009-07-22 13:20:05 -07:00
Jean-Baptiste Queru
67f194f68c am 4071d82b: Reconcile donut-release history into donut
Merge commit '4071d82bc469d50be63b441b10d824138caa5ca3'

* commit '4071d82bc469d50be63b441b10d824138caa5ca3':
  MediaScanner: Add check for null object in empty title handling code.
2009-07-22 13:18:41 -07:00
Android (Google) Code Review
5f2b05ea3d Merge change 8220 into donut
* changes:
  Fix issue 1996218: Disable use of shared memory buffer by SoundPool.
2009-07-22 13:17:46 -07:00
Jean-Baptiste Queru
4071d82bc4 Reconcile donut-release history into donut 2009-07-22 13:15:43 -07:00
Android (Google) Code Review
68ce000ed8 am ef6b66cb: Merge change 8222 into donut
Merge commit 'ef6b66cbbbe7ae8ee0450cbbaae4194b069679a1'

* commit 'ef6b66cbbbe7ae8ee0450cbbaae4194b069679a1':
  Add a public API that reports the supported OpenGLES API level.
2009-07-22 13:06:03 -07:00
Android (Google) Code Review
ef6b66cbbb Merge change 8222 into donut
* changes:
  Add a public API that reports the supported OpenGLES API level.
2009-07-22 13:03:49 -07:00
Jack Palevich
1baf11b116 Add a public API that reports the supported OpenGLES API level. 2009-07-22 12:59:49 -07:00
Android (Google) Code Review
c58c78de2f am e94b2877: Merge change 8186 into donut
Merge commit 'e94b28773de2b2c9a0d0909841b2d3126048c888'

* commit 'e94b28773de2b2c9a0d0909841b2d3126048c888':
  Move global search intent launching to search dialog
2009-07-22 12:17:13 -07:00
Android (Google) Code Review
e94b28773d Merge change 8186 into donut
* changes:
  Move global search intent launching to search dialog
2009-07-22 12:14:58 -07:00
Dianne Hackborn
c00c04d7d8 am 11b822d2: Simplify density compatibility to a boolean.
Merge commit '11b822d2a91ea17c34c0cb1c11e80a9a30d72864'

* commit '11b822d2a91ea17c34c0cb1c11e80a9a30d72864':
  Simplify density compatibility to a boolean.
2009-07-22 12:01:19 -07:00
Dianne Hackborn
11b822d2a9 Simplify density compatibility to a boolean.
Instead of a list, we now just have a single boolean indicating whether an
application is density aware, and this set set to true by default as of
Donut.
2009-07-22 11:58:31 -07:00
Android (Google) Code Review
8aea2f5f74 am 59c25cba: Merge change 8218 into donut
Merge commit '59c25cbaf0dd690e503b881392510127441d9074'

* commit '59c25cbaf0dd690e503b881392510127441d9074':
  DrawableContainer was not respecting the value returned by Drawable.getPadding(Rect).
2009-07-22 11:51:34 -07:00
Android (Google) Code Review
5a2572d538 am 7228d0fd: Merge change 8213 into donut
Merge commit '7228d0fdd7fd151f033b09044a9ba94b2bc06b74'

* commit '7228d0fdd7fd151f033b09044a9ba94b2bc06b74':
  Resetting the setLanguage() call to its intended behavior after change 8089
2009-07-22 11:51:29 -07:00
Android (Google) Code Review
679b67ebfa am 26654274: Merge change 8216 into donut
Merge commit '26654274905961835a36dbcfe98dc745e8beefbf'

* commit '26654274905961835a36dbcfe98dc745e8beefbf':
  Fixes #1994125. Ensures AbsListView's filter window is always dismissed.
2009-07-22 11:51:25 -07:00
Android (Google) Code Review
e75cfdc733 am b551fb87: Merge change 8210 into donut
Merge commit 'b551fb872be9b758c7793f56398d25a74d4a404c'

* commit 'b551fb872be9b758c7793f56398d25a74d4a404c':
  Always call ensureImeVisible when the text field is clicked. We want this
2009-07-22 11:51:20 -07:00
Android (Google) Code Review
9d06da8324 am 5e21a11f: Merge change 8209 into donut
Merge commit '5e21a11f00e3e65f6d7681e2519677329f0a92b2'

* commit '5e21a11f00e3e65f6d7681e2519677329f0a92b2':
  Work around StateListDrawable padding in search suggestions
2009-07-22 11:51:16 -07:00
Android (Google) Code Review
d72aa3b92c am 356d4a14: Merge change 8172 into donut
Merge commit '356d4a14aa96cf52c16f7a4d381044ce28b01af3'

* commit '356d4a14aa96cf52c16f7a4d381044ce28b01af3':
  Add the phase2 field for EAP WiFi configuration.
2009-07-22 11:51:06 -07:00
Android (Google) Code Review
ba5e889eae am 6de72ea3: Merge change 8201 into donut
Merge commit '6de72ea39c9c00a2dc5ec539bf5733020c4db52f'

* commit '6de72ea39c9c00a2dc5ec539bf5733020c4db52f':
  Proactively set mVisible attribute in startSearch and stopSearch (not just in message handler).
2009-07-22 11:51:01 -07:00
Android (Google) Code Review
c33bd02e0f am 113eaa59: Merge change 8131 into donut
Merge commit '113eaa59c1dfafd548a13919e48c0346c0c925ac'

* commit '113eaa59c1dfafd548a13919e48c0346c0c925ac':
  Fix android.core.FileTest#testFile: add sdcard write permission to test.
2009-07-22 11:50:57 -07:00
Android (Google) Code Review
59c25cbaf0 Merge change 8218 into donut
* changes:
  DrawableContainer was not respecting the value returned by Drawable.getPadding(Rect).
2009-07-22 11:49:20 -07:00
Android (Google) Code Review
7228d0fdd7 Merge change 8213 into donut
* changes:
  Resetting the setLanguage() call to its intended behavior after change 8089 which works around the bug where a language cannot be set if the default language (which is loaded upon initialization) isn't eng-USA.
2009-07-22 11:48:11 -07:00
Romain Guy
5140141c26 DrawableContainer was not respecting the value returned by Drawable.getPadding(Rect).
Before this change, DrawableContainer would always return true from getPadding(Rect)
even if all of its children were returning false from getPadding(Rect). This change
modifies this behavior to respect getPadding(Rect): mConstantPadding is kept null
when getPadding(Rect) returns false for all of the children and a flag is set
to avoid recomputing that value every time getConstantPadding() is invoked.
2009-07-22 11:35:49 -07:00
Android (Google) Code Review
2665427490 Merge change 8216 into donut
* changes:
  Fixes #1994125. Ensures AbsListView's filter window is always dismissed.
2009-07-22 11:30:23 -07:00
Romain Guy
1f7f3c336a Fixes #1994125. Ensures AbsListView's filter window is always dismissed. 2009-07-22 11:29:59 -07:00
Android (Google) Code Review
578cf8104b am aa0e47cb: Merge change 8179 into donut
Merge commit 'aa0e47cbd6ccada9d194f39e6b4372d2d3594b38'

* commit 'aa0e47cbd6ccada9d194f39e6b4372d2d3594b38':
  Fix SQL generated by updateWithOnConflict()
2009-07-22 11:27:18 -07:00
Android (Google) Code Review
8d92b095da am dfca0ee8: Merge change 8082 into donut
Merge commit 'dfca0ee879a6cb14bcdabf34962dcec3b34a40b3'

* commit 'dfca0ee879a6cb14bcdabf34962dcec3b34a40b3':
  Cleanup the old keystore APIs.
2009-07-22 11:27:07 -07:00
Android (Google) Code Review
eda7572365 Merge change 8211
* changes:
  cleanup the WebStorage Java class. There were too many calls to syncValues().
2009-07-22 11:26:16 -07:00
Android (Google) Code Review
b551fb872b Merge change 8210 into donut
* changes:
  Always call ensureImeVisible when the text field is clicked. We want this regardless of whether dropDownAlwaysVisible is true or not, as long as the popup is showing and is potentially obscuring the IME.
2009-07-22 11:22:07 -07:00
Andrei Popescu
9a56bb838c cleanup the WebStorage Java class. There were too many calls to syncValues(). 2009-07-22 19:21:48 +01:00
Android (Google) Code Review
5e21a11f00 Merge change 8209 into donut
* changes:
  Work around StateListDrawable padding in search suggestions
2009-07-22 11:19:18 -07:00
Mike LeBeau
470c565b6a Always call ensureImeVisible when the text field is clicked. We want this
regardless of whether dropDownAlwaysVisible is true or not, as long as
the popup is showing and is potentially obscuring the IME.
2009-07-22 11:17:48 -07:00
Jean-Michel Trivi
9c53a5c01f Resetting the setLanguage() call to its intended behavior after change 8089
which works around the bug where a language cannot be set if the default
language (which is loaded upon initialization) isn't eng-USA.
2009-07-22 11:15:23 -07:00