Commit Graph

752 Commits

Author SHA1 Message Date
Adam Powell
0358def776 am 79492a0d: Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread
Merge commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211' into gingerbread-plus-aosp

* commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211':
  DO NOT MERGE Overscroll continues; asset and behavior tweaks.
2010-09-02 00:31:03 -07:00
Adam Powell
5916882c3f DO NOT MERGE Overscroll continues; asset and behavior tweaks.
Change-Id: I367643877a397e7b4fa9bd8c40639ff69436e7f0
2010-09-02 00:14:53 -07:00
Adam Powell
6fb81376b6 am e34fe69e: Merge "DO NOT MERGE Integrate edge effects into WebView." into gingerbread
Merge commit 'e34fe69e66d8c9bc76453347ba84261b060300f3' into gingerbread-plus-aosp

* commit 'e34fe69e66d8c9bc76453347ba84261b060300f3':
  DO NOT MERGE Integrate edge effects into WebView.
2010-09-01 14:01:44 -07:00
Adam Powell
230269d43b DO NOT MERGE Integrate edge effects into WebView.
TODO Effect for scaling gestures; asset/polish tweaks.

Change-Id: Ifbc201cb64e0610dbc92a7c57ba0d3a4ee686c43
2010-09-01 11:56:56 -07:00
Gilles Debunne
ff46a5c9bd am d2fbabad: Merge "Fixed single line state on TextView." into gingerbread
Merge commit 'd2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3' into gingerbread-plus-aosp

* commit 'd2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3':
  Fixed single line state on TextView.
2010-08-31 16:22:54 -07:00
Gilles Debunne
e67b58a347 Fixed single line state on TextView.
singleLine flag is set to false by default. However, when no singleLine or input
type is provided, the inputType of the TextView is not set to
EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE for edit texts.

Change-Id: Id747d3319afcddb3ab6ae0463947e8b3e470ef73
2010-08-31 16:02:18 -07:00
Adam Powell
a9c43aaa44 am 0a77ce27: New edge effects for scrolling widgets (overscroll)
Merge commit '0a77ce277c6ed2aa25bbea5f8cd5687c0720cb68' into gingerbread-plus-aosp

* commit '0a77ce277c6ed2aa25bbea5f8cd5687c0720cb68':
  New edge effects for scrolling widgets (overscroll)
2010-08-30 19:19:37 -07:00
Adam Powell
0a77ce277c New edge effects for scrolling widgets (overscroll)
TODO: Currently disabled for WebView. Assets used for the glow effect
need to be themable/styleable. Overscroll effect should take place
even when the user did not grab the widget within actual content.

Change-Id: I68277d14d37dc5bcdb9254eaddf6e4998b3f2bf4
2010-08-30 19:14:07 -07:00
Adam Powell
7d04f2bc4e am 4c72ad75: Merge "Fix bug 2918587 Infinite loop and memory leak in AdapterView" into gingerbread
Merge commit '4c72ad75cfb413f54cb59d413a232e77c7260ef2' into gingerbread-plus-aosp

* commit '4c72ad75cfb413f54cb59d413a232e77c7260ef2':
  Fix bug 2918587 Infinite loop and memory leak in AdapterView
2010-08-30 18:35:58 -07:00
Adam Powell
9c17a4c110 Fix bug 2918587 Infinite loop and memory leak in AdapterView
Change-Id: Icb63b186c56c2d731003dc38a8ff7a93a69a94e7
2010-08-30 18:23:26 -07:00
Gilles Debunne
aeaf2830f5 am e69b2860: Merge "DO NOT MERGE Removed "Stop selecting text" option." into gingerbread
Merge commit 'e69b286005b0b543e274f523d894e069811215a6' into gingerbread-plus-aosp

* commit 'e69b286005b0b543e274f523d894e069811215a6':
  DO NOT MERGE Removed "Stop selecting text" option.
2010-08-27 12:23:43 -07:00
Brad Fitzpatrick
2479097ecb am b94493fe: Merge "Document blocking behavior of ImageView setImageURI and setImageResource" into gingerbread
Merge commit 'b94493feaf8b7a620a25c23c1f131a999ed61293' into gingerbread-plus-aosp

* commit 'b94493feaf8b7a620a25c23c1f131a999ed61293':
  Document blocking behavior of ImageView setImageURI and setImageResource
2010-08-27 12:23:39 -07:00
Gilles Debunne
e69b286005 Merge "DO NOT MERGE Removed "Stop selecting text" option." into gingerbread 2010-08-27 11:50:26 -07:00
Brad Fitzpatrick
b94493feaf Merge "Document blocking behavior of ImageView setImageURI and setImageResource" into gingerbread 2010-08-27 11:49:31 -07:00
Brad Fitzpatrick
c6b0b7755c Document blocking behavior of ImageView setImageURI and setImageResource
Change-Id: I3b0633321229cad80ebf32e052c0db170a56de21
2010-08-27 11:43:56 -07:00
Gilles Debunne
d2420248fa DO NOT MERGE Removed "Stop selecting text" option.
Change-Id: Ic553d099664d1703a39139e7440d583cfec20d76
2010-08-27 10:49:14 -07:00
Gilles Debunne
dfad42760f am 225ad9cb: Merge "DO NOT MERGE Text selection: tapping on selection opens context menu" into gingerbread
Merge commit '225ad9cb184c94e29e4e0fb89d5e7d043e399ca4' into gingerbread-plus-aosp

* commit '225ad9cb184c94e29e4e0fb89d5e7d043e399ca4':
  DO NOT MERGE Text selection: tapping on selection opens context menu
2010-08-27 10:34:56 -07:00
Gilles Debunne
45b2d699e1 DO NOT MERGE Text selection: tapping on selection opens context menu
Back key exit selection mode. No more "Stop selecting text" in second context menu.

A tap on one of the handles also triggers the second context menu.

Paste is only available on long press in first menu for empty text fields.

Change-Id: Ic4fa00458d4f617a81885436b53d4fc923347609
2010-08-27 10:29:59 -07:00
Gilles Debunne
b318ef79d5 am 62dbd82a: Fix for IndexOutOfBounds in TextView getWordLimitsAt.
Merge commit '62dbd82aad0f84c88212566321e3fb370affaf7c' into gingerbread-plus-aosp

* commit '62dbd82aad0f84c88212566321e3fb370affaf7c':
  Fix for IndexOutOfBounds in TextView getWordLimitsAt.
2010-08-26 11:52:44 -07:00
Gilles Debunne
62dbd82aad Fix for IndexOutOfBounds in TextView getWordLimitsAt.
Bug http://b/issue?id=2948904

Change-Id: I10008374da92d5a98ec567cc76732383e66c4c5b
2010-08-26 11:12:16 -07:00
Gilles Debunne
f309c7a869 am 1b400c77: Merge "Fix for NPE in TextView." into gingerbread
Merge commit '1b400c7763e63505bafd496953764c3e97c2be5b' into gingerbread-plus-aosp

* commit '1b400c7763e63505bafd496953764c3e97c2be5b':
  Fix for NPE in TextView.
2010-08-26 11:01:34 -07:00
Gilles Debunne
df4ee43062 Fix for NPE in TextView.
Bug http://b/issue?id=2941549

Change-Id: Id5cbf0a3b2b68f450a9271333b96d41b01aa9f5c
2010-08-25 19:15:10 -07:00
Gilles Debunne
b32d0f23a8 am e2978c8d: Merge "Fix for an NPE in TextView." into gingerbread
Merge commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583' into gingerbread-plus-aosp

* commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583':
  Fix for an NPE in TextView.
2010-08-24 14:25:57 -07:00
Gilles Debunne
4e765e002f Fix for an NPE in TextView.
Change-Id: I0fca8f839cd444d9b70174078063efff5be499a3
2010-08-24 14:21:13 -07:00
Gilles Debunne
9765b2a01d am 2703a42d: When an EditText gains focus by tapping, move the insertion point where tapped.
Merge commit '2703a42d16af0e62da1bba02b6c935d98debf936' into gingerbread-plus-aosp

* commit '2703a42d16af0e62da1bba02b6c935d98debf936':
  When an EditText gains focus by tapping, move the insertion point where tapped.
2010-08-24 10:30:09 -07:00
Gilles Debunne
2703a42d16 When an EditText gains focus by tapping, move the insertion point where tapped.
The previous behavior was to move cursor at the end of the first line,
which feels weird.

Change-Id: I5a72f9871ed79ee2c521698ea642ba126537f4f9
2010-08-24 10:18:31 -07:00
Gilles Debunne
b037da401a am 3e05a0be: Hysteresis effect in Text selection.
Merge commit '3e05a0beb2fad0b21558019d2adf6805da70e10e' into gingerbread-plus-aosp

* commit '3e05a0beb2fad0b21558019d2adf6805da70e10e':
  Hysteresis effect in Text selection.
2010-08-23 15:26:51 -07:00
Gilles Debunne
3e05a0beb2 Hysteresis effect in Text selection.
Vertical movement requires going over a given threshold to change line.
Makes it easier to move down without changing line, so that one can see the
cursor better. Also simplifies long line selection.

Change-Id: I791da500232c6e510af64c637ed994c5da9a4fea
2010-08-23 15:20:53 -07:00
Steve Howard
6d895fdbc0 am d2e5f95e: Merge "Make ProgressBar.setVisibility() remotable." into gingerbread
Merge commit 'd2e5f95e0eeaff3422fde29cf6e0a91ceecfefaf' into gingerbread-plus-aosp

* commit 'd2e5f95e0eeaff3422fde29cf6e0a91ceecfefaf':
  Make ProgressBar.setVisibility() remotable.
2010-08-20 19:06:23 -07:00
Steve Howard
d2e5f95e0e Merge "Make ProgressBar.setVisibility() remotable." into gingerbread 2010-08-20 19:04:35 -07:00
Steve Howard
b25ffffc31 Make ProgressBar.setVisibility() remotable.
ProgressBar overrides setVisibilty(), causing it to lose the
RemotableViewMethod annotation and making it impossible to hide a
ProgressBar in a RemoteViews.  This change adds the annotation.

Change-Id: Ic1212b99fd52f8c36bef4805bfef5e170b28f0a6
2010-08-20 17:39:26 -07:00
Gilles Debunne
a842d143d2 am d018a0ce: Merge "Text selection without trackball." into gingerbread
Merge commit 'd018a0ce72124f668d859b19fe3e73f5637d3c7c' into gingerbread-plus-aosp

* commit 'd018a0ce72124f668d859b19fe3e73f5637d3c7c':
  Text selection without trackball.
2010-08-19 18:01:20 -07:00
Gilles Debunne
d018a0ce72 Merge "Text selection without trackball." into gingerbread 2010-08-19 17:59:08 -07:00
Scott Main
bb8d314b6c am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo
Merge commit '70c9ffbc838271f0ea27a4780eb146287de53ef6' into gingerbread-plus-aosp

* commit '70c9ffbc838271f0ea27a4780eb146287de53ef6':
  docs: add links from widget classes to tutorials
2010-08-19 17:40:10 -07:00
Scott Main
70c9ffbc83 am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo
Merge commit '11a72482a0cdc45ceaf4ca83957e682381455aee' into gingerbread

* commit '11a72482a0cdc45ceaf4ca83957e682381455aee':
  docs: add links from widget classes to tutorials
2010-08-19 17:37:31 -07:00
Scott Main
41ec65355b docs: add links from widget classes to tutorials
Change-Id: I817e885524951853182b0458df4a32dea1614243
2010-08-19 17:07:13 -07:00
Gilles Debunne
b0d6ba1ec4 Text selection without trackball.
Backported from HC.

Squashed commit of the following:

commit af214a595c7a9fdd11a2dc384f7d4665abf751c0
    Fixes in TextView's selection.

commit eb9fd59ebe6500a66c2003d46b5802299970ae8d
    TextView with Selection Contextual Mode

commit 4c4c338ef355b369ce4b57d6c6fba7ee8f9dddf4
    Cosmetic changes around TextView.

commit d4b4b054e87480d984ad18766f5e76553e3080d8
    Double and one and a half tap removed from TextView.

commit 897c2847ba1fca8ef01eadadd1bc3de007af3ee5
    Selection handlers in TextView

commit 832be74a5394649e28927484d9a86c6d53b430e7
    New cursor controller in TextViews.

Change-Id: I01cc64736e2abea605317ee53907a1713617fc17
2010-08-19 15:55:02 -07:00
Konstantin Lopyrev
f00ee0f762 am f39d5987: Merge "Categorizing exported view properties." into gingerbread
Merge commit 'f39d5987b977fdff8c34a2ddabaec31d1e909db3' into gingerbread-plus-aosp

* commit 'f39d5987b977fdff8c34a2ddabaec31d1e909db3':
  Categorizing exported view properties.
2010-08-10 17:52:32 -07:00
Konstantin Lopyrev
bea95162ca Categorizing exported view properties.
Change-Id: I79c42019836973d80662c21d195d088ae01537a0
2010-08-10 17:45:03 -07:00
Adam Powell
a55191fe8f DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller
Change-Id: Ia176cdb029201dbad193d2d213d3cf6e16fbee63
2010-08-05 15:50:31 -07:00
Gilles Debunne
56329b46ad am 628be513: am 83884db9: Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo
Merge commit '628be513e67ce6c61884b1baaf0379abfc56100b' into gingerbread-plus-aosp

* commit '628be513e67ce6c61884b1baaf0379abfc56100b':
  Fixed doc typos in HeterogeneousExpandableList.java.
2010-07-30 11:56:24 -07:00
Gilles Debunne
628be513e6 am 83884db9: Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo
Merge commit '83884db9dc0fbddb6ece566284259f6b941beb33' into gingerbread

* commit '83884db9dc0fbddb6ece566284259f6b941beb33':
  Fixed doc typos in HeterogeneousExpandableList.java.
2010-07-30 11:53:16 -07:00
Gilles Debunne
5d658d048e Fixed doc typos in HeterogeneousExpandableList.java.
Bad links.

Cherry-pick from master for a documentation update.
https://android-git.corp.google.com/g/#change,59176

Change-Id: Ib69b05c09fc80434cb9cd79d61fae4035adc1970
2010-07-29 16:56:25 -07:00
Adam Powell
c6d83cafed am a0ae8bc5: Merge "Fix a bug that could cause flings to last too long using a Scroller" into gingerbread
Merge commit 'a0ae8bc5c62b12269f20cbebdb0d8614e4e8eb1a' into gingerbread-plus-aosp

* commit 'a0ae8bc5c62b12269f20cbebdb0d8614e4e8eb1a':
  Fix a bug that could cause flings to last too long using a Scroller
2010-07-28 16:58:45 -07:00
Adam Powell
1b088be8bb Fix a bug that could cause flings to last too long using a Scroller
Bug 2866552

Change-Id: I6979b3da54ca2aeaf4583629e28ee81fa5bd70da
2010-07-28 16:43:45 -07:00
Jason Parks
49ff1e6c6c am b29e3b9c: Merge "Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument." into gingerbread
Merge commit 'b29e3b9cd00ced686a74121d3ca9c7380754793f' into gingerbread-plus-aosp

* commit 'b29e3b9cd00ced686a74121d3ca9c7380754793f':
  Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument.
2010-07-08 11:52:01 -07:00
Jason Parks
bca909c0a5 Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument.
Not closing the cursors was a bit of a bug since the documenation explicitly says that it would close the cursors. This will get rid of all the warnings that are printed out in the finalizer about the cursor not being closed.
2010-07-08 09:02:48 -05:00
Adam Powell
bc337d2f67 am 73ccafb5: Merge "Fix a bug where requestDisallowInterceptTouchEvent does not get called when scrolling is resumed after stopping a fling." into gingerbread
Merge commit '73ccafb5b843cdcf9c8f761fc72a69b4b7942aaf' into gingerbread-plus-aosp

* commit '73ccafb5b843cdcf9c8f761fc72a69b4b7942aaf':
  Fix a bug where requestDisallowInterceptTouchEvent does not get called
2010-06-23 10:28:00 -07:00
Adam Powell
110486f932 Fix a bug where requestDisallowInterceptTouchEvent does not get called
when scrolling is resumed after stopping a fling.

Change-Id: I6796c5082cb81b3116de5baf1f27fe3addb40d00
2010-06-22 17:14:44 -07:00
The Android Open Source Project
864c68ea45 merge from froyo-plus-aosp
Change-Id: I9cede57e10df9d6ba411b2960a77d7b9b60a1489
2010-06-14 11:35:51 -07:00