Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,916 Commits 3 Branches 0 Tags
522ea25f2be384fd027ce2f644ee647fd8d80634
Commit Graph

874 Commits

Author SHA1 Message Date
Adam Powell
e30e1ff8bc am 7d04f2bc: am 4c72ad75: Merge "Fix bug 2918587 Infinite loop and memory leak in AdapterView" into gingerbread 
Merge commit '7d04f2bc4e38d5d7d2b37d6dec76fb3793311341'

* commit '7d04f2bc4e38d5d7d2b37d6dec76fb3793311341':
  Fix bug 2918587 Infinite loop and memory leak in AdapterView
 2010-08-30 18:38:14 -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
Daisuke Miyakawa
3f10b1c8f8 Fix NPE when Spinner is reused. 
Bug: 2958228
Change-Id: I2c5e322b92fd4896361d02a307d0ba0ef3d33029
 2010-08-30 11:52:35 -07:00
Daniel Lehmann
fff98cd16b Merge "Perform a float division for screenTravelCount" 2010-08-27 16:45:49 -07:00
Daniel Lehmann
4ef1da3c04 Perform a float division for screenTravelCount 
Change-Id: Ie0f23344a26c7ecf1a641e60d649ad0fc54fecbf
 2010-08-27 16:40:59 -07:00
Brad Fitzpatrick
a222510af8 am 2479097e: am b94493fe: Merge "Document blocking behavior of ImageView setImageURI and setImageResource" into gingerbread 
Merge commit '2479097ecb899f1e193063e3ce126c721e13c455'

* commit '2479097ecb899f1e193063e3ce126c721e13c455':
  Document blocking behavior of ImageView setImageURI and setImageResource
 2010-08-27 16:18:24 -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
Dianne Hackborn
1040dc465c Improve clipboard API. 
- Rename ClippedData to ClipData.
- Introudce ClipDescription subclass.
- Add convenience APIs for creating a ClipData.
- Add ClipboardManager API to get just the ClipDescription.
- Define MIME types associated with a clip.

Change-Id: If97ef91aa99a4dd0ec74ccaea504345c9ef12b5c
 2010-08-27 11:06:01 -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
511d444be0 am b318ef79: am 62dbd82a: Fix for IndexOutOfBounds in TextView getWordLimitsAt. 
Merge commit 'b318ef79d5018fdf492ba254438e2d9f1c0fff4c'

* commit 'b318ef79d5018fdf492ba254438e2d9f1c0fff4c':
  Fix for IndexOutOfBounds in TextView getWordLimitsAt.
 2010-08-26 15:51:56 -07:00
Adam Cohen
4252a5a4b4 Merge "-> Added the ability to specify an AdapterView's empty view through RemoteViews. An empty view is the view that appears in lieu of the collection when the collection is empty. -> Made StackViews start at their last item" 2010-08-26 15:41:59 -07:00
Adam Cohen
1480fddea8 -> Added the ability to specify an AdapterView's empty view 
through RemoteViews. An empty view is the view that appears
in lieu of the collection when the collection is empty.
-> Made StackViews start at their last item

Change-Id: Ica44e5e8f8f2a2e5589a6c74414ec4d08303887f
 2010-08-26 15:28:05 -07:00
Ben Dodson
e3f55d45cf Merge "Updated documentation for upcoming fix for @code tags" 2010-08-26 15:27:15 -07:00
Gilles Debunne
fc2563ba4e resolved conflicts for merge of f309c7a8 to master 
Change-Id: I80dfe8a0b142fa95fa83d46f3b60223c2991fce3
 2010-08-26 14:48:48 -07:00
Ben Dodson
4e8620f868 Updated documentation for upcoming fix for @code tags 
Change-Id: Id7b163179132b9cf180afecb4e9e10ee39bcd415
 2010-08-26 14:02:20 -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
Adam Cohen
9b073948cf Cleanup and bug fixes in StackView 
-> pushed functionality from AdapterViewAnimator to StackView
-> only modifying clipping flags as far up the view
   hierarchy as needed
-> still need framework level solution for drawing outside bounds

ViewGroup touch dispatch temp fix
-> Touch event was being modified and not reset in some
   code paths.

Change-Id: I8135b62e2d73f239b9df407b0fa93bc434796989
 2010-08-25 13:16:14 -07:00
Gilles Debunne
925f2f9096 resolved conflicts for merge of 9765b2a0 to master 
Change-Id: Ic37a443fff0425e9d7c8395f71665d56c38d7e53
 2010-08-24 15:14:12 -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
Kenny Root
8db59adccf resolved conflicts for merge of b037da40 to master 
Change-Id: I591f80f613870a4b1557f17d1c8574f661ed8121
 2010-08-24 11:48:37 -07:00
Steve Howard
15a4a2cb8e am 6d895fdb: am d2e5f95e: Merge "Make ProgressBar.setVisibility() remotable." into gingerbread 
Merge commit '6d895fdbc023743f3870042e73a5614764e4165b'

* commit '6d895fdbc023743f3870042e73a5614764e4165b':
  Make ProgressBar.setVisibility() remotable.
 2010-08-24 11:01:14 -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
Gilles Debunne
27113f8646 Merge conflict due to wrong import paths. 
Change-Id: I3bba20b26036de53b29bb0b30885fe33832ba3e3
 2010-08-23 12:09:14 -07:00
Gilles Debunne
5989f4edc5 Merge "resolved conflicts for merge of a842d143 to master" 2010-08-23 11:42:24 -07:00
Adam Powell
6c6f575423 More ActionBar/config change tweaks. Preserve open overflow menus 
Change-Id: Ic8ad2b1e3909fbf84ff4d852ae046a9f9508477c
 2010-08-23 10:24:49 -07:00
Gilles Debunne
252b36379f resolved conflicts for merge of a842d143 to master 
Change-Id: I60bba17630d4a4aff5cb8ac9c8b81a2a1fddcd3b
 2010-08-22 11:57:58 -07:00
Scott Main
385a655b8e am bb8d314b: am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo 
Merge commit 'bb8d314b6c5ff9b51af29daa687d66dfd996914f'

* commit 'bb8d314b6c5ff9b51af29daa687d66dfd996914f':
  docs: add links from widget classes to tutorials
 2010-08-21 09:44: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
Romain Guy
64d50a67f4 GridView's pageScroll() would be offset by one item. 
External issue #10580

Change-Id: Ie1b3ea8e1f7890b480d6ba8ff423024a5c4cd047
 2010-08-20 10:50:49 -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