14708 Commits

Author SHA1 Message Date
Gilles Debunne
672a2531ae am 4fa7f4f4: am 53ea7f58: Merge "Really leave text selection mode when using the trackball." into gingerbread
Merge commit '4fa7f4f4963568258a6b4179176de8386cb5d3db'

* commit '4fa7f4f4963568258a6b4179176de8386cb5d3db':
  Really leave text selection mode when using the trackball.
2010-10-15 14:25:48 -07:00
Ben Komalo
c1d71003fc Merge "Fix Spinners that don't have a hard pixel width set. getDimensionPixelSize -> getLayoutDimension" 2010-10-15 14:10:57 -07:00
Kenny Root
fcab0f5502 am 8fda1636: am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread
Merge commit '8fda1636e3e35f060b9046294efd3c062a1fdb84'

* commit '8fda1636e3e35f060b9046294efd3c062a1fdb84':
  OBB: use PBKDF2 for key generation.
2010-10-15 14:00:58 -07:00
Romain Guy
10aca41e51 Merge "Fix clipping issue in StackView." 2010-10-15 14:00:17 -07:00
Romain Guy
e5ebcb0107 Fix clipping issue in StackView.
Change-Id: I7ec28f25c3993a2bd7ef6399ba1923839d239905
2010-10-15 13:57:28 -07:00
Ben Komalo
bdaa34c670 Fix Spinners that don't have a hard pixel width set.
getDimensionPixelSize -> getLayoutDimension

Change-Id: Ic126955ad7c7cee3aea423c43fc16da02ec9664e
2010-10-15 13:27:11 -07:00
Jaikumar Ganesh
db3694d030 am a905d955: am a31cbd61: Merge "Remove STOPSHIP and reduce log spam." into gingerbread
Merge commit 'a905d9551103c5be465429ffeb0352b78058457e'

* commit 'a905d9551103c5be465429ffeb0352b78058457e':
  Remove STOPSHIP and reduce log spam.
2010-10-15 12:44:39 -07:00
Ben Komalo
4138b33826 Merge "Apply values set in "dropDownWidth" attribute of Spinner styles." 2010-10-15 11:55:52 -07:00
Ben Komalo
72536f7240 Apply values set in "dropDownWidth" attribute of Spinner styles.
Bug: 3099224
Change-Id: I904f2ef39a65a62076ff82319128a31767a2394b
2010-10-15 11:42:07 -07:00
Kenny Root
9ca6d71c52 resolved conflicts for merge of c6bf3eaa to master
Change-Id: I6421faf52c160a81b03c63b91f1aedfe0f151cac
2010-10-15 11:20:42 -07:00
Jaikumar Ganesh
72cd64b20e resolved conflicts for merge of bbb90d13 to master
Change-Id: I85de73f6e11e7547a006d41ca49021bca19af14b
2010-10-15 10:02:57 -07:00
Kenny Root
733e79c240 am 2f98a585: am 49ec3dff: Merge "OBB: Change documentation to reflect reality" into gingerbread
Merge commit '2f98a585cda066689b1b525322c51fcacbc3770b'

* commit '2f98a585cda066689b1b525322c51fcacbc3770b':
  OBB: Change documentation to reflect reality
2010-10-15 08:32:30 -07:00
Ben Murdoch
d609279c33 Set the correct style for TextAppearance.Holo.SearchResult
Values have been taken from the current TextAppearance.SearchResult
style. This was making WebTextView in the Browser show unreadable
autocomplete suggestions (pale grey text on a white background).

Change-Id: I35961e12ab96d29791c495723709b2eff5714471
2010-10-15 10:39:11 +01:00
Kenny Root
9456714cfb am b4f26a9d: am e6ae5c39: Merge "Add shutdown assurance" into gingerbread
Merge commit 'b4f26a9d37caf7762b66b68d50825c5b075b42bd'

* commit 'b4f26a9d37caf7762b66b68d50825c5b075b42bd':
  Add shutdown assurance
2010-10-15 00:08:22 -07:00
Wink Saville
b079a10652 am 94980e0f: am 07e1be62: Merge "Fix NPE caused by Change I4df27119." into gingerbread
Merge commit '94980e0f76295de53bd168608d11dba3c39cca9d'

* commit '94980e0f76295de53bd168608d11dba3c39cca9d':
  Fix NPE caused by Change I4df27119.
2010-10-15 00:07:40 -07:00
Leon Scroggins
af95d12b12 am c7ee44cb: am dfc07279: Line up WebTextView text with the page.
Merge commit 'c7ee44cbe155c2272687a0e82133f3e729eac137'

* commit 'c7ee44cbe155c2272687a0e82133f3e729eac137':
  Line up WebTextView text with the page.
2010-10-14 23:03:23 -07:00
Jaikumar Ganesh
c8e87e3ce6 am 373a6961: am 64f42803: Merge "Bluez doesn\'t handle disconnect while connecting well. Defer the message." into gingerbread
Merge commit '373a69614e534ae04dddd79c92933b6d8969fad7'

* commit '373a69614e534ae04dddd79c92933b6d8969fad7':
  Bluez doesn't handle disconnect while connecting well.
2010-10-14 21:19:04 -07:00
Nick Pelly
f36c6db108 NFC API revision round 2.
- Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag,
  RawTagConnection, NdefTagConnection.
- Add implementations for all of the new NFC API.

Change-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6
Signed-off-by: Nick Pelly <npelly@google.com>

Conflicts:

	Android.mk
	CleanSpec.mk
	core/java/android/app/ContextImpl.java
2010-10-14 19:16:35 -07:00
Chris Tate
6b3912865c Drag thumbnail fixes / improvements
* Properly wipe the thumbnail canvas before handing it to the app for
  its contents to be drawn

* Provide a getView() method in DragThumbnailBuilder that allows
  clients or subclasses to get at the associated view.  This is
  especially for clients that want to draw entire (sub)layouts as
  the drag thumbnail, by overriding onDrawThumbnail(Canvas c)
  like this:

  // Override specifically for drawing a whole ViewGroup into
  // the drag thumbnail canvas
  @Override
  public void onDrawThumbnail(Canvas c) {
      getView().dispatchDraw(c);
  }

Change-Id: Ib43ddd7cf1d44faf2d7f6ba79f102bc3c7f14596
2010-10-14 16:43:39 -07:00
Adam Cohen
6eb4122c2d Merge "Fixing null pointer exception" 2010-10-14 16:29:29 -07:00
Adam Cohen
6f279627cf Fixing null pointer exception
Change-Id: I902dfc9baa1be7fb07110ccde7a3c0e0049e4417
2010-10-14 16:25:23 -07:00
Adam Powell
302166c0fc Merge "Holo styling and metrics; holo spinners" 2010-10-14 16:24:59 -07:00
Adam Powell
89edde3efa Holo styling and metrics; holo spinners
Change-Id: Ib6d80e5e1a79b7a4ff208df8dbc097e7b9228d13
2010-10-14 16:20:47 -07:00
Jaikumar Ganesh
5b9895c016 Merge "Disconnect PBAP while disconnecting HFP profile." 2010-10-14 16:18:22 -07:00
Jaikumar Ganesh
2beaf7316f Disconnect PBAP while disconnecting HFP profile.
PBAP profile is associated with HFP profile. Disconnect PBAP
profile while disconnecting HFP profile. We ever never doing this
and were expecting the remote end to do it. So when the user
disconnects a headset, we will end up with the ACL link still up
because PBAP has not been disconnected.

This is little bit of a hack till PBAP profile is converted to
use the new profile APIs.

Change-Id: I04821daae6588955fbfea01472e6a1b6f9212608
2010-10-14 16:14:38 -07:00
Jim Miller
66ad9e7207 Merge "Fix 3024528: Add owner info to SecureSettings." 2010-10-14 15:54:21 -07:00
Jim Miller
253a5ef886 Fix 3024528: Add owner info to SecureSettings.
Change-Id: Ibed62aa8881c795f0d48007fc04beac0e9c1d4a0
2010-10-14 15:51:55 -07:00
Chet Haase
3a64f241fe Merge "Remove errant minus sign" 2010-10-14 15:07:30 -07:00
Chet Haase
51b3227c2e Remove errant minus sign
Change-Id: I39a76484884615aa86f4a845eb4637467ec5abc7
2010-10-14 14:59:39 -07:00
Shimeng (Simon) Wang
51969178b2 Merge "Remove not-used code." 2010-10-14 14:53:52 -07:00
Shimeng (Simon) Wang
c42f8b8332 Remove not-used code.
issue: 3003933
Change-Id: I3221fb253fe6fbfe9e24368426d7e4a2c1e3502b
2010-10-14 14:52:28 -07:00
Chris Tate
ba7aad209f Merge "Actually draw the drag thumbnail" 2010-10-14 14:44:06 -07:00
Chris Tate
a32dcf7f72 Actually draw the drag thumbnail
Now sets the layer and thumbnail dimensions correctly.  Also removed the
leftover bits of the now-replaced thumbnail measurement/drawing mechanism.

Fixes bug 3077339

Change-Id: I02983648e0a7ce2ce5fee10825f744e20a3a5b8d
2010-10-14 14:41:07 -07:00
Shimeng (Simon) Wang
7ffe05227e Merge "Fixed viewport enhancement for site with viewport tag." 2010-10-14 14:30:17 -07:00
Chet Haase
fec30790e8 Removed obsolete trace statements
Change-Id: I98041460da3109201b13b00ff553eb3e7290debb
2010-10-14 14:23:30 -07:00
Nicolas Roard
2f55ac0498 Merge "Fix embed webview" 2010-10-14 14:12:40 -07:00
Shimeng (Simon) Wang
afc1c25177 Fixed viewport enhancement for site with viewport tag.
1. Use web content width to calculate overview scale in firstLayout time.
2. Skip pre-calculated viewScale in non-mobile fixed viewport case.

issue: 3003933
Change-Id: Ifdc475d96f5df824912197bf5818f5e649658edf
2010-10-14 14:07:32 -07:00
Nicolas Roard
12c18e691c Fix embed webview
Change-Id: Iac8b3aeb7e5370ce06a3437684e21e8a7fcf7c73
2010-10-14 14:05:17 -07:00
Chet Haase
2794eb3b02 Remove generics from Animator APIs
Change the manner of constructing Animator-related objects from constructors
via generics to factory methods with type-specific method names. Should
improve the proliferation of warnings due to generics issues and make the
code more readable (less irrelevant angle brackets Floating around).

Change-Id: Ib59a7dd72a95d438022e409ddeac48853082b943
2010-10-14 13:13:34 -07:00
Gilles Debunne
4fa7f4f496 am 53ea7f58: Merge "Really leave text selection mode when using the trackball." into gingerbread
Merge commit '53ea7f58c071563b7c5dd0061df39d3b4bf38a63' into gingerbread-plus-aosp

* commit '53ea7f58c071563b7c5dd0061df39d3b4bf38a63':
  Really leave text selection mode when using the trackball.
2010-10-14 12:02:44 -07:00
Shimeng (Simon) Wang
bf5b247fa1 Merge "Use real fixed viewport, and let the content width be the overview width." 2010-10-14 11:45:52 -07:00
Shimeng (Simon) Wang
6d383aadce Use real fixed viewport, and let the content width be the overview width.
issue: 3003933
Change-Id: I679fe1d5736daf0e8cee746dee53558943796833
2010-10-14 11:16:03 -07:00
Jaikumar Ganesh
0b9ba91fa5 Merge "Add function to check for AVRCP target to send volume keys." 2010-10-14 11:03:42 -07:00
Gilles Debunne
53ea7f58c0 Merge "Really leave text selection mode when using the trackball." into gingerbread 2010-10-14 10:58:59 -07:00
Romain Guy
83d6e82132 Revert "Remove generics from Animator APIs"
This reverts commit 41f041d9986f8a5d45b6cb0b86e881c81a412168.
2010-10-14 10:13:53 -07:00
Romain Guy
70ea25fa8a Merge "Remove generics from Animator APIs" 2010-10-14 10:08:12 -07:00
Jaikumar Ganesh
aa4b235dd7 resolved conflicts for merge of 79a5307a to master
Change-Id: I5a524fe53e74df722db003cec6ab62451fe0f899
2010-10-14 09:39:41 -07:00
Chet Haase
41f041d998 Remove generics from Animator APIs
Change the manner of constructing Animator-related objects from constructors
via generics to factory methods with type-specific method names. Should
improve the proliferation of warnings due to generics issues and make the
code more readable (less irrelevant angle brackets Floating around).

Change-Id: I7c1776b15f3c9f245c09fb7de6dc005fdba58fe2
2010-10-14 08:39:00 -07:00
Ben Murdoch
cf30872b01 Add support for the complete set of AutoFill profile data.
Change-Id: Iff5b48e732acb16281b9795f1f08b08d24b16cbe
2010-10-14 12:21:43 +01:00
Bjorn Bringert
c9332fa3e9 Delete unused WebView drag tracking code
This also removes android.graphics.utils.BoundaryPatch
which was only used by the Browser for the unused drag
tracking (and by a demo app that I'm also removing).

Change-Id: I48253ae005ab11cb4c70d132bc1ea4f2692e2bd2
2010-10-14 09:39:25 +01:00