ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
22,316 Commits 2 Branches 0 Tags 54 MiB
25d89261d3
Commit Graph

22316 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
aec6b516c5 am 368733b2: Remove overscroll_edge.png from drawable/ 
Merge commit '368733b204805cfa716897b09153350a70dca3f3' into gingerbread-plus-aosp

* commit '368733b204805cfa716897b09153350a70dca3f3':
  Remove overscroll_edge.png from drawable/
 2010-10-04 15:48:50 -07:00
Adam Powell
e5ada36d2b am 103f59ba: Merge "Fix bug 3052686 - ScrollView padding treated incorrectly" into gingerbread 
Merge commit '103f59baa7f7d03cfe22a4b07690cc809185dfe9' into gingerbread-plus-aosp

* commit '103f59baa7f7d03cfe22a4b07690cc809185dfe9':
  Fix bug 3052686 - ScrollView padding treated incorrectly
 2010-10-04 15:48:37 -07:00
Scott Main
72f5d5b949 am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38 
Merge commit '6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d' into gingerbread

* commit '6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d':
  docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
 2010-10-04 15:39:24 -07:00
James Dong
4576b09a11 Merge "Resilent media time stamp adjustment" into gingerbread 2010-10-04 15:35:40 -07:00
Gilles Debunne
721a4020a7 Merge "Removed icon in Alert dialog header." into gingerbread 2010-10-04 15:34:43 -07:00
Adam Powell
27a0b636ac Merge "Fix bug 3052686 - ScrollView padding treated incorrectly" into gingerbread 2010-10-04 15:24:29 -07:00
Kenny Root
61ef747e0e Use pread() in ZipFileRO for Linux 
AssetManager instances are created by zygote and passed to all its
children so that they don't have to individually open
frameworks-res.apk. This creates a problem for determining the current
file offset when using lseek() on those files, because you can't
guarantee the cross-process locking of a mutex. Luckily, Linux
implements pread() to get around this suckiness.

The problem is that only Linux implements this, so we have to keep the
old locking for use on host builds with aapt and friends. aapt doesn't
have this same problem of sharing file descriptors across forked
processes, so we can keep the local AutoMutex to protect accesses of
those files.

Change-Id: Ibe9f11499a53fe345f50fbaea438815ec0fd363e
 2010-10-04 15:17:19 -07:00
Gilles Debunne
ad54820fff am 9339fa7f: am be86b8a4: Updated quick contact assets. 
Merge commit '9339fa7fa13b8c8847dac4624598112d03555330'

* commit '9339fa7fa13b8c8847dac4624598112d03555330':
  Updated quick contact assets.
 2010-10-04 15:00:58 -07:00
Dianne Hackborn
b628861f8a am 458fc5f5: Merge "Fix issue #3041660: Camera image flips upside down when rotating device" into gingerbread 
Merge commit '458fc5f52e25d7a8b4e482010711aed66f0b4999' into gingerbread-plus-aosp

* commit '458fc5f52e25d7a8b4e482010711aed66f0b4999':
  Fix issue #3041660: Camera image flips upside down when rotating device
 2010-10-04 14:55:09 -07:00
Dianne Hackborn
58df7a6415 resolved conflicts for merge of 10d5b096 to master 
Change-Id: Id5c6ba651f72b48f0d70ee2ca64a6c9adf5e74f7
 2010-10-04 14:54:59 -07:00
Dianne Hackborn
859d08676e Merge "Fix issue #3041660: Camera image flips upside down when rotating device" into gingerbread 2010-10-04 14:52:12 -07:00
Gilles Debunne
b9a9ee37f3 am 33a4c772: Merge "New green in assets for battery, download, upload" into gingerbread 
Merge commit '33a4c77218e4513268be8d5ce2af6f746976706b' into gingerbread-plus-aosp

* commit '33a4c77218e4513268be8d5ce2af6f746976706b':
  New green in assets for battery, download, upload
 2010-10-04 14:47:12 -07:00
Joe Onorato
f776da9ac4 am 87efbbb5: Merge "implement the number bubbles on the status bar" into gingerbread 
Merge commit '87efbbb563ef96a74ffd2fbbe5c0865a450254df' into gingerbread-plus-aosp

* commit '87efbbb563ef96a74ffd2fbbe5c0865a450254df':
  implement the number bubbles on the status bar
 2010-10-04 14:44:40 -07:00
Gilles Debunne
68a6951696 Merge "New green in assets for battery, download, upload" into gingerbread 2010-10-04 14:43:16 -07:00
Joe Onorato
87304310b0 Merge "implement the number bubbles on the status bar" into gingerbread 2010-10-04 14:41:38 -07:00
Scott Main
91884dd7c5 am ae1864c0: am ec80d7f3: docs: consistency fixit for the quickview boxes in the dev guide 
Merge commit 'ae1864c0e79baae75ad25f20828349be8635d471' into gingerbread-plus-aosp

* commit 'ae1864c0e79baae75ad25f20828349be8635d471':
  docs: consistency fixit for the quickview boxes in the dev guide
 2010-10-04 14:37:11 -07:00
Scott Main
200c4ffccf am ec80d7f3: docs: consistency fixit for the quickview boxes in the dev guide 
Merge commit 'ec80d7f311b1a0899bb4caf5b380b07027e902d1' into gingerbread

* commit 'ec80d7f311b1a0899bb4caf5b380b07027e902d1':
  docs: consistency fixit for the quickview boxes in the dev guide
 2010-10-04 14:32:26 -07:00
Brad Fitzpatrick
ef13ad2312 am b12bfbd4: am eb6e22f2: Merge "Document Bitmap.createScaledBitmap" into gingerbread 
Merge commit 'b12bfbd4df985041ab0e584ef5a746328baac038'

* commit 'b12bfbd4df985041ab0e584ef5a746328baac038':
  Document Bitmap.createScaledBitmap
 2010-10-04 14:28:35 -07:00
Adam Powell
06606dc513 am 7de900f3: am d29e6861: Merge "Fix bug 3058324" into gingerbread 
Merge commit '7de900f3629e53e1a05b8d5854cf0164446346ae'

* commit '7de900f3629e53e1a05b8d5854cf0164446346ae':
  Fix bug 3058324
 2010-10-04 14:28:08 -07:00
Patrick Dubroy
8d5fccec29 am eb15ac40: Merge "Fix 2-pixel offset unlock jog tab" into gingerbread 
Merge commit 'eb15ac40ab2da2f599f2380bc7a8b00e7132a64c' into gingerbread-plus-aosp

* commit 'eb15ac40ab2da2f599f2380bc7a8b00e7132a64c':
  Fix 2-pixel offset unlock jog tab
 2010-10-04 14:25:42 -07:00
Romain Guy
d70f4e70c4 Merge "Snap the clip rectangle to pixel boundaries." 2010-10-04 14:21:10 -07:00
Patrick Dubroy
68ef68f874 Merge "Fix 2-pixel offset unlock jog tab" into gingerbread 2010-10-04 14:20:39 -07:00
Gilles Debunne
0f97561712 Merge "resolved conflicts for merge of 115b9dc3 to master" 2010-10-04 14:17:51 -07:00
Romain Guy
041976e9b9 Merge "Apply bilinear filtering on text only when necessary." 2010-10-04 14:16:24 -07:00
Gilles Debunne
6cea08c619 am be86b8a4: Updated quick contact assets. 
Merge commit 'be86b8a4c94905e547f8ecdcd220bbe7bb249d2b' into gingerbread-plus-aosp

* commit 'be86b8a4c94905e547f8ecdcd220bbe7bb249d2b':
  Updated quick contact assets.
 2010-10-04 14:15:15 -07:00
Dianne Hackborn
bd00691535 am 407f625a: Add new API to find out whether external storage is removable. 
Merge commit '407f625a9b8e356e765a5ec587c443af1f3aadb5' into gingerbread-plus-aosp

* commit '407f625a9b8e356e765a5ec587c443af1f3aadb5':
  Add new API to find out whether external storage is removable.
 2010-10-04 14:03:06 -07:00
Gilles Debunne
4251f75f07 resolved conflicts for merge of 115b9dc3 to master 
Change-Id: I37ee3a50fcafbaa7de510b3af8e133a89bd9e339
 2010-10-04 14:02:50 -07:00
Romain Guy
86707b9a5f Merge "Apply all Canvas transformations to ColorDrawable." 2010-10-04 13:48:12 -07:00
Raphael
2cbb59e22c Merge "layoutlib_create: Generate delegate to implement native methods." 2010-10-04 12:46:37 -07:00
Joe Onorato
51cfe21e8f Merge "work around race condition which causes us to try to load the phone status bar on the tablet." 2010-10-04 12:28:45 -07:00
Brad Fitzpatrick
96a3d2e643 am eb6e22f2: Merge "Document Bitmap.createScaledBitmap" into gingerbread 
Merge commit 'eb6e22f29ded58e7e51702c34878fd01e20ff802' into gingerbread-plus-aosp

* commit 'eb6e22f29ded58e7e51702c34878fd01e20ff802':
  Document Bitmap.createScaledBitmap
 2010-10-04 12:23:58 -07:00
Brad Fitzpatrick
f67f0acc67 Merge "Document Bitmap.createScaledBitmap" into gingerbread 2010-10-04 12:21:14 -07:00
Adam Powell
23c08a158c am d29e6861: Merge "Fix bug 3058324" into gingerbread 
Merge commit 'd29e6861717a4e762050eb5a30169729e205d651' into gingerbread-plus-aosp

* commit 'd29e6861717a4e762050eb5a30169729e205d651':
  Fix bug 3058324
 2010-10-04 12:18:44 -07:00
Adam Powell
550801abe4 Merge "Fix bug 3058324" into gingerbread 2010-10-04 12:15:34 -07:00
Gilles Debunne
3b5a615147 am 4d3baaf5: Merge "Bug fixes in Text selection." into gingerbread 
Merge commit '4d3baaf5308ddee43c1cd742497a38806cec6320' into gingerbread-plus-aosp

* commit '4d3baaf5308ddee43c1cd742497a38806cec6320':
  Bug fixes in Text selection.
 2010-10-04 12:10:21 -07:00
Gilles Debunne
a2540a0edd Merge "Bug fixes in Text selection." into gingerbread 2010-10-04 12:06:10 -07:00
Dianne Hackborn
23250ebdaf am 4e183215: am 1073e3fa: Merge "Don\'t write settings multiple times when unmounting." into gingerbread 
Merge commit '4e183215bac239bbc039df361fed034a965030ec'

* commit '4e183215bac239bbc039df361fed034a965030ec':
  Don't write settings multiple times when unmounting.
 2010-10-04 12:05:00 -07:00
Dianne Hackborn
272e89b2ac am 1073e3fa: Merge "Don\'t write settings multiple times when unmounting." into gingerbread 
Merge commit '1073e3fa72a59af15ff4243b65a789ddb61bcded' into gingerbread-plus-aosp

* commit '1073e3fa72a59af15ff4243b65a789ddb61bcded':
  Don't write settings multiple times when unmounting.
 2010-10-04 12:01:08 -07:00
Dianne Hackborn
9b631857a8 Merge "Don't write settings multiple times when unmounting." into gingerbread 2010-10-04 11:58:09 -07:00
Chia-chi Yeh
1b12e0ed12 am fbd5a59d: am 4fc04f16: Merge "RTP: Add a baseline echo suppressor." into gingerbread 
Merge commit 'fbd5a59da9a455bc1c54a80bd5b3afeb426a8e3d'

* commit 'fbd5a59da9a455bc1c54a80bd5b3afeb426a8e3d':
  RTP: Add a baseline echo suppressor.
 2010-10-04 11:57:33 -07:00
Chia-chi Yeh
6f6d1a3989 am 4fc04f16: Merge "RTP: Add a baseline echo suppressor." into gingerbread 
Merge commit '4fc04f160f5ad99ce618084c689b239a2644deca' into gingerbread-plus-aosp

* commit '4fc04f160f5ad99ce618084c689b239a2644deca':
  RTP: Add a baseline echo suppressor.
 2010-10-04 11:53:56 -07:00
Andreas Huber
aefad3079e am dfd03fe9: am aa1a694d: Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread 
Merge commit 'dfd03fe99336792b6dae6c4c9fd5f5ba157e054c'

* commit 'dfd03fe99336792b6dae6c4c9fd5f5ba157e054c':
  Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.
 2010-10-04 11:51:55 -07:00
Chia-chi Yeh
fc4a64540c Merge "RTP: Add a baseline echo suppressor." into gingerbread 2010-10-04 11:51:45 -07:00
Andreas Huber
2f110ae1ae am aa1a694d: Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread 
Merge commit 'aa1a694dc78e5201fc83fe3d710a6e43eb62831a' into gingerbread-plus-aosp

* commit 'aa1a694dc78e5201fc83fe3d710a6e43eb62831a':
  Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.
 2010-10-04 11:47:52 -07:00
Andreas Huber
4ffa384fbe Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread 2010-10-04 11:45:56 -07:00
Andreas Huber
8ee567423c am bb506dab: am 7fa69374: Merge "Don\'t retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping." into gingerbread 
Merge commit 'bb506dab1ff10e6939fcd0457571e0b46793dd80'

* commit 'bb506dab1ff10e6939fcd0457571e0b46793dd80':
  Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.
 2010-10-04 11:26:16 -07:00
Andreas Huber
76b106b10a am 7fa69374: Merge "Don\'t retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping." into gingerbread 
Merge commit '7fa693740756123fa9d05e62fb47aae5d703c71d' into gingerbread-plus-aosp

* commit '7fa693740756123fa9d05e62fb47aae5d703c71d':
  Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.
 2010-10-04 11:22:22 -07:00
Dirk Dougherty
39c1f0e510 am 44fad94a: am 30f57295: am ba944ccd: Doc change: update screens support table and remove outdated density/size metrics. 
Merge commit '44fad94aff4165334584cdf8cafcd0885616a44f'

* commit '44fad94aff4165334584cdf8cafcd0885616a44f':
  Doc change: update screens support table and remove outdated density/size metrics.
 2010-10-04 11:20:36 -07:00
Andreas Huber
a4953b9f5d Merge "Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping." into gingerbread 2010-10-04 11:20:21 -07:00
Dirk Dougherty
3a55bf56a6 am 30f57295: am ba944ccd: Doc change: update screens support table and remove outdated density/size metrics. 
Merge commit '30f572956ef92e8636772be7bd5d0150cf7fd1fc' into gingerbread-plus-aosp

* commit '30f572956ef92e8636772be7bd5d0150cf7fd1fc':
  Doc change: update screens support table and remove outdated density/size metrics.
 2010-10-04 11:16:12 -07:00