Commit Graph

15044 Commits

Author SHA1 Message Date
Svetoslav Ganov
9bb7bf6327 am f6e7d592: am 33322052: Merge "DatePicker is picking the wrong date" into honeycomb
* commit 'f6e7d592224851b7d623180bb2ea780234580cee':
  DatePicker is picking the wrong date
2011-01-24 16:24:32 -08:00
Svetoslav Ganov
f6e7d59222 am 33322052: Merge "DatePicker is picking the wrong date" into honeycomb
* commit '33322052edd6c77b4378e69b66f746f241a80764':
  DatePicker is picking the wrong date
2011-01-24 15:28:30 -08:00
Svetoslav Ganov
33322052ed Merge "DatePicker is picking the wrong date" into honeycomb 2011-01-24 15:26:42 -08:00
Adam Powell
440d23a20d am efc2714d: am 1914971c: Merge "Fix bug 3242393 - overscroll effect missing from lists which drag but are always visible" into honeycomb
* commit 'efc2714dea3daa2fce376aecfe6d31d194c39b3d':
  Fix bug 3242393 - overscroll effect missing from lists which drag but are always visible
2011-01-24 15:08:45 -08:00
Leon Scroggins
62e4af1656 am 09176dcb: am 8801ad35: Merge "Disable focus controller when WebView loses focus." into honeycomb
* commit '09176dcb3d01b014eeb73ab3d643ac36c717dd75':
  Disable focus controller when WebView loses focus.
2011-01-24 15:06:30 -08:00
Adam Powell
efc2714dea am 1914971c: Merge "Fix bug 3242393 - overscroll effect missing from lists which drag but are always visible" into honeycomb
* commit '1914971c6bdeac330846488fdd5c0bb4120d5624':
  Fix bug 3242393 - overscroll effect missing from lists which drag but are always visible
2011-01-24 15:06:28 -08:00
Leon Scroggins
09176dcb3d am 8801ad35: Merge "Disable focus controller when WebView loses focus." into honeycomb
* commit '8801ad35264b6780697fcdcfbac0e17c7ca2d771':
  Disable focus controller when WebView loses focus.
2011-01-24 15:04:19 -08:00
Adam Powell
1914971c6b Merge "Fix bug 3242393 - overscroll effect missing from lists which drag but are always visible" into honeycomb 2011-01-24 15:03:16 -08:00
Gilles Debunne
ad18453037 am c46491fc: am 7c8c6d68: Typo in InputMethodManager\'s documentation
* commit 'c46491fc2fdaa8cddaa2a4f83f50630b7d2e2a74':
  Typo in InputMethodManager's documentation
2011-01-24 15:03:12 -08:00
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
3a23a82275 am 287035f5: am 88b5953a: Merge "NULL inputType text fields should never show the IME." into honeycomb
* commit '287035f5749e4a5d4f088ee5f215f9ec4d03cc42':
  NULL inputType text fields should never show the IME.
2011-01-24 14:50:29 -08:00
Gilles Debunne
d07eaa2388 am b77e727a: am 705a27a9: Merge "Non-editable TextViews should not display a cursor." into honeycomb
* commit 'b77e727a255da00b2843a0d39efdde91364c8cb1':
  Non-editable TextViews should not display a cursor.
2011-01-24 14:50:26 -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
64c2196b39 am 89d90299: am c831e319: Merge "Fix bug 3382994 - android.view.WindowManager" into honeycomb
* commit '89d90299b0c31277d4fe61f644c09cfab4ae44ee':
  Fix bug 3382994 - android.view.WindowManager$BadTokenException
2011-01-24 14:39:54 -08: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
Jeff Hamilton
ff4e6f58d6 am 0ccac6e3: Merge "Merge commit \'446aea40\' into manualmerge" into honeycomb-plus-aosp
* commit '0ccac6e3ee687930d411be69b3bb6904656d128d':
  API changes for NFC.
2011-01-24 14:34:46 -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
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
1511cd10c4 am 6e274c5e: am bffb0a25: Merge "Fix bug 3237638 - make it easy to change a "refresh" AB button/icon into the indeterminate progress icon" into honeycomb
* commit '6e274c5e1dfa6a98110ebc0ec0a4ce1924fa7c53':
  Fix bug 3237638 - make it easy to change a "refresh" AB button/icon into the indeterminate progress icon
2011-01-24 14:28:24 -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
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
Huahui Wu
61b9649a50 am 6e4a69bb: am 94b8b114: Merge "A few small cleanning-ups." into honeycomb
* commit '6e4a69bbf7d7566899ec76d2634538dd79ca4166':
  A few small cleanning-ups.
2011-01-24 13:36:39 -08:00
Joe Onorato
b05aacc1ae am ab8967ae: am da34e13b: Merge "Remove unwanted parameter (it was a typo)." into honeycomb
* commit 'ab8967ae9db71291094da2967e744038b7e91ff7':
  Remove unwanted parameter (it was a typo).
2011-01-24 13:30:42 -08:00
Chet Haase
3873da3c6e am 2acb67ec: am 67005b05: Merge "Use optimized display lists for all hwaccelerated rendering" into honeycomb
* commit '2acb67ec9fe34316231519373f59dfb76c03d57b':
  Use optimized display lists for all hwaccelerated rendering
2011-01-24 13:30:37 -08:00
Gilles Debunne
161bfdd0ce am 971bdb3a: am 7108724d: Merge "New fix for popup behavior in AutoCompleteTextViews." into honeycomb
* commit '971bdb3a24582ab1f09745cdef1ec906ff13b7f9':
  New fix for popup behavior in AutoCompleteTextViews.
2011-01-24 13:30:23 -08:00
Jean-Michel Trivi
477e035995 am dc871fd8: resolved conflicts for merge of 3ebade5d to honeycomb-plus-aosp
* commit 'dc871fd870972bd704d720fae45bcbbcc5905173':
  Bug 3365937 notify TTS initialization listener of binding errors
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
Dianne Hackborn
066db079a8 am 1eefe1fa: am 582a3944: Merge "Fix a regression in the wallpaper drawing." into honeycomb
* commit '1eefe1facc5607d502c5bdd2c11c11acd2438666':
  Fix a regression in the wallpaper drawing.
2011-01-24 13:27:00 -08:00
Adam Powell
003d248a52 am b3f079bc: am a6ce0819: Merge "Fix bug 3381275 - Too much padding on the left of a custom nav bar" into honeycomb
* commit 'b3f079bc67a8d1d330c4ee6e348cb286118416da':
  Fix bug 3381275 - Too much padding on the left of a custom nav bar
2011-01-24 13:26:43 -08:00
Joe Onorato
10f4126a36 resolved conflicts for merge of faf083ef to master
Change-Id: I316a1b4356f6dba6c3880ccb02dbb2fa00d21a85
2011-01-24 13:16:08 -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
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
Joe Onorato
ab8967ae9d am da34e13b: Merge "Remove unwanted parameter (it was a typo)." into honeycomb
* commit 'da34e13bb4ef97832c43489937a26d314437a1d7':
  Remove unwanted parameter (it was a typo).
2011-01-24 11:16:43 -08:00
Chet Haase
2acb67ec9f am 67005b05: Merge "Use optimized display lists for all hwaccelerated rendering" into honeycomb
* commit '67005b05cc76a38a5b3bf6e83957dd03619e9126':
  Use optimized display lists for all hwaccelerated rendering
2011-01-24 11:15:51 -08:00
Gilles Debunne
971bdb3a24 am 7108724d: Merge "New fix for popup behavior in AutoCompleteTextViews." into honeycomb
* commit '7108724d4b6a1c2862154cd52ed4fb1e5f001186':
  New fix for popup behavior in AutoCompleteTextViews.
2011-01-24 11:15:38 -08:00
Joe Onorato
da34e13bb4 Merge "Remove unwanted parameter (it was a typo)." into honeycomb 2011-01-24 10:43:55 -08:00
Jean-Michel Trivi
dc871fd870 resolved conflicts for merge of 3ebade5d to honeycomb-plus-aosp
Change-Id: Ifd5f88f75feeb2dad1131e6a262dff3b979bdf8d
2011-01-24 09:35:57 -08:00
Joe Onorato
e595cad6ee Remove unwanted parameter (it was a typo).
Bug: 3241144
Change-Id: I569f6c8dffb17041a422be6084b6eab89624a57b
2011-01-24 09:25:35 -08:00
Chet Haase
67005b05cc Merge "Use optimized display lists for all hwaccelerated rendering" into honeycomb 2011-01-24 09:24:59 -08:00