Commit Graph

911 Commits

Author SHA1 Message Date
Conley Owens
e178700929 Merge "Added null check on return value for getKeyDispatcherState()" 2011-04-28 15:07:00 -07:00
Per Andersson
4ae02b37bb Added null check on return value for getKeyDispatcherState()
The result from getKeyDispatcherState() was used without
checking if it returned null, which resulted in a NullPointerException.

Change-Id: I4b55ad44d5c08b7f729dbbdbcaed0e978a430258
2011-04-28 12:04:48 +02:00
Gilles Debunne
816dd3d443 resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp
Change-Id: I7f9c71eeb9fc5e01856f764930c6f168741cc9da
2011-03-14 12:57:01 -07:00
Gilles Debunne
9c06c0ffc9 Merge "Double tap on a word no longer opens context menu. DO NOT MERGE" into gingerbread 2011-03-14 11:30:17 -07:00
Xavier Ducrohet
ce57a7f353 am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit '6504490cde3ec5d48321d539e654d1f2072b33f9':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.
2011-02-28 09:51:38 -08:00
Xavier Ducrohet
6504490cde am dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit 'dff6b8e71dda9f5d841fa26408714aec2aef1505':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.
2011-02-28 09:16:38 -08:00
Svetoslav Ganov
66edf2bb3f am 9e5b1a49: Merge "Use different version of CLDR data in DatePicker" into gingerbread
* commit '9e5b1a49022d08aee8653fd34f3a8cd878618aa5':
  Use different version of CLDR data in DatePicker
2011-02-25 00:09:03 -08:00
Svetoslav Ganov
ef7ec7a029 Use different version of CLDR data in DatePicker
The ICU CLDR data doesn't use the month abbreviations that are
appropriate for the DatePicker, so use the framework copy of the CLDR
data.

Bug: 2641810
Note: cherry-picked from Honeycomb

Change-Id: I3c045dbfb751b8b7ce6361b5a67407206fc64db1
2011-02-24 15:45:04 -08:00
Daniel Mladenovic
0b1ab3a277 Fix for an infinite loop while scrolling lists.
When scrolling in a list it's possible to get stuck in a
loop where the screen is continuously redrawn. This happens
when you are at the end of a list and try to scroll further.
The problem is that you enter a switch statement with the
mState variable set to STATE_PULL_DECAY. This will trigger
code in the switch statement that does some adjustments and
calculations, but it does not change the value of mState to
STATE_IDLE or STATE_RECEDE after it's done. Hence it will
continue to return to the same place and not stop updating
since the update() method signals for completion only when
the mState variable is set to STATE_IDLE.

The fix is changing the value of mState after the
adjustments and calculations have been made.

Change-Id: I57bc84ec12d43ca87a1163d94cb5b206a376a24e
2011-02-21 09:17:40 +01:00
Romain Guy
a2090bea48 am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw."
* commit '7118bdec523568842e70555e353951df9f2596fd':
  Fix for #12945: ProgressBar.setMax() will always redraw.
2011-02-18 07:53:50 -08:00
Michael Krehan
58e3822b59 Fix for #12945: ProgressBar.setMax() will always redraw.
Fix for issue #12945: Changing the maximum of a progress bar does
not cause it to be redrawn, even though a new maximum changes the
position of the current progress in relation to its maximum. With this fix,
setMax() will always cause refreshProgress() to be called if the maximum is
different than it was before.

Change-Id: I971ec3302953bcadc0aac3dd8241481bab2b5a91
2011-02-17 20:56:29 -08:00
Gilles Debunne
9b90062b96 Double tap on a word no longer opens context menu. DO NOT MERGE
Bug 3451965

Change-Id: I2d693eda15da6562dd15eceb4109c0d588f224c9
2011-02-14 17:48:17 -08:00
Gilles Debunne
8e28ab22de am 2050de5b: Text selection is broken.
* commit '2050de5b9a5c097e30545ab822211d49031bd9dc':
  Text selection is broken.
2011-02-09 16:49:42 -08:00
Gilles Debunne
2050de5b9a Text selection is broken.
Bug 3439569

Lazy initialization code was not back-ported.

Change-Id: I9815f649891e2ddc602383488749144686ab1dd3
2011-02-09 14:17:22 -08:00
Gilles Debunne
63bd55c7bf am cdfe8999: Fix for multiple merge problem.
* commit 'cdfe899991c365d9e197d83f8859089cae082011':
  Fix for multiple merge problem.
2011-02-08 17:31:33 -08:00
Gilles Debunne
e04c14962f resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp
Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986
2011-02-08 16:33:58 -08:00
Gilles Debunne
cdfe899991 Fix for multiple merge problem.
Change-Id: I5d9c497f44aa9cdc34c195c41e02c3d7353c3fb4
2011-02-04 16:50:01 -08:00
Gilles Debunne
1ba2a47b82 am 893ac28f: Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread
* commit '893ac28f75561061a8f334cbd4e47833d7fd7843':
  Blinking runnable is created only if text is editable. DO NOT MERGE.
2011-02-04 15:50:15 -08:00
Gilles Debunne
826fbdf7b6 am 8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread
* commit '8a6ba494a28702e68b0a8fbd8bac34335536a8f8':
  All runnable are stopped on detach. DO NOT MERGE.
2011-02-04 15:50:12 -08:00
Gilles Debunne
c0728cc042 Double tap triggers text selection in a TextView. DO NOT MERGE
This is a convenient way to switch to selection mode without the
context menu. Context menu is still available and offerts Select Input method option.

Browser overloads touch events and this feature is not available in Browser which
limits the conflict with double tap zoom in browser.

Change-Id: I286504cf03733d5c2fb9bc01765f713d14bbd2f4
2011-02-04 15:50:10 -08:00
Gilles Debunne
2f7e9d403a am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
* commit '53841df2a49bffa53ba3d1e4b0580f4f23a64dc3':
  SelectAllOnFocus shows a higlighted text. DO NOT MERGE.
2011-02-04 15:49:56 -08:00
Gilles Debunne
893ac28f75 Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread 2011-02-04 15:46:15 -08:00
Gilles Debunne
8a6ba494a2 Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread 2011-02-04 15:46:11 -08:00
Gilles Debunne
53841df2a4 Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread 2011-02-04 15:46:06 -08:00
Jeff Brown
9cc55346ec am d0725eef: Merge "Never drag scroll views with no children. (DO NOT MERGE)" into gingerbread
* commit 'd0725eef671c059b8e26d900fee655747f506dbe':
  Never drag scroll views with no children. (DO NOT MERGE)
2011-01-20 17:41:08 -08:00
Jeff Brown
39bc6197ba Never drag scroll views with no children. (DO NOT MERGE)
Fixes a regression from Froyo.  Previously, when a scroll view
had no children, its onTouchEvent would return because the scroll
view would only start dragging if the user touched one of its children.
In Gingerbread, the user can drag from anywhere within the scroll
view, not just by touching a child.  However, it makes no sense
to drag a scroll view that has no children so an empty scroll view
should just ignore touches like any other empty view group would.

This change fixes applications that for some reason or other happen
to have empty scroll views in strange places.

Bug: 3246230
Change-Id: I76c6136d3cd74968983033014d60deec1718ce30
2011-01-19 11:20:46 -08:00
Gilles Debunne
16141478df SelectAllOnFocus shows a higlighted text. DO NOT MERGE.
Bug 3201383

Highlighted is different from selected, only the background is modified
and selection mode is not started.

Tapping inside a highlighted text places the cursor. This is especially
useful for WebView and search bar has been modified to select all on focus.

Selection handles time out is no longer needed.

This CL is pretty involved and especially messes up with the terrible
ExtractedTextView, which causes a lot of problem with text selection
across device rotations.

The current implementation works pretty well. It has one problem: the handles
are not displayed when switching to landscape mode with a selected text.

This is still an improvement over the current GB version, where the handles
are not preserved at all across device rotation and where I can find more bugs.

Handles are now hidden when a context menu is displayed.

I can polish this more if we decide to include this in the MR1.

Change-Id: Id10bf2808ff25752efd59a1987e91d609ba478cd
2011-01-12 09:46:53 -08:00
Gilles Debunne
dc32a99889 Blinking runnable is created only if text is editable. DO NOT MERGE.
Change-Id: If85acc73cfa12b6da23d60459a746e1aef51d3aa
2011-01-11 10:24:11 -08:00
Gilles Debunne
d5253fae69 All runnable are stopped on detach. DO NOT MERGE.
This prevents these runnable from holding a reference to the context
that will prevent it from being garbage collected.

The blinking cursor is especially bad and appears in memore traces.

Change-Id: I8acbfbbfc59975dfd7bcf06e941074ea7dc0b0bc
2011-01-11 10:21:41 -08:00
Dianne Hackborn
6023873463 am 2dda21b9: Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." into gingerbread
* commit '2dda21b93f8a8e0fb70de44eae826bc68349813c':
  Another stab at fixing issue #3149290 java.lang.RuntimeException:...
2010-12-22 18:37:08 -08:00
Dianne Hackborn
7becaeea7b Another stab at fixing issue #3149290 java.lang.RuntimeException:...
...Unable to pause activity
{com.android.settings/com.android.settings.applications.StorageUse}

Change-Id: Ibfa28a1c5af50dd150dfcafe71e905426d312643
2010-12-22 18:29:32 -08:00
Dianne Hackborn
b32ea25529 am 7daaa98c: Merge "Fix issue #3149290: java.lang.RuntimeException: Unable to pause activity" into gingerbread
* commit '7daaa98c6531373a2a742c1360f0a2795de0619f':
  Fix issue #3149290: java.lang.RuntimeException: Unable to pause activity
2010-12-15 12:58:54 -08:00
Dianne Hackborn
99441c45e4 Fix issue #3149290: java.lang.RuntimeException: Unable to pause activity
{com.android.settings/com.android.settings.applications.StorageUse}

AbsListView could call mAdapter.getItemId() if a save state happened
after the data changed but before a layout occurred.

Change-Id: Ica020971dc458dff79b56dd810733e217f4f7da6
2010-12-15 11:02:55 -08:00
Jean-Baptiste Queru
005dd44b75 am 864b1e00: Merge "NumberPicker: Set formatter local value to US."
* commit '864b1e007dc741ec10c23cabc0271f97a5b8c598':
  NumberPicker: Set formatter local value to US.
2010-12-06 11:03:11 -08:00
Chen Libao
f04f7ae73b NumberPicker: Set formatter local value to US.
As the Arabic language formatter would make number "1,2,3" to Arabic
language word means one,two,three, NumberPicker won't like to show
any thing other than numbers, add local settings to US, make the
number 1,2,3

Change-Id: If2d161ac4133f6c9c6e1ec284d6d2fbf01855fa0
2010-12-06 10:32:53 +01:00
Owen Lin
8ffb135dc8 am 45ca778d: Merge "Make sure the controller will get repositioned after size changing." into gingerbread
* commit '45ca778d8ed90aff3f72fc85f806cedbd4121cc1':
  Make sure the controller will get repositioned after size changing.
2010-11-10 08:25:02 -08:00
Owen Lin
45ca778d8e Merge "Make sure the controller will get repositioned after size changing." into gingerbread 2010-11-09 19:02:23 -08:00
Jesse Wilson
2d2f10fa34 am 28c74257: Add @Deprecated to match @deprecated where it\'s missing.
* commit '28c742573ccaeb55c16bc02fb25fdd86b8d1f76a':
  Add @Deprecated to match @deprecated where it's missing.
2010-11-09 10:17:33 -08:00
Jesse Wilson
28c742573c Add @Deprecated to match @deprecated where it's missing.
Change-Id: Ice95022671968386a601f32df7850f9baa1d2dd0
2010-11-09 10:10:11 -08:00
Owen Lin
a8381dfc5e Make sure the controller will get repositioned after size changing.
Bug: 3177061
Change-Id: I8f9606d4e05146ba568e8fe370cfe115dadedab9
2010-11-09 19:32:30 +08:00
Adam Powell
dd11387e58 Fix typo in manual merge
Change-Id: Idaf98e368e032cfbd7fbe3aa2d965b04eea3f43e
2010-11-08 19:56:44 -08:00
Adam Powell
3c09ba3f79 resolved conflicts for merge of 06fd1dc5 to gingerbread-plus-aosp
Change-Id: Iae11cabdc3c6b6b59dfdcc3b4944088dded91a52
2010-11-08 19:21:58 -08:00
Adam Powell
36ffc5c960 DO NOT MERGE Fix bug 3121030 - Text handles erroneously appear over
extract mode IME window

Make the SelectionModifierCursorController track its show/hide state
more accurately in the presence of an extract mode IME.

Lazily initialize CursorControllers so that we don't end up creating
them for various TextViews where they are not needed.

Change-Id: Ib76a95d9e7669016cf11b8b0add8843b438068ea
2010-11-08 15:00:49 -08:00
Leon Scroggins
553812178a am 3073646f: Merge "Update insertion handler for WebTextView." into gingerbread
* commit '3073646f61dcbbfe5c9e65b8e3a1d9266c3f7276':
  Update insertion handler for WebTextView.
2010-11-01 14:51:00 -07:00
Jean-Baptiste Queru
41c738849c am 5b4d0e84: Merge "TabWidget orientation"
* commit '5b4d0e84d314bd58efb9dcf4e7f23f0d0e3fc630':
  TabWidget orientation
2010-11-01 13:30:49 -07:00
Jean-Baptiste Queru
5b4d0e84d3 Merge "TabWidget orientation" 2010-11-01 13:19:02 -07:00
Leon Scroggins
5642625cfb Update insertion handler for WebTextView.
Bug:3152629
Change-Id: If2a33eb5456493fb9b3b2c54fcc4f5348fe129e1
2010-11-01 15:45:37 -04:00
Romain Guy
f101a85bc3 am cee8d1d3: Merge "fix typo"
* commit 'cee8d1d3450fb2b7490fbe41bf8b3f974c015f6f':
  fix typo
2010-10-31 11:21:24 -07:00
Uwe Voelker
fc8daba45e fix typo
Change-Id: Ib36aabc68128d1b2b8c41b965a10be2ab2f4cd93
2010-10-31 10:08:04 +01:00
Roger Olsson
a7e77546ca TabWidget orientation
TabWidget orientation specified in tab_content.xml instead of TabWidget.java.
Generally, the orientation of the TabWidget should be set in xml-files
and not in TabWidget.java. A sub class of TabActivity may call setContentView()
using a custom layout where the TabWidget orientation is vertical.
This is the case in the UI Enablers Bottom Tab feature, for landscape
display orientation.

Change-Id: Ia677441a0af96a8d2ab47ef3298eb440c34924f6
2010-10-26 14:41:01 +02:00