Commit Graph

468 Commits

Author SHA1 Message Date
The Android Open Source Project
176a88ff14 merge from open-source master 2010-01-21 11:21:25 -08:00
Amith Yamasani
658dc0d4b0 am b35b8c13: Merge "Security fix in accessibility - don\'t read out password. # 2371557" into eclair
Merge commit 'b35b8c1334b8bb8c4fb8b679fdb0b9bcbd5b41fe' into eclair-plus-aosp

* commit 'b35b8c1334b8bb8c4fb8b679fdb0b9bcbd5b41fe':
  Security fix in accessibility - don't read out password. # 2371557
2010-01-19 11:53:59 -08:00
Amith Yamasani
b35b8c1334 Merge "Security fix in accessibility - don't read out password. # 2371557" into eclair 2010-01-19 11:50:39 -08:00
Grace Kloba
8d4baa7893 am d79d1c72: Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair
Merge commit 'd79d1c72991e587294432e80d091e3ae26a0c103' into eclair-plus-aosp

* commit 'd79d1c72991e587294432e80d091e3ae26a0c103':
  If ZoomButttonsController detects more than one pointer,
2010-01-18 23:43:20 -08:00
Grace Kloba
d4d1d6eca0 If ZoomButttonsController detects more than one pointer,
give up the control. This should enable the View behind
it, like WebView, will always get the multi-pointer
events even when ZoomButtonsController is up.
2010-01-18 10:43:59 -08:00
NoraBora
8ca2f47e0d ViewAnimator.setAnimateFirstView() doesn't work for out-animation. 2010-01-18 23:54:06 +09:00
Amith Yamasani
91ccdb5f10 Security fix in accessibility - don't read out password. # 2371557
Check for password type before send accessibility event.
[Submitting for Svet]
2010-01-14 18:56:02 -08:00
Scott Main
c9a26f291b am aa3b5961: javadoc change: fix the selector sample XML in the class description (was broken due to improper ordering)
Merge commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea' into eclair-plus-aosp

* commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea':
  javadoc change: fix the selector sample XML in the class
2010-01-08 16:33:45 -08:00
Scott Main
aa3b5961c0 javadoc change: fix the selector sample XML in the class
description (was broken due to improper ordering)
2010-01-08 12:35:11 -08:00
Romain Guy
8d21bdb905 Fix the build. 2009-12-30 13:54:04 -08:00
NoraBora
a7f7e2ac92 guess default mMaxHeight but allow layout to override this.
without this code, progress bar height gets smaller when thumb gets bigger
in AbsSeekBar.java onSizeChanged().
2009-12-30 08:59:14 -05:00
NoraBora
51207b127b setThumbOffset was missing in the previous merge. 2009-12-22 10:46:14 -05:00
Jean-Baptiste Queru
c4978805dc merge from open-source master 2009-12-21 15:32:25 -08:00
NoraBora
41418ecfa7 ImageButton example doesn't work. Default state should be at the last.
see res/res/drawable/button_inset.xml
2009-12-17 11:38:15 -05:00
Eric Fischer
7bbb199912 am 72521860: Merge change I8f657a99 into eclair
Merge commit '725218602e8505cd6fe3075253fcb792727e2431' into eclair-plus-aosp

* commit '725218602e8505cd6fe3075253fcb792727e2431':
  Avoid a crash trying to get a substring whose start is after its end.
2009-12-15 07:42:03 -08:00
Eric Fischer
32929413ff Avoid a crash trying to get a substring whose start is after its end.
Constrain the start of the extracted text, not just the end, to the length
of the content.

Approver: ryanpc
Bug: 2323813
2009-12-14 17:35:36 -08:00
Joe Onorato
5ed608d305 am 7597065d: Make RemoteViews also set the sourceBounds in the PendingIntent.
Merge commit '7597065d6b0877ffc460b443fdb1595965ccd7b2' into eclair-plus-aosp

* commit '7597065d6b0877ffc460b443fdb1595965ccd7b2':
  Make RemoteViews also set the sourceBounds in the PendingIntent.
2009-12-02 23:16:33 -08:00
Joe Onorato
7597065d6b Make RemoteViews also set the sourceBounds in the PendingIntent. 2009-12-02 23:10:03 -08:00
Dianne Hackborn
190a80ceb5 am 8693f82d: Merge change If1f0bf33 into eclair
Merge commit '8693f82d02fd9b3a805e076fa1eafacd1737446d' into eclair-plus-aosp

* commit '8693f82d02fd9b3a805e076fa1eafacd1737446d':
  Some work on issue #2286804: sometimes text field doesn't accept input
2009-12-02 16:23:36 -08:00
Dianne Hackborn
27d377221c Some work on issue #2286804: sometimes text field doesn't accept input
This doesn't really fix the problem being brought up here, but fixes a
related issue I found while investigating it -- if you tap a text view
enough to cause it to try to scroll, this will cause the touch to become
a scroll instead of a click, even if there is nothing to scroll.  So
often quick taps to bring up the IME would be canceled because they
became a non-scroll.

Unfortuntately after syncing the latest build, I was having a lot of
trouble reproducing the original problem.  I think I need to punt it to
MR2 at this point.

Change-Id: If1f0bf33de1b4d71c9f677cdad07639b7a3fb772
2009-12-02 15:35:35 -08:00
Trevor Johns
efb48aa1c8 am 99f7b56f: Merge change Iefdb6f97 into eclair
Merge commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5' into eclair-plus-aosp

* commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5':
  Fixing minor doc typo in android.widget.SimpleCursorAdapter.
2009-11-24 09:40:35 -08:00
Android (Google) Code Review
99f7b56fbe Merge change Iefdb6f97 into eclair
* changes:
  Fixing minor doc typo in android.widget.SimpleCursorAdapter.
2009-11-24 09:35:35 -08:00
Jeff Sharkey
05e0ef9fa4 am 1162fd77: Let RemoteViews nest children, allow ViewFlipper.
Merge commit '1162fd77a8ff8467c96204c00bcaf941aef6aa85' into eclair-plus-aosp

* commit '1162fd77a8ff8467c96204c00bcaf941aef6aa85':
  Let RemoteViews nest children, allow ViewFlipper.
2009-11-16 14:38:29 -08:00
Jeff Sharkey
1162fd77a8 Let RemoteViews nest children, allow ViewFlipper.
This change allows applications to nest children RemoteViews
inside an existing set of RemoteViews.  These nested views
are inflated and treated as addView() calls.

This change also allows ViewFlipper through RemoteViews, and
adds logic surpress flipping when the parent window is
detached or behind the lockscreen.  Also fixes ViewAnimator
to observe the measureAllChildren flag when set.

Fixes http://b/2239905
2009-11-16 14:27:19 -08:00
Jean-Baptiste Queru
478de466ce merge from eclair 2009-11-15 12:06:23 -08:00
Trevor Johns
efdb6f978c Fixing minor doc typo in android.widget.SimpleCursorAdapter.
Changed "thelayout" to "the layout".
2009-11-13 16:10:44 -08:00
Jean-Baptiste Queru
9db3d07b96 eclair snapshot 2009-11-13 13:53:39 -08:00
Romain Guy
242cdcc6cc am 001e5242: Merge change Icccbd889 into eclair
Merge commit '001e5242c8a801664ea454a2ed6d4fddb600157a' into eclair-plus-aosp

* commit '001e5242c8a801664ea454a2ed6d4fddb600157a':
  Fix broken handling of the BACK key in PopupWindow. Needed by Launcher2.
2009-11-11 18:55:45 -08:00
Romain Guy
9a583c1bfb Fix broken handling of the BACK key in PopupWindow. Needed by Launcher2.
Change-Id: Icccbd8897186d0b9348a40b3dfc19ab7ac389efd
2009-11-11 18:51:18 -08:00
Romain Guy
ecdcd16b4b am 9d790678: Merge change I32ce8591 into eclair
Merge commit '9d790678bb83c829dddb9e4d0d6d6c4db7facc8b' into eclair-plus-aosp

* commit '9d790678bb83c829dddb9e4d0d6d6c4db7facc8b':
  Stop scrolling ListView when tapping a clickable item.
2009-11-06 18:36:25 -08:00
Romain Guy
4b4f40f84e Stop scrolling ListView when tapping a clickable item.
Bug #2210279.

Approved by mcleron.

Change-Id: I32ce8591b00fada95072513f5de69674b45e4cf3
2009-11-06 17:41:43 -08:00
Romain Guy
5613fcb674 am e1e0dc8e: Make sure we relayout the TextView when the text changes and marquee is enabled.
Merge commit 'e1e0dc8e6eaec052ebb6b88f5b1223075ce5a356' into eclair-plus-aosp

* commit 'e1e0dc8e6eaec052ebb6b88f5b1223075ce5a356':
  Make sure we relayout the TextView when the text changes and marquee is enabled.
2009-11-04 06:11:03 -08:00
Romain Guy
e1e0dc8e6e Make sure we relayout the TextView when the text changes and marquee is enabled.
Bug #2192881.

Change-Id: Iffc2d15947a11974d9dc175740e3a5489cd43d21
2009-11-03 17:24:55 -08:00
Jean-Baptiste Queru
b7463eb0c7 merge from open-source master 2009-10-14 12:26:31 -07:00
Christoffer Gurell
1d05c7cae5 Fixes scroll/measure bug in EditText
Bug and fix described in:
http://code.google.com/p/android/issues/detail?id=4184
2009-10-12 15:53:39 +02:00
Android (Google) Code Review
4625758d0b Merge change I2c5f1e76 into eclair
* changes:
  Fix back button handling in ACTV
2009-10-07 01:55:33 -04:00
Bjorn Bringert
4eb3efc8b2 Fix back button handling in ACTV
AutoCompleteTextView.onKeyPreIme() used
getKeyDispatcherState().startTracking(event, this) to start tracking
the back button, but didn't update the state of the event
before checking event.isTracking().

Fixes http://b/issue?id=2167168
"AutoCompleteTextView back button handling is broken"

Change-Id: I2c5f1e761872b9e02d85ff6f958fabd558d041a0
2009-10-06 20:29:08 +01:00
Suchi Amalapurapu
8d5ae98549 Make sdk version and code names static finals in PackageParser.
Remove api to set these values.
    Remove an unused method in AppSecurityPermissions
2009-10-06 10:29:06 -07:00
Evan Millar
e3ec9977bb FastTrack->QuickContact
Change-Id: I98f2db38e6402bdbe47b941d82c8f33863d1863e
2009-09-30 20:33:17 -07:00
Romain Guy
aa1c6311d6 Fix possible crash in AutoCompleteTextView.
This change makes sure that ACTV will not take action when an event is
received in a popup that just got dismissed.

This change also makes public two XML attributes of ACTV whose corresponding
Java APIs are public.

This change also fixes a couple of typos.

Change-Id: I78f113bc522d199ff3db44fc4cc3a1882afe822e
2009-09-30 11:55:58 -07:00
Android (Google) Code Review
1537a25520 Merge change I46a6d39c into eclair
* changes:
  Remove unused api in QuickContact.java and fix the build.
2009-09-30 14:45:17 -04:00
Evan Millar
f5ac46d302 Remove unused api in QuickContact.java and fix the build.
Change-Id: I46a6d39c8176806c2b5570c75b59ff9631ee53f1
2009-09-30 11:20:25 -07:00
Android (Google) Code Review
1935a3417e Merge change I9d12beeb into eclair
* changes:
  Change FasttrackBadgeWidget->QuickContactBadge and make public.
2009-09-30 13:00:46 -04:00
Evan Millar
c1a2a8296e Change FasttrackBadgeWidget->QuickContactBadge and make public.
Change-Id: I9d12beeba16c2f64742b4a99d0da4ceb73525b5b
2009-09-30 08:33:31 -07:00
Andrei Popescu
020d2e3453 Invoke the OnErrorListener callback when MediaPlayer.setDataSource() throws.
Fixes http://b/issue?id=2156505
2009-09-30 14:54:55 +01:00
Android (Google) Code Review
8eb0f34893 Merge change I67285c9a into eclair
* changes:
  Prevent NPE when doing a fillSpecific layout.
2009-09-29 18:19:05 -04:00
Romain Guy
8bcdc0764f Prevent NPE when doing a fillSpecific layout.
Change-Id: I67285c9a314400da11fdf158c413bf05fe6b982e
2009-09-29 15:17:47 -07:00
Android (Google) Code Review
d35afcda67 Merge change Ib2c6429d into eclair
* changes:
  border for the non-badge case
2009-09-29 17:06:23 -04:00
Android (Google) Code Review
490d5222ae Merge change I6cacaa0d into eclair
* changes:
  Hack to fix issue #2125365: Sports Trivia compatability with Eclair
2009-09-29 13:44:47 -04:00
Mark Wagner
b2c6429d4d border for the non-badge case
If we don't have a uri/email/phone then we do not display the normal
fast track badge.  But in that case we now have an alternate background/border
rather than no background/border.
2009-09-29 09:49:50 -07:00