41579 Commits

Author SHA1 Message Date
Leon Scroggins
8801ad3526 Merge "Disable focus controller when WebView loses focus." into honeycomb 2011-01-24 15:02:10 -08:00
Gilles Debunne
c46491fc2f am 7c8c6d68: Typo in InputMethodManager\'s documentation
* commit '7c8c6d689280ecfbd151a2e0cb40341768470676':
  Typo in InputMethodManager's documentation
2011-01-24 15:01:02 -08:00
Adam Powell
4ce35419ce Fix bug 3242393 - overscroll effect missing from lists which drag but
are always visible

Change-Id: I20d73c452c7b98f1a046e356d0c6cdbfc8e5fe7a
2011-01-24 14:55:00 -08:00
Gilles Debunne
287035f574 am 88b5953a: Merge "NULL inputType text fields should never show the IME." into honeycomb
* commit '88b5953ab2f63ed6f820bb13845cf8fecb2d57e3':
  NULL inputType text fields should never show the IME.
2011-01-24 14:48:28 -08:00
Gilles Debunne
b77e727a25 am 705a27a9: Merge "Non-editable TextViews should not display a cursor." into honeycomb
* commit '705a27a97ccd8e363944083d948b7f5204916b85':
  Non-editable TextViews should not display a cursor.
2011-01-24 14:48:21 -08:00
Gilles Debunne
7c8c6d6892 Typo in InputMethodManager's documentation
Change-Id: I711e6d24462e336546b789fac0b9c6f529ebe260
2011-01-24 14:48:14 -08:00
Gilles Debunne
88b5953ab2 Merge "NULL inputType text fields should never show the IME." into honeycomb 2011-01-24 14:46:57 -08:00
Gilles Debunne
705a27a97c Merge "Non-editable TextViews should not display a cursor." into honeycomb 2011-01-24 14:46:42 -08:00
Leon Scroggins
b4ffd11284 Disable focus controller when WebView loses focus.
Bug:3370821
Change-Id: Ia26a54e1c5ec050d76e60762f9a5eb4502d8c6e3
2011-01-24 17:43:47 -05:00
Adam Powell
89d90299b0 am c831e319: Merge "Fix bug 3382994 - android.view.WindowManager" into honeycomb
* commit 'c831e3192ccd9b2cf69ec7c973005e578631da3b':
  Fix bug 3382994 - android.view.WindowManager$BadTokenException
2011-01-24 14:37:46 -08:00
Adam Powell
c831e3192c Merge "Fix bug 3382994 - android.view.WindowManager$BadTokenException" into honeycomb 2011-01-24 14:35:11 -08:00
Dianne Hackborn
81ac92df33 am 6d92cde2: am 35f4d32d: Merge "frameworks/base: Track owner in appropriate owners list of Uri"
* commit '6d92cde287b6399d5c90f3eaccb73602d6d51313':
  frameworks/base: Track owner in appropriate owners list of Uri
2011-01-24 14:34:46 -08:00
Jaikumar Ganesh
4290211eef am f6439749: (-s ours) am 1c9761e3: Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
* commit 'f643974954c47c95cd84c774db7f1e3997ee9c96':
  Do Not Merge Connect other profiles when priority is auto connect.
2011-01-24 14:34:40 -08:00
John Reck
80a9791b1d am 3cc8a3a4: (-s ours) am 398a589c: Merge "DO NOT MERGE - Create db path if it doesn\'t exit" into gingerbread
* commit '3cc8a3a47ede49b8699c2a839626a44f2d57cd73':
  DO NOT MERGE - Create db path if it doesn't exit
2011-01-24 14:34:30 -08:00
Jeff Hamilton
9f0fefeb5b am 0c5e2b3f: am dc54a8c7: Merge "API changes for NFC." into gingerbread
* commit '0c5e2b3f1377b3b52c535a1f95899830f5de0347':
  API changes for NFC.
2011-01-24 14:34:09 -08:00
Xavier Ducrohet
b84e351733 am 5b9936f6: Merge "LayoutLib: Use special view cookie for include-merge case." into honeycomb
* commit '5b9936f651a06b4b3c988ee330d12355041eeb00':
  LayoutLib: Use special view cookie for include-merge case.
2011-01-24 14:33:28 -08:00
Jeff Hamilton
0ccac6e3ee Merge "Merge commit '446aea40' into manualmerge" into honeycomb-plus-aosp 2011-01-24 14:32:13 -08:00
Jeff Hamilton
b0cae14175 Merge commit '446aea40' into manualmerge
Conflicts:
	api/current.xml

Change-Id: Ic58c56929d8281eca2e801903d9ab98d03e7f975
2011-01-24 16:31:38 -06:00
Xavier Ducrohet
5b9936f651 Merge "LayoutLib: Use special view cookie for include-merge case." into honeycomb 2011-01-24 14:31:28 -08:00
Adam Powell
55767443ad Fix bug 3382994 - android.view.WindowManager$BadTokenException
Remove pending callbacks when ActionMenuView is detached.

Change-Id: Ia61e446f60f10dd82476c00b4c11177182e7db60
2011-01-24 14:28:37 -08:00
Adam Powell
6e274c5e1d am bffb0a25: Merge "Fix bug 3237638 - make it easy to change a "refresh" AB button/icon into the indeterminate progress icon" into honeycomb
* commit 'bffb0a2586751fc409e57cee5382cfd2ec6543de':
  Fix bug 3237638 - make it easy to change a "refresh" AB button/icon into the indeterminate progress icon
2011-01-24 14:26:01 -08:00
Adam Powell
bffb0a2586 Merge "Fix bug 3237638 - make it easy to change a "refresh" AB button/icon into the indeterminate progress icon" into honeycomb 2011-01-24 14:23:36 -08:00
Xavier Ducrohet
82b9232565 LayoutLib: Use special view cookie for include-merge case.
All items directly under the <merge> tag now return the view cookie
of the referencing <include> tag using a special class for
easy differentiation in the calling client.

Change-Id: I7a2a4e642be9564f47e256fd1586012497d34792
2011-01-24 14:14:53 -08:00
Brad Fitzpatrick
23a813e17d am 996de2dd: Merge "Avoid using String.format in MediaRecorder"
* commit '996de2dd41498a48be6821cfa0a81b16c0b3975c':
  Avoid using String.format in MediaRecorder
2011-01-24 14:03:48 -08:00
Adam Powell
abbcc241c0 Fix bug 3237638 - make it easy to change a "refresh" AB button/icon
into the indeterminate progress icon

This fixes a bug that caused ActionViews to not be updated properly
after a pass through invalidateOptionsMenu/onPrepareOptionsMenu. Apps
can now set/clear action views to display progress spinner widgets or
anything else on demand.

Change-Id: I138eceb504177c6bb5b86d40a68a82973aa841a5
2011-01-24 14:03:16 -08:00
Andreas Huber
54bce526bf am bc5172fe: Merge "Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder" into honeycomb
* commit 'bc5172fe662104e2558b0841fcf82035398e5cac':
  Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
2011-01-24 14:00:59 -08:00
Andreas Huber
bc5172fe66 Merge "Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder" into honeycomb 2011-01-24 13:57:11 -08:00
Stephen Hines
7e893e1ddf Add missing functions to math library.
This also updates the math test suite to exercise all the basic operator
functions (except __udivsi3 which may not be 100% necessary). There is also a
small fix for rsQuaternionMultiply().

Change-Id: Id157e6d5ebe2e20c17e8ea7b13ffaa74c241838c
b: 3203577
2011-01-24 13:56:30 -08:00
Eric Fischer
6d6f04b6bb am f7358996: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit 'f7358996d38c3552344e225ce2f3455089be715c':
  Import revised translations.  DO NOT MERGE
2011-01-24 13:49:25 -08:00
Jeff Brown
4519f07e9c New orientation listener.
The objective in this listener is to be more careful about the
signal processing to prevent spurious orientation changes
and to make all of the tweakable factors physically meaningful.

The calibration is defined in terms of time constants and
does not assume a particular discrete sampling rate.  This is
useful because it allows us to change the accelerometer sampling
interval if desired without having to change the calibration.
Moreover, the accelerometer sampling interval can vary +/- 20ms
from one sample to the next even in normal circumstances.

Proposed orientation changes are weighted by confidence factors
that vary exponentially in relation to how close the device
is to the ideal orientation change posture (screen is vertical,
angle is exactly at the midpoint of the orientation quadrant,
and no external acceleration beside gravity).  When not in an ideal
posture, the device takes proportionally longer to settle into a
new orientation state.

Added a little tool to plot the log output of the
WindowOrientationListener.  Check the README for more information
about how to use it.

Change-Id: I787f02d03582ff26367df65eda8d9ce85c5cb343
2011-01-24 13:46:57 -08:00
Eric Fischer
f7358996d3 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-01-24 13:46:28 -08:00
Andreas Huber
a8385dd7c1 Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
Change-Id: Ia22ebce66d9c35de4b04c3eedc9495847796901d
related-to-bug: 3384367
2011-01-24 13:36:30 -08:00
Brad Fitzpatrick
996de2dd41 Merge "Avoid using String.format in MediaRecorder" 2011-01-24 13:36:15 -08:00
Andreas Huber
5481142a03 am c45d3ad0: Merge "The .mkv parser lib leaves some tracks NULL if it doesn\'t support them." into honeycomb
* commit 'c45d3ad08469eb4c519a5aeef74f6d914e674144':
  The .mkv parser lib leaves some tracks NULL if it doesn't support them.
2011-01-24 13:31:27 -08:00
Andreas Huber
c45d3ad084 Merge "The .mkv parser lib leaves some tracks NULL if it doesn't support them." into honeycomb 2011-01-24 13:29:58 -08:00
Huahui Wu
6e4a69bbf7 am 94b8b114: Merge "A few small cleanning-ups." into honeycomb
* commit '94b8b114ab9abf5ccad6b85deb08aac2a359915d':
  A few small cleanning-ups.
2011-01-24 13:27:25 -08:00
Huahui Wu
94b8b114ab Merge "A few small cleanning-ups." into honeycomb 2011-01-24 13:25:17 -08:00
Dianne Hackborn
21e7ba2451 am 15efe4cb: am a8069f34: Merge "Fixes Keyboard availability in "Providing Resources" documentation page."
* commit '15efe4cb4c7d5bd19266ff740b1a3c8a703cd3a9':
  Fixes Keyboard availability in "Providing Resources" documentation page.
2011-01-24 13:23:43 -08:00
Daniel Sandler
c0d6b8d7fb am 1e25a23f: Merge "Vertically align SSID/PLMN on lockscreen." into honeycomb
* commit '1e25a23f9d5319267e48242b1dd655697da4a175':
  Vertically align SSID/PLMN on lockscreen.
2011-01-24 13:16:38 -08:00
Daniel Sandler
1e25a23f9d Merge "Vertically align SSID/PLMN on lockscreen." into honeycomb 2011-01-24 13:14:35 -08:00
Justin Ho
7cd1cc8319 am 28c4f69a: Updated checkbox assets
* commit '28c4f69a938766076c14e8f5b07951ec2a9f610d':
  Updated checkbox assets
2011-01-24 13:08:54 -08:00
Justin Ho
28c4f69a93 Updated checkbox assets
Change-Id: I93c979816bc3310c510bf8942c273ce8c411150d
2011-01-24 13:05:06 -08:00
Justin Ho
f8a93b4ba2 am 7040e33c: Merge "Updated checkbox assets for legacy applications" into honeycomb
* commit '7040e33c183f431531bd68b23c6d69d31eb1a173':
  Updated checkbox assets for legacy applications
2011-01-24 12:58:00 -08:00
Justin Ho
7040e33c18 Merge "Updated checkbox assets for legacy applications" into honeycomb 2011-01-24 12:55:29 -08:00
Gilles Debunne
98dbfd4940 Non-editable TextViews should not display a cursor.
Bug 3381320

The tests were inconsistent between makeBlink and onDraw.
If the text is non-editable, do not draw the cursor.

Change-Id: I0405e59444261a553e868b3ae5bdddd278f60bb2
2011-01-24 12:54:10 -08:00
Daniel Sandler
bfa8983b65 Vertically align SSID/PLMN on lockscreen.
Bug: 3373818
Change-Id: Ie20584c5247bd52e376ddcb97205ba967ce3a8ea
2011-01-24 15:52:46 -05:00
Andreas Huber
dfe8d9b1ff The .mkv parser lib leaves some tracks NULL if it doesn't support them.
But it still counts them as valid tracks...

Change-Id: I77e8fd24cce91a586e8e418759db55b6eba449c0
related-to-bug: 3377186
2011-01-24 12:46:12 -08:00
Eric Fischer
a1a8d941c2 Import revised translations. DO NOT MERGE
Change-Id: I4babd2856874af87e991dab0f5c9696e54ca49b4
2011-01-24 12:35:32 -08:00
Gilles Debunne
8cbb4c6e30 NULL inputType text fields should never show the IME.
Bug 3381317

Changes made in https://android-git.corp.google.com/g/#change,91880
displayed the IME onFocus. However, the test was not consistent to what
is done in touch event. textIsEditable is now checked too.

Change-Id: If11382c1c90a557839b87d62494253470c42b621
2011-01-24 12:33:56 -08:00
Huahui Wu
f93246923f A few small cleanning-ups.
1. Remove mDeferMultiTouch in WebView, it was for testing only but
we don't need it now since we always pass MultiTouch to WebKit.

2. Remove the use of mDeferMultiTouch in DRT tests.

3. Correct the index of getX(Y) for the second touch point in the
debug string of MotionEvent.

Change-Id: Ib63cfc5935af1a169ed26b2b138f74908492bc18
2011-01-24 12:07:37 -08:00