Commit Graph

2999 Commits

Author SHA1 Message Date
Android (Google) Code Review
6bb388e543 Merge change 8242
* changes:
  Make intent broadcasts in "am" synchronous (they wait until exit). Clean up error handling and reporting in "am". Make the usage message for "am" more informative.
2009-07-22 17:35:18 -07:00
Android (Google) Code Review
04f12264cb am 280436ac: Merge change 8261 into donut
Merge commit '280436accc45c1883766a98499148439fa044531'

* commit '280436accc45c1883766a98499148439fa044531':
  Remove recently-added android.opengl.Version API
2009-07-22 17:34:28 -07:00
Mike LeBeau
937de8ea40 Merge commit '4182e684' into manualmerge
Conflicts:
	core/java/android/widget/AutoCompleteTextView.java
2009-07-22 17:31:09 -07:00
Android (Google) Code Review
0e22aed41c Merge change 8261 into donut
* changes:
  Remove recently-added android.opengl.Version API
2009-07-22 16:13:45 -07:00
Android (Google) Code Review
38bd78fb68 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
486cd172a7 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
Android (Google) Code Review
71bb96efec Merge change 8134
* changes:
  Adding contact group NOTES and SYSTEM_ID
2009-07-22 15:27:57 -07:00
Android (Google) Code Review
0d20465a0c Merge change 7954
* changes:
  Added native metadata support.
2009-07-22 15:26:02 -07:00
Android (Google) Code Review
a6de672a15 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
Android (Google) Code Review
1b5570fca6 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
Android (Google) Code Review
b690dfa4bb 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
1974706e0f Merge change 8228 into donut
* changes:
  Remove background padding workaround from SuggestionsAdapter
2009-07-22 13:31:20 -07:00
Android (Google) Code Review
10fcddcb11 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
059a08db4b Merge change 8227 into donut
* changes:
  Handle null in MatrixCursor.get*()
2009-07-22 13:27:26 -07:00
Android (Google) Code Review
8bcdc9039c 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
ab1f705ee2 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
16c0b91616 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
ed532f7faf Reconcile donut-release history into donut 2009-07-22 13:15:43 -07:00
Android (Google) Code Review
969f94f7da 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
fd65709373 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
Android (Google) Code Review
7bcb27c9ea 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
8586931391 Merge change 8186 into donut
* changes:
  Move global search intent launching to search dialog
2009-07-22 12:14:58 -07:00
Dianne Hackborn
1fa6bb0b11 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
Android (Google) Code Review
8b6e92fa71 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
75736faeee 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
0f6cc70039 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
805e691acc 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
735ec3bcef 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
29201c682f 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
212ccbb167 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
2a31b2c009 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
c7440d5d28 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
c3a2c4bd22 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
Android (Google) Code Review
18ad8b1531 Merge change 8216 into donut
* changes:
  Fixes #1994125. Ensures AbsListView's filter window is always dismissed.
2009-07-22 11:30:23 -07:00
Android (Google) Code Review
6d5d692637 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
122beef52f 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
aa6c660f90 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
1fc66e2fb5 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
Android (Google) Code Review
6d52a2cd9c Merge change 8209 into donut
* changes:
  Work around StateListDrawable padding in search suggestions
2009-07-22 11:19:18 -07:00
Android (Google) Code Review
eaa89c20b7 Merge change 8172 into donut
* changes:
  Add the phase2 field for EAP WiFi configuration.
2009-07-22 10:23:40 -07:00
Android (Google) Code Review
b5360d4c00 Merge change 8201 into donut
* changes:
  Proactively set mVisible attribute in startSearch and stopSearch (not just in message handler).
2009-07-22 10:23:16 -07:00
Android (Google) Code Review
8728348231 Merge change 8131 into donut
* changes:
  Fix android.core.FileTest#testFile: add sdcard write permission to test.
2009-07-22 10:03:56 -07:00
Android (Google) Code Review
298cb4ff6a Merge change 7529
* changes:
  Make MemoryDealer's destructor protected instead of public.
2009-07-22 09:29:00 -07:00
The Android Open Source Project
bc43162323 Merge commit 'remotes/goog/donut' into donut-release 2009-07-22 08:35:54 -07:00
Android (Google) Code Review
8db10c8781 Merge change 8179 into donut
* changes:
  Fix SQL generated by updateWithOnConflict()
2009-07-22 05:02:53 -07:00
Android (Google) Code Review
4f6bc87c15 Merge change 8082 into donut
* changes:
  Cleanup the old keystore APIs.
2009-07-22 00:57:48 -07:00
Android (Google) Code Review
7e1bf6cb85 Merge change 8025
* changes:
  wire appcache to the HTML5 UI
2009-07-22 00:45:05 -07:00
Android (Google) Code Review
b03ae16475 Merge change 8143
* changes:
  Fix remote caller ID unknow issue in 3 way call
2009-07-21 19:10:32 -07:00
Android (Google) Code Review
351b6f926e am 9fc20b0e: Merge change 8126 into donut
Merge commit '9fc20b0e381b5fe00b7049ef357c839cd05a33bf'

* commit '9fc20b0e381b5fe00b7049ef357c839cd05a33bf':
  First pass at reworking screen density/size APIs.
2009-07-21 19:03:53 -07:00
Android (Google) Code Review
7a0847196c Merge change 8126 into donut
* changes:
  First pass at reworking screen density/size APIs.
2009-07-21 19:01:28 -07:00