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

22213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
6997079565 Merge "Refinements to drag/drop" 2010-10-04 19:40:28 -07:00
Gil Dobjanschi
c9c5e224bc Merge "Added mute APIs for MediaVideoItem and AudioTrack" 2010-10-04 19:04:36 -07:00
Scott Main
cfb1390dcb resolved conflicts for merge of 7008b7c1 to master 
Change-Id: I360136e54229cae1fc0fa15eab8f1490b8a0fb5e
 2010-10-04 18:42:49 -07:00
Patrick Dubroy
43f32e7583 am 242fa52b: am eb15ac40: Merge "Fix 2-pixel offset unlock jog tab" into gingerbread 
Merge commit '242fa52bb6d4556c7cb4bcb1880210f076ea7270'

* commit '242fa52bb6d4556c7cb4bcb1880210f076ea7270':
  Fix 2-pixel offset unlock jog tab
 2010-10-04 18:23:44 -07:00
Gil Dobjanschi
03ce5e9a82 Merge "Save AudioTrack to XML" 2010-10-04 17:52:43 -07:00
Romain Guy
5a9be87d7d Merge "Remove logs to reduce logcat spam." 2010-10-04 17:24:21 -07:00
Chet Haase
d6fae037b8 Merge "Changed LayoutTransition to disable animations when set to null" 2010-10-04 17:16:03 -07:00
Romain Guy
fea26a72f1 Merge "Reorder logs." 2010-10-04 17:15:15 -07:00
Gilles Debunne
ff5e2fddb3 Merge "resolved conflicts for merge of 242fa52b to master" 2010-10-04 16:01:22 -07:00
Gil Dobjanschi
5110891a53 Merge "Added audio track playback API" 2010-10-04 15:49:26 -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
58df7a6415 resolved conflicts for merge of 10d5b096 to master 
Change-Id: Id5c6ba651f72b48f0d70ee2ca64a6c9adf5e74f7
 2010-10-04 14:54:59 -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
Dirk Dougherty
96bd7ceaef am ba944ccd: Doc change: update screens support table and remove outdated density/size metrics. 
Merge commit 'ba944ccda3d61ccbe6061277fcc50c96fe2643f1' into gingerbread

* commit 'ba944ccda3d61ccbe6061277fcc50c96fe2643f1':
  Doc change: update screens support table and remove outdated density/size metrics.
 2010-10-04 11:12:07 -07:00
Mindy Pereira
a69e37dc3f am 53fb09b4: (-s ours) am 106950f2: Merge "DO NOT MERGE. Fix logic for switching between overscroll and scroll modes." into gingerbread 
Merge commit '53fb09b42f8862650f959c30c1ab104142fa873a'

* commit '53fb09b42f8862650f959c30c1ab104142fa873a':
  DO NOT MERGE. Fix logic for switching between overscroll and scroll modes.
 2010-10-04 10:20:47 -07:00
Mindy Pereira
dcd7d85a70 am 106950f2: Merge "DO NOT MERGE. Fix logic for switching between overscroll and scroll modes." into gingerbread 
Merge commit '106950f20bd352ed72ddf4490b2e19d305e36a74' into gingerbread-plus-aosp

* commit '106950f20bd352ed72ddf4490b2e19d305e36a74':
  DO NOT MERGE. Fix logic for switching between overscroll and scroll modes.
 2010-10-04 10:13:32 -07:00