19421 Commits

Author SHA1 Message Date
Nick Pelly
da20efd99c am cbf0983e: Merge "Final final final Gingerbread MR API changes." into gingerbread
* commit 'cbf0983ec97879026e87fa97ff0b5c8786bfc8f8':
  Final final final Gingerbread MR API changes.
2011-02-01 10:10:42 -08:00
Gilles Debunne
15f16e3f86 am 65383292: am 8f8aac5e: Merge "Pixel were missing on the last line of text when using MaxLines." into honeycomb
* commit '6538329258ee01b27586d8b0e46e96160d719a68':
  Pixel were missing on the last line of text when using MaxLines.
2011-02-01 10:09:29 -08:00
Dianne Hackborn
5c4e4f9066 am db569b49: am 6cf32312: Merge "Do not check features in PackageManagerService" into honeycomb
* commit 'db569b49180621c01fa55db88ed92071aae9b3bb':
  Do not check features in PackageManagerService
2011-02-01 10:08:21 -08:00
Nick Pelly
cbf0983ec9 Merge "Final final final Gingerbread MR API changes." into gingerbread 2011-02-01 09:39:31 -08:00
Nick Pelly
f003e26df9 Final final final Gingerbread MR API changes.
This is it. I promise.

ACTION_TECHNOLOGY_DISCOVERED -> ACTION_TECH_DISCOVERED
    This was missed in our technology->tech rename.

Hide TagTechnology.reconnect()
    This is used to reset any per-connection state in a tag, by reconnecting
    to it. The first problem is that it belongs on Tag, not TagTechnology. The
    second problem is that it may become redundant once we add Tag.rediscover()
    which will also reconnect to the tag, and will also return a new Tag with
    newly created technologies enumerated. And the third and most significant
    problem is that you can already achieve the same result by just calling
    close() followed by connect().

Hide Tag.createMockTag()
    This API cannot be used reliably. First it requires using int[] for the
    technology list, but those int constants are now hidden. Second it requires
    knowledge of the extras parcel used to fill technology specific data - also
    not public.

Introduce TagTechnology.isConnected()
    Every child class already impelmented this, and given that connect() and
    close() are defined on the interface, then isConnected() should be there
    too.

Modify Ndef.getType to return a string (not int)
    Allows more flexibility in adding new NDEF types. Current public strings are
    org.nfcforum.ndef.type1
    org.nfcforum.ndef.type2
    org.nfcforum.ndef.type3
    org.nfcforum.ndef.type4
    com.nxp.ndef.mifareclassic

Add NdefFormatable.formatReadOnly()
    This allows you to make the tag read-only at the same time as performing
    format and write. It is important because we currently don't have any
    public API to re-enumerate a tag technology list after making a tag
    NDEF compatible, so you can't perform the format as a seperate step
    without physically removing the tag from field and returning it.

Modify Readonly -> ReadOnly

Make Tag class final

Change-Id: Icf306aeb37b936ca3007e4868e99b6baceac4aff
2011-02-01 09:20:45 -08:00
Justin Ho
53e56c362a am 6d134754: Making default upload and download arrows more visible Bug: 3399982
* commit '6d134754ef2839da43e177b555522a5fdcb3aa9c':
  Making default upload and download arrows more visible Bug: 3399982
2011-02-01 08:46:15 -08:00
Justin Ho
6d134754ef Making default upload and download arrows more visible
Bug: 3399982

Change-Id: I0d614c590deb2b30147ae1e64edf2ef551cc1d40
2011-02-01 08:41:01 -08:00
Leon Scroggins
fe77eb6140 Only scroll if the IME is open in certain cases.
Bug:3411564

Requires a change in external/webkit.

Change-Id: I0a9a1d4ff99646e006716271f2cb1cdf0ad9b778
2011-02-01 11:10:51 -05:00
Justin Ho
daa95d679c am 50bd7362: Merge "Updating Froyo framework assets to Holo style Bug: 3362749" into honeycomb
* commit '50bd7362a184a11b9c220c01662e813672d4d48e':
  Updating Froyo framework assets to Holo style Bug: 3362749
2011-02-01 07:30:11 -08:00
Justin Ho
50bd7362a1 Merge "Updating Froyo framework assets to Holo style Bug: 3362749" into honeycomb 2011-02-01 07:28:04 -08:00
Justin Ho
b83f6987df Updating Froyo framework assets to Holo style
Bug: 3362749

Change-Id: Ibd2042f1dad4ba3fdc96944a2af93b44df1bc839
2011-02-01 07:27:36 -08:00
Kristian Monsen
ff65c9d75c am 8b8f7989: Fix for bug 3407633 Cookie not set in CookieManager - DO NOT MERGE
* commit '8b8f79898d5d0a283c481dedda2cc161a5a673b3':
  Fix for bug 3407633 Cookie not set in CookieManager - DO NOT MERGE
2011-02-01 07:19:51 -08:00
Kristian Monsen
8b8f79898d Fix for bug 3407633 Cookie not set in CookieManager - DO NOT MERGE
Setting http:// at the start if there is no :// in the url

Change-Id: Idfae4f724808267fe9c8ab3864cfc4305ddac0e7
2011-02-01 15:14:11 +00:00
Dave Burke
508556a837 am 84a34059: Smoother scrolling by preparing offscreen tiles (credit: Ben Murdoch)
* commit '84a34059ebee2258c77a393bba423837155aad2b':
  Smoother scrolling by preparing offscreen tiles (credit: Ben Murdoch)
2011-02-01 05:15:17 -08:00
Dave Burke
84a34059eb Smoother scrolling by preparing offscreen tiles (credit: Ben Murdoch)
Change-Id: If8f6aa38174e742e869bce7144de8db84b2f7150
2011-02-01 13:09:11 +00:00
Kristian Monsen
5762a23fb0 Fix for bug 3407633 Cookie not set in CookieManager
Adding http:// at the start of the url if there is no :// already

Change-Id: If292f60af3289a9849ff060ffacc0d97e3120132
2011-02-01 11:50:55 +00:00
Mike Cleron
b118bd1c2b am ad97c1b1: Merge "Remove MeasuredText debug messages" into honeycomb
* commit 'ad97c1b12872042f97414b51cb58484f9a5fd9fd':
  Remove MeasuredText debug messages
2011-01-31 23:25:02 -08:00
Justin Ho
238fb96861 am 7bae4325: Merge "Enable subclass of SeekBarVolumizer to provide a custom file for sample playback." into honeycomb
* commit '7bae4325877cfaf19b316157488450eefed6c381':
  Enable subclass of SeekBarVolumizer to provide a custom file for sample playback.
2011-01-31 23:22:53 -08:00
Mike Cleron
ad97c1b128 Merge "Remove MeasuredText debug messages" into honeycomb 2011-01-31 23:22:36 -08:00
Justin Ho
7bae432587 Merge "Enable subclass of SeekBarVolumizer to provide a custom file for sample playback." into honeycomb 2011-01-31 23:20:24 -08:00
Justin Ho
c0957f3ce1 am 186d8d36: Merge "Fix bug 3410400 - Holo rating bar assets" into honeycomb
* commit '186d8d36d326756ab4f25eaa8a8ed409ed2cce9b':
  Fix bug 3410400 - Holo rating bar assets
2011-01-31 21:02:14 -08:00
Justin Ho
186d8d36d3 Merge "Fix bug 3410400 - Holo rating bar assets" into honeycomb 2011-01-31 20:59:46 -08:00
Amith Yamasani
998127c804 Enable subclass of SeekBarVolumizer to provide a custom file for sample playback.
Bug: 3409194
Change-Id: I8a408a69fd14cf9058afe01ac5c46d0f5afc1503
2011-01-31 20:28:03 -08:00
Adam Powell
02a30a8ceb Fix bug 3410400 - Holo rating bar assets
Change-Id: I107f7d3eea2f82ee49a906b0409f01afe78e69b9
2011-01-31 19:35:20 -08:00
Chet Haase
0a198c8076 am 2cd52c80: Merge "Fix invalidation issue with actionbar items" into honeycomb
* commit '2cd52c809e52c042ad61067c93a4b5521eadd503':
  Fix invalidation issue with actionbar items
2011-01-31 19:10:06 -08:00
Chet Haase
2cd52c809e Merge "Fix invalidation issue with actionbar items" into honeycomb 2011-01-31 19:08:28 -08:00
Gilles Debunne
6538329258 am 8f8aac5e: Merge "Pixel were missing on the last line of text when using MaxLines." into honeycomb
* commit '8f8aac5e8adfe14b8a01d90424b1815e0a0ebe28':
  Pixel were missing on the last line of text when using MaxLines.
2011-01-31 18:52:38 -08:00
Chet Haase
f28595e47d Fix invalidation issue with actionbar items
When a view hierarchy becomes VISIBLE, it is possible that the display
list of some of the subtrees needs to be recreated. In particular, if
the subtree was measured while it was GONE, then the children probably
didn't have a valid size. If a display list is created for any of the
subnodes in the tree during this time, then they may have clipped the
children out.

The fix is to force the parent to become INVALIDATED whenever a child
view's bounds change (and it is VISIBLE).

Change-Id: I3624253e65354289f4fb94c9ba76a7e6fb82af9a
2011-01-31 18:52:12 -08:00
Dianne Hackborn
db569b4918 am 6cf32312: Merge "Do not check features in PackageManagerService" into honeycomb
* commit '6cf32312aaee6716ffd1df7098838b08d80054e4':
  Do not check features in PackageManagerService
2011-01-31 18:51:56 -08:00
Gilles Debunne
a90154fbe3 am d4155ae6: am 0ad4f096: Merge "Patches for the Paste window behavior." into honeycomb
* commit 'd4155ae607648942afbb5b5a20c93d82a839e0d2':
  Patches for the Paste window behavior.
2011-01-31 18:38:03 -08:00
Eric Fischer
05437aad8e am 122106cb: Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb
* commit '122106cb9be37fb97c0315b927771ec6fcb94aa4':
  Import revised translations.  DO NOT MERGE.  Bug 3394542
2011-01-31 18:32:11 -08:00
Gilles Debunne
d4155ae607 am 0ad4f096: Merge "Patches for the Paste window behavior." into honeycomb
* commit '0ad4f0963a47feafaaa92a756fb84caab5b6bddb':
  Patches for the Paste window behavior.
2011-01-31 18:30:42 -08:00
Gilles Debunne
8f8aac5e8a Merge "Pixel were missing on the last line of text when using MaxLines." into honeycomb 2011-01-31 18:14:05 -08:00
Dianne Hackborn
b04ec6a8a7 am 7a7ed2b2: Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread
* commit '7a7ed2b21233480d63a1f6b3830e3b0c1c6a3298':
  Do not check features in PackageManagerService DO NOT MERGE
2011-01-31 17:55:11 -08:00
Svetoslav Ganov
78ed7b801d Merge "Clean up of the DatePicker" 2011-01-31 17:53:00 -08:00
Dianne Hackborn
7a7ed2b212 Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread 2011-01-31 17:41:54 -08:00
Dianne Hackborn
6cf32312aa Merge "Do not check features in PackageManagerService" into honeycomb 2011-01-31 17:41:09 -08:00
Ashish Sharma
e982f711a3 Merge "Fix a minor documentation bug in TrafficStats." 2011-01-31 17:32:40 -08:00
Eric Fischer
122106cb9b Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb 2011-01-31 17:27:30 -08:00
Kenny Root
4c3915a0f7 Do not check features in PackageManagerService
PackageManagerService shouldn't check features that a package declares
that it uses because this will cause problems in the future when we add
more features that older phones didn't explicitly declare. We must rely
on markets to know about phones and filter them for us to avoid this
situation.

Bug: 3409434
Change-Id: I419a5b936be3572b83a485081a6c81b2f1c8741c
2011-01-31 16:59:12 -08:00
Svetoslav Ganov
13427a04de Clean up of the DatePicker
1. Removed a duplicate DatePicker stylable.

2. Fixed a bug that if the user wrongly desires to have the
   calendar view and spinners hidden despite that DataPicker
   ovrrides such incorrect choice to show at least the spinners
   the min adn max date attributes are igonored.

Change-Id: I6307db71aca837ad790aea59fa70ead393feb066
2011-01-31 16:37:33 -08:00
Kenny Root
fa2ae1ad1a Do not check features in PackageManagerService DO NOT MERGE
PackageManagerService shouldn't check features that a package declares
that it uses because this will cause problems in the future when we add
more features that older phones didn't explicitly declare. We must rely
on markets to know about phones and filter them for us to avoid this
situation.

Bug: 3409434
Change-Id: I0d51b2de33d8110edc6824af4b5b8c901f96077f
2011-01-31 16:27:38 -08:00
Gilles Debunne
0ad4f0963a Merge "Patches for the Paste window behavior." into honeycomb 2011-01-31 16:22:25 -08:00
Svetoslav Ganov
c4df1f6a48 am b5d9b6ae: am 1c91433f: Merge "Set time dialog display changes AM/PM at 1 instead of 12" into honeycomb
* commit 'b5d9b6aec8565b13c45ce875d7e7b8e3ea3648f9':
  Set time dialog display changes AM/PM at 1 instead of 12
2011-01-31 16:19:07 -08:00
Adam Powell
06a7d2e66e am 3c7a6174: am 5f639d5a: Merge "Fix bug 3408834 - actionbar stays gone when leaving reader in lightsout mode" into honeycomb
* commit '3c7a617455410c3c164f9aeac522baa94e056651':
  Fix bug 3408834 - actionbar stays gone when leaving reader in lightsout mode
2011-01-31 16:19:04 -08:00
Eric Fischer
3efb315313 am a019d15b: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit 'a019d15b667a72d7cb29afc7f153d5c517abcb76':
  Import revised translations. DO NOT MERGE
2011-01-31 16:18:27 -08:00
Svetoslav Ganov
b5d9b6aec8 am 1c91433f: Merge "Set time dialog display changes AM/PM at 1 instead of 12" into honeycomb
* commit '1c91433f7c61860319fa5d524b503c2631a7f2d3':
  Set time dialog display changes AM/PM at 1 instead of 12
2011-01-31 16:15:26 -08:00
Adam Powell
3c7a617455 am 5f639d5a: Merge "Fix bug 3408834 - actionbar stays gone when leaving reader in lightsout mode" into honeycomb
* commit '5f639d5a5134b994ee77207ac931bdafe95c6d66':
  Fix bug 3408834 - actionbar stays gone when leaving reader in lightsout mode
2011-01-31 16:15:20 -08:00
Svetoslav Ganov
1c91433f7c Merge "Set time dialog display changes AM/PM at 1 instead of 12" into honeycomb 2011-01-31 16:11:59 -08:00
Adam Powell
5f639d5a51 Merge "Fix bug 3408834 - actionbar stays gone when leaving reader in lightsout mode" into honeycomb 2011-01-31 16:11:51 -08:00