drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,193 Commits 1 Branch 0 Tags
Commit Graph

44193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Westbrook
7759e9217f am 59927ce5: am 8b805ddc: Merge "Enable retrieving default download manager settings" into honeycomb 
* commit '59927ce5ce34b6b26e6410102b3580cc6b4e1335':
  Enable retrieving default download manager settings
 2011-02-01 15:12:46 -08:00
Paul Westbrook
59927ce5ce am 8b805ddc: Merge "Enable retrieving default download manager settings" into honeycomb 
* commit '8b805ddc2eacaf7c5618619feee2154c4b18e9bf':
  Enable retrieving default download manager settings
 2011-02-01 15:09:53 -08:00
Paul Westbrook
8b805ddc2e Merge "Enable retrieving default download manager settings" into honeycomb 2011-02-01 15:07:40 -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
Mike Cleron
1aa03cf72a am 00ab863a: am fb3221bf: Merge "Assume ARGB_8888 for unknown configs. Bug #3327175" into honeycomb 
* commit '00ab863a19610725469a27aaab0779de8d62c2e1':
  Assume ARGB_8888 for unknown configs. Bug #3327175
 2011-02-01 14:37:01 -08:00
Paul Westbrook
d99d0dc43a Enable retrieving default download manager settings 
Enable retrieving the default download manager settings from
a resource, when the SettingsProvider database is created

The default setting for these values is -1, which will cause
DownloadManger to not enforce a limit.

Bug: 3341145
Change-Id: I25294d0f75fb0bdf20d4bef54457056c25c31add
 2011-02-01 14:36:24 -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
Mike Cleron
00ab863a19 am fb3221bf: Merge "Assume ARGB_8888 for unknown configs. Bug #3327175" into honeycomb 
* commit 'fb3221bf6d9d59b792dfe4b0aa6a6567a5a92ba7':
  Assume ARGB_8888 for unknown configs. Bug #3327175
 2011-02-01 14:32:19 -08:00
Jean-Baptiste Queru
e9a1afcbda am bf3e43eb: Merge da20efd9 
* commit 'bf3e43eb00b72e350a1e6a96233f745ae2ee8ba8':
  Final final final Gingerbread MR API changes.
 2011-02-01 14:16:42 -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
Jean-Baptiste Queru
bf3e43eb00 Merge da20efd9 
Change-Id: I2357c8f8cf001de08a28e9c48c2ca5722a92d75e
 2011-02-01 14:12:29 -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
Mike Cleron
fb3221bf6d Merge "Assume ARGB_8888 for unknown configs. Bug #3327175" into honeycomb 2011-02-01 14:00:09 -08:00
Nick Pelly
1a40bb0ef8 am 1e19d87c: (-s ours) am 17bf5e3c: DO NOT MERGE 
* commit '1e19d87c78b183da7d9ef692ddc1f3664b4279a9':
  DO NOT MERGE
 2011-02-01 13:27:13 -08:00
Dheeraj Sharma
9cd6a8e2cf am dacacb50: am 22ad6243: Merge "Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project" into honeycomb 
* commit 'dacacb50ed616bc52c092d9716252ec49a94457d':
  Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project
 2011-02-01 13:26:51 -08:00
Justin Ho
6a0417d048 am 53e56c36: am 6d134754: Making default upload and download arrows more visible Bug: 3399982 
* commit '53e56c362a7c4f1bd1255bb2a27091fa6a429774':
  Making default upload and download arrows more visible Bug: 3399982
 2011-02-01 13:26:47 -08:00
Justin Ho
5d1c293350 am daa95d67: am 50bd7362: Merge "Updating Froyo framework assets to Holo style Bug: 3362749" into honeycomb 
* commit 'daa95d679c063dca451e9207e61bb35496a9c1b2':
  Updating Froyo framework assets to Holo style Bug: 3362749
 2011-02-01 13:26:37 -08:00
Kristian Monsen
2866538974 am ff65c9d7: (-s ours) am 8b8f7989: Fix for bug 3407633 Cookie not set in CookieManager - DO NOT MERGE 
* commit 'ff65c9d75ca1ccaa1e44d95e8ea33144022163cf':
  Fix for bug 3407633 Cookie not set in CookieManager - DO NOT MERGE
 2011-02-01 13:26:31 -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
Justin Ho
1cf210e919 am 57aa5cbd: am 0a909a12: Merge "Updated notification and effects for Honeycomb Bug: 3389139" into honeycomb 
* commit '57aa5cbda2028073eb38cab5a35caf358d2b4fb4':
  Updated notification and effects for Honeycomb Bug: 3389139
 2011-02-01 13:25:26 -08:00
Joe Onorato
bf86edaad9 am ba426a7e: am 8f4fe8fe: Merge "When the data flows, the icon glows." into honeycomb 
* commit 'ba426a7e86fa958c1536c58a71ca9bb2c6e79479':
  When the data flows, the icon glows.
 2011-02-01 13:25:12 -08:00
Dheeraj Sharma
b5f497b404 am 537cc3b1: am ba2ee617: Merge "Fix for issue 3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged" into honeycomb 
* commit '537cc3b19d84e5b0c8d3631c051bb36a4c8cf784':
  Fix for issue 3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged
 2011-02-01 13:25:05 -08:00
Romain Guy
8e3a02f2e1 am 65710b4e: am bc71d625: Merge "Don\'t convert 4444 images to 565. Bug #3327175" into honeycomb 
* commit '65710b4eac717a32853d7b49da848f27b4b301e9':
  Don't convert 4444 images to 565. Bug #3327175
 2011-02-01 13:24:58 -08:00
Justin Ho
9b000ad577 am c0957f3c: am 186d8d36: Merge "Fix bug 3410400 - Holo rating bar assets" into honeycomb 
* commit 'c0957f3ce18b2ea4f4d95dbd8a0fa113a1695ee9':
  Fix bug 3410400 - Holo rating bar assets
 2011-02-01 13:24:47 -08:00
Jason parks
4dc5c4a19a am 31d3963b: am f370391f: Merge "Show the encryption boot animation." into honeycomb 
* commit '31d3963bd6f8f14268adf26b2b7b6cac9cd949f0':
  Show the encryption boot animation.
 2011-02-01 13:24:35 -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
Dharmaray Kundargi
4fd9eaf5a9 am 8ceccbed: am 327549f9: Merge "Fix issue 3408285. Fix issue in Thread safe in Java." into honeycomb 
* commit '8ceccbed7177234f219f2aa39f71554f9141d084':
  Fix issue 3408285. Fix issue in Thread safe in Java.
 2011-02-01 13:23:43 -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
Jean-Baptiste Queru
dbf09feee0 am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load" 
* commit 'eb17d6f51a9776f02be84859b8980a6317abd27c':
  Don't crash zygote if webcore fails to load
 2011-02-01 13:02:19 -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
Jean-Baptiste Queru
eb17d6f51a Merge "Don't crash zygote if webcore fails to load" 2011-02-01 12:41:55 -08:00
Nick Pelly
1e19d87c78 am 17bf5e3c: DO NOT MERGE 
* commit '17bf5e3ccfe961e6cc967327ab092cfbd6568ddd':
  DO NOT MERGE
 2011-02-01 11:50:28 -08:00
Romain Guy
feeea8f07c Assume ARGB_8888 for unknown configs. 
Bug #3327175

Change-Id: If712a255ec65014cd2e007de1e4c6a1d67c19250
 2011-02-01 11:22:46 -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
Mike Lockwood
a8e3a898a2 UsbService: Add support for blacklisting certain USB busses 
This can be used to prevent applications from connecting to
sensitive internal USB devices (like the modem)

Change-Id: I6587f58018e3f8d8f78405d4004cce64db23b628
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-02-01 13:46:50 -05:00
Gloria Wang
944170f2cf Merge "- Support comfort noise in AMRExtractor - Support duration and seeking in AMRExtractor for different bit rates" 2011-02-01 10:35:10 -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
Justin Ho
65a6c48235 am fdfde68f: am aece15a8: Merge "Updated notification panel alpha" into honeycomb 
* commit 'fdfde68fc22d40711f6e99883e64253e1a305372':
  Updated notification panel alpha
 2011-02-01 10:09:38 -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
Tadashi G. Takaoka
87793907c4 am aa9082bc: am 2a7ade6d: Merge "Update hard keyboard status on closing input methods panel" into honeycomb 
* commit 'aa9082bc799fd3d61a80d0bc95b0452100a3dca4':
  Update hard keyboard status on closing input methods panel
 2011-02-01 10:09:21 -08:00
Jeff Brown
406e26d174 am a70154b0: am c623fff0: Merge "Fix keyboard hidden flag." into honeycomb 
* commit 'a70154b0187603af3487bbe01b607818b12cc268':
  Fix keyboard hidden flag.
 2011-02-01 10:09:11 -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
Gloria Wang
069715b6f8 - Support comfort noise in AMRExtractor 
- Support duration and seeking in AMRExtractor for different bit rates

Bug 2530101

Change-Id: I12beffea73cea0ec056f0e0cf51a4a8d46d897b8
 2011-02-01 10:05:59 -08:00