Commit Graph

15891 Commits

Author SHA1 Message Date
Dianne Hackborn
2a70a1e349 am bd77ed7f: Merge "Make image wallpaper use a big surface." into honeycomb
* commit 'bd77ed7fff87b79008e3b071115674dff2721994':
  Make image wallpaper use a big surface.
2011-02-01 16:26:12 -08:00
Dianne Hackborn
bd77ed7fff Merge "Make image wallpaper use a big surface." into honeycomb 2011-02-01 16:23:47 -08:00
Dianne Hackborn
f185552f63 Make image wallpaper use a big surface.
Change-Id: I119f2bfee5fde08040520bd0da8574194a893ab5
2011-02-01 16:20:20 -08:00
Jaikumar Ganesh
0cd527800e Merge "Remove discoverable timeout handler." 2011-02-01 15:39:40 -08:00
Jean-Baptiste Queru
72f43886fb Really get the new GB APIs.
Change-Id: Ib2bc4d964ad925977ed58e466cc50ed3e89f5924
2011-02-01 15:21:21 -08:00
Jean-Baptiste Queru
22d197eb31 am 068f3ef9: am 066e1e3c: am dbf09fee: am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"
* commit '068f3ef956ee3cadfe6089d9614ab093c03525c6':
  Don't crash zygote if webcore fails to load
2011-02-01 14:50:51 -08:00
Jean-Baptiste Queru
068f3ef956 am 066e1e3c: am dbf09fee: am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"
* commit '066e1e3cc6a0a3f2fbf672b82f8e3317574b86da':
  Don't crash zygote if webcore fails to load
2011-02-01 14:48:21 -08:00
Romain Guy
509e6cd895 am 1c531f4a: am f222956c: Merge "Correctly set the alpha of a hardware layer before drawing it. Bug #3410819" into honeycomb
* commit '1c531f4a44c9ea61e74dbe2ded1b8dca0f83f790':
  Correctly set the alpha of a hardware layer before drawing it. Bug #3410819
2011-02-01 14:37:07 -08:00
Romain Guy
1c531f4a44 am f222956c: Merge "Correctly set the alpha of a hardware layer before drawing it. Bug #3410819" into honeycomb
* commit 'f222956c955c97cf436c6f18b50bd0e57c89f381':
  Correctly set the alpha of a hardware layer before drawing it. Bug #3410819
2011-02-01 14:33:01 -08:00
Jaikumar Ganesh
fbb238db71 Remove discoverable timeout handler.
This is leftover code from bluez3 days. We get a property change
in Bluez4 and an intent is sent.

Change-Id: Iba8821ef73edf08add590ef9d11074b59fec2d50
2011-02-01 14:15:12 -08:00
Romain Guy
f222956c95 Merge "Correctly set the alpha of a hardware layer before drawing it. Bug #3410819" into honeycomb 2011-02-01 14:00:35 -08:00
Dave Burke
e54d2dadcd am 508556a8: am 84a34059: Smoother scrolling by preparing offscreen tiles (credit: Ben Murdoch)
* commit '508556a837287455e1a1181befe1ad8745613487':
  Smoother scrolling by preparing offscreen tiles (credit: Ben Murdoch)
2011-02-01 13:26:06 -08:00
Mike Cleron
fbcba51ab2 am b118bd1c: am ad97c1b1: Merge "Remove MeasuredText debug messages" into honeycomb
* commit 'b118bd1c2bb665eec1a78a6cf5c76a0aa6eba6af':
  Remove MeasuredText debug messages
2011-02-01 13:25:40 -08:00
Justin Ho
8904d5d905 am 238fb968: am 7bae4325: Merge "Enable subclass of SeekBarVolumizer to provide a custom file for sample playback." into honeycomb
* commit '238fb9686164e98d16ad30bb11a3032dc30ad83b':
  Enable subclass of SeekBarVolumizer to provide a custom file for sample playback.
2011-02-01 13:25:33 -08:00
Chet Haase
74c86d3e3a am 0a198c80: am 2cd52c80: Merge "Fix invalidation issue with actionbar items" into honeycomb
* commit '0a198c80765a0fbf52bdc84fddd11bc86c83ed51':
  Fix invalidation issue with actionbar items
2011-02-01 13:24:02 -08:00
Kristian Monsen
2d65a5fdac Proper fix for bug 3407633
Using WebAddress to parse the url, this way we will match the
java stack.

Change-Id: I30979df5ef347d9770985ebbb8139ec119764460
2011-02-01 21:15:52 +00:00
Jean-Baptiste Queru
066e1e3cc6 am dbf09fee: am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"
* commit 'dbf09feee0ba7210dadebbbb4cf7e7248f4ea634':
  Don't crash zygote if webcore fails to load
2011-02-01 13:12:04 -08:00
Romain Guy
54229ee5eb Correctly set the alpha of a hardware layer before drawing it.
Bug #3410819

Change-Id: I3ebaca2233f4edf5b59d84ec7706555056a1a4b1
2011-02-01 13:05:16 -08:00
Mike Lockwood
8b682ad08a UsbService: Blacklist HID boot subclass devices (keyboards and mice)
Change-Id: I80558c6205e041ad730c7815aba97cb80132e820
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-01 15:53:11 -05:00
Nick Pelly
1e19d87c78 am 17bf5e3c: DO NOT MERGE
* commit '17bf5e3ccfe961e6cc967327ab092cfbd6568ddd':
  DO NOT MERGE
2011-02-01 11:50:28 -08:00
Nick Pelly
17bf5e3ccf DO NOT MERGE
Cherry-pick from GB to HC, updating 11.xml.

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: Ifa8a17741fcc95776ffdba42f611eadb036aaf2d
2011-02-01 11:12:56 -08:00
Leon Scroggins
df1481cda6 Merge "Only scroll if the IME is open in certain cases." 2011-02-01 10:30:42 -08:00
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
Sang-Jun Park
c5996b9969 Fix delivery report error with PENDING status in SMS
1. According to TS 23.040, TP-Status values is changed properly.
2. When processing Status Report, it should be checked whether tpStatus is PENDING or FAILED.

Change-Id: I91c315cfb363f3e4b936c6b6b1a01083687a580f
2011-02-01 10:05:28 -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
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
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
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
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
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
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
Svetoslav Ganov
78ed7b801d Merge "Clean up of the DatePicker" 2011-01-31 17:53:00 -08:00
Ashish Sharma
e982f711a3 Merge "Fix a minor documentation bug in TrafficStats." 2011-01-31 17:32:40 -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
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