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

32930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
5972e52e15 resolved conflicts for merge of 53b07027 to master 
Change-Id: Ia5ce86d84454a4be76e71aeb77942ba8d88d2700
 2010-09-30 18:43:52 -04:00
Jake Hamby
f51eadaf1f Typo fixes in comments and minor code cleanups. 
* Fix some typos in Javadoc and log messages.
* Remove redundant initializer in BluetoothAdapter.readOutOfBandData()
* Use canonical "UTF-8" charset name instead of "UTF8" in
    BluetoothDevice.convertPinToBytes()

Change-Id: I58cd5dc48a7ad0053d204c5f590b4b3d438d8672
 2010-09-30 15:43:34 -07:00
Jeff Brown
ef3d7e8611 Move verbose logging of device capabilities to dumpsys. 
Change-Id: I5d55eaebfdf049bd1ac1e7bab2758886cfefc9d7
 2010-09-30 15:34:48 -07:00
Roy West
4d86c9aa5f Cherrypick unmerged dev admin string edits from Gingerbread. 
Change-Id: Ib20e561ae0e9c2ab164d53afa28591e262afcfc8
 2010-09-30 15:14:06 -07:00
Steve Howard
07b88ea0ac Merge "Updated current.xml as autogenerated" 2010-09-30 14:59:15 -07:00
Dianne Hackborn
8fc2518776 am c3bc8b7b: am 1bfbf19b: Merge "Fix night/notnight resource folder handling." into gingerbread 
Merge commit 'c3bc8b7b08611c8d86919f4695430990bc6b475d'

* commit 'c3bc8b7b08611c8d86919f4695430990bc6b475d':
  Fix night/notnight resource folder handling.
 2010-09-30 14:57:23 -07:00
Steve Howard
83129bba36 Updated current.xml as autogenerated 
My previous change included a manually-edited version of current.xml
to get the build fixed.  This change includes an equivalent file as
generated by update-api, so that the next person won't see a bunch of
unexpected diffs.

Change-Id: Ia244d90248ec54ddfa3b7344c09720c56ff201e3
 2010-09-30 14:57:21 -07:00
Paul Westbrook
9987b1534e am 5dcaf7b0: am fcf1948a: Moved Rfc822 validator test 
Merge commit '5dcaf7b0b92ad6867ed50801923fb29157edddaa'

* commit '5dcaf7b0b92ad6867ed50801923fb29157edddaa':
  Moved Rfc822 validator test
 2010-09-30 14:56:34 -07:00
Steve Howard
ee0fc045da Merge "resolved conflicts for merge of 538c3fa3 to master" 2010-09-30 14:43:53 -07:00
Steve Howard
825bdff3b8 resolved conflicts for merge of 538c3fa3 to master 
Change-Id: I9190ca078ffd8b51515e3d53ac5753c05110c014
 2010-09-30 14:41:59 -07:00
Kenny Root
aff30c9b0d am 99f8c5ee: Merge "Fix location of gdbserver upon installation" into gingerbread 
Merge commit '99f8c5ee621d78a24583a10e459ba40aab511a17' into gingerbread-plus-aosp

* commit '99f8c5ee621d78a24583a10e459ba40aab511a17':
  Fix location of gdbserver upon installation
 2010-09-30 14:30:14 -07:00
Kenny Root
99f8c5ee62 Merge "Fix location of gdbserver upon installation" into gingerbread 2010-09-30 14:27:15 -07:00
Kenny Root
e6da118ebf Fix location of gdbserver upon installation 
Change-Id: Ie97f10456e5639e008abf4792a01b966b97721e7
 2010-09-30 14:13:59 -07:00
Jim Miller
b03649d49b Merge "Add new rezzing-in effect of Carousel to Recents." 2010-09-30 14:06:15 -07:00
Alex Sakhartchouk
12c08f2c87 Merge "Adding anisotropic filtering and related samples." 2010-09-30 14:04:43 -07:00
Jim Miller
5fd395ec60 Add new rezzing-in effect of Carousel to Recents. 
Change-Id: Ibfbc53af8bce3e43903bac1b3937731f2c903323
 2010-09-30 13:53:06 -07:00
Wu-cheng Li
1eb98bdb44 am 6bbc2f15: am 2fb818ca: Fix the javadoc of Parameters.setRotation. 
Merge commit '6bbc2f1562ddc1be65aafcce63896f5899596c2a'

* commit '6bbc2f1562ddc1be65aafcce63896f5899596c2a':
  Fix the javadoc of Parameters.setRotation.
 2010-09-30 13:38:15 -07:00
Chia-chi Yeh
281d114ce8 am ab6327bc: am 20cb2310: Merge "KeyStore: Initialize IV correctly." into gingerbread 
Merge commit 'ab6327bc9ab70f3b4c1f509d038474982772207e'

* commit 'ab6327bc9ab70f3b4c1f509d038474982772207e':
  KeyStore: Initialize IV correctly.
 2010-09-30 13:36:55 -07:00
Chia-chi Yeh
2e88d0c4bc am 2b133fc0: am 21ae1ad6: RTP: Minor fixes with polishing. 
Merge commit '2b133fc07533a853f7de23da4f60a766f4233bed'

* commit '2b133fc07533a853f7de23da4f60a766f4233bed':
  RTP: Minor fixes with polishing.
 2010-09-30 13:36:50 -07:00
Chia-chi Yeh
59c1da6342 am 92cb1a02: am 2cbb56f9: Merge "KeyStore: Fix the return value when send() or recv() has an error." into gingerbread 
Merge commit '92cb1a026a2d6c594a63c18d8906271147eed85b'

* commit '92cb1a026a2d6c594a63c18d8906271147eed85b':
  KeyStore: Fix the return value when send() or recv() has an error.
 2010-09-30 13:36:43 -07:00
Hung-ying Tyan
e0ed9dbcb8 am c79e74ec: am d29e0754: Merge "Add uri field to SipManager.ListenerRelay" into gingerbread 
Merge commit 'c79e74ec1d30f95de89568ee645a9b1577ae73b3'

* commit 'c79e74ec1d30f95de89568ee645a9b1577ae73b3':
  Add uri field to SipManager.ListenerRelay
 2010-09-30 13:36:37 -07:00
Chia-chi Yeh
bf45f19435 am f6381ec1: am dfd1484e: Merge "RTP: Adjust the jitter buffer to 512ms." into gingerbread 
Merge commit 'f6381ec1da1166e3350d897faae654afb2c21a5a'

* commit 'f6381ec1da1166e3350d897faae654afb2c21a5a':
  RTP: Adjust the jitter buffer to 512ms.
 2010-09-30 13:36:31 -07:00
Hung-ying Tyan
f3da1ea405 am 34552149: am 6a53489a: SipService: add UID check. 
Merge commit '34552149e4b997d4ed3383fc153faff2bb189066'

* commit '34552149e4b997d4ed3383fc153faff2bb189066':
  SipService: add UID check.
 2010-09-30 13:36:16 -07:00
Adam Powell
fdc624aaa7 Merge "resolved conflicts for merge of 6e9a021e to master" 2010-09-30 13:29:36 -07:00
Ying Wang
55ca691006 Fix proguard flag file dependency. 
Change-Id: Icd30226cfaa943648f8724b4208a22c661070262
 2010-09-30 13:20:45 -07:00
Mike Lockwood
53b0702755 am 727d67d4: Merge "location: rebind to network location and geocoder services after package update" into gingerbread 
Merge commit '727d67d4fb8721b0291312e4cca33927dfba0e31' into gingerbread-plus-aosp

* commit '727d67d4fb8721b0291312e4cca33927dfba0e31':
  location: rebind to network location and geocoder services after package update
 2010-09-30 13:10:50 -07:00
Adam Powell
64e2b71893 resolved conflicts for merge of 6e9a021e to master 
Change-Id: I5ea823b752e78cb9d2ef7ccec68addbaa9ca66e9
 2010-09-30 13:09:43 -07:00
Mike Lockwood
727d67d4fb Merge "location: rebind to network location and geocoder services after package update" into gingerbread 2010-09-30 13:07:06 -07:00
Dianne Hackborn
c3bc8b7b08 am 1bfbf19b: Merge "Fix night/notnight resource folder handling." into gingerbread 
Merge commit '1bfbf19bd93567d75d1f62c0ee3a81dddc7cc895' into gingerbread-plus-aosp

* commit '1bfbf19bd93567d75d1f62c0ee3a81dddc7cc895':
  Fix night/notnight resource folder handling.
 2010-09-30 12:43:55 -07:00
Dianne Hackborn
1bfbf19bd9 Merge "Fix night/notnight resource folder handling." into gingerbread 2010-09-30 12:40:52 -07:00
Mike Lockwood
e97ae40dff location: rebind to network location and geocoder services after package update 
Change-Id: I2d7db3512b9edd7e0ba27d97442967fc2278e3b9
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-30 15:25:54 -04:00
Jeff Brown
3cfc508f4e am 76d55a34: am 5068ad8d: Revert orientation change. 
Merge commit '76d55a3447954db97b7172d068813d02e89ba9ca'

* commit '76d55a3447954db97b7172d068813d02e89ba9ca':
  Revert orientation change.
 2010-09-30 12:02:31 -07:00
Robert Greenwalt
a69a162816 am aa03f13c: am e8dd7160: Merge "Change the 0_fully signal icon to the new style" into gingerbread 
Merge commit 'aa03f13c3aab16059e6e617fe510f454ed280459'

* commit 'aa03f13c3aab16059e6e617fe510f454ed280459':
  Change the 0_fully signal icon to the new style
 2010-09-30 12:02:24 -07:00
Jeff Brown
36c956d78b am b8182a38: am 93e3296f: Merge "PointerLocationView: Display orientation correctly." into gingerbread 
Merge commit 'b8182a382df3efaf18c9810dd7c517b2601edadb'

* commit 'b8182a382df3efaf18c9810dd7c517b2601edadb':
  PointerLocationView: Display orientation correctly.
 2010-09-30 12:02:17 -07:00
Chia-chi Yeh
a77c9541d0 am cbee6229: am 0a537b78: Merge "RTP: Enable AMR codec." into gingerbread 
Merge commit 'cbee622954de5e9e0c07557f8ec9aaa741110043'

* commit 'cbee622954de5e9e0c07557f8ec9aaa741110043':
  RTP: Enable AMR codec.
 2010-09-30 12:02:10 -07:00
Hung-ying Tyan
d161479237 am 947d2abd: am 2365b78e: Merge "SIP: misc fixes." into gingerbread 
Merge commit '947d2abd82ef68c661fc29fd5167e4c0ba749f71'

* commit '947d2abd82ef68c661fc29fd5167e4c0ba749f71':
  SIP: misc fixes.
 2010-09-30 12:02:03 -07:00
Hung-ying Tyan
db9e87b988 am 49c13e51: am 0e412304: Catch exceptions in SipPhone.canTake(). 
Merge commit '49c13e512c675b27099783ccf2d20c9ef46c99db'

* commit '49c13e512c675b27099783ccf2d20c9ef46c99db':
  Catch exceptions in SipPhone.canTake().
 2010-09-30 12:01:56 -07:00
Hung-ying Tyan
bd407edc47 am 2c457326: am 421c34c1: SipPhone: revise hangup() in SipCall and SipConnection. 
Merge commit '2c4573263a97cc80f441824a75d6502ae04292a8'

* commit '2c4573263a97cc80f441824a75d6502ae04292a8':
  SipPhone: revise hangup() in SipCall and SipConnection.
 2010-09-30 12:01:48 -07:00
Gilles Debunne
7d667fb5c9 Merge "resolved conflicts for merge of 8064dd22 to master" 2010-09-30 11:55:39 -07:00
Jeff Brown
20e987bfc3 Add MotionEvent Matrix transformations. 
Fixed issued in ViewGroup's transformation of MotionEvents to ensure
that the entire historical trace is transformed, not just the current
pointer.

Simplified the code in ViewGroup for splitting events across Views.
The new code also handles the case where some pointers are dispatched
to the ViewGroup in addition to its children whereas the previous
code would drop some pointers on the floor.

Change-Id: I56ac31903e1de8a9c376d9c935b7217b0c42d93e
 2010-09-30 11:52:48 -07:00
Gilles Debunne
09f1612885 resolved conflicts for merge of 8064dd22 to master 
Change-Id: Iff7f729d1e375902a8d89bb237694913380b0d36
 2010-09-30 11:50:52 -07:00
Paul Westbrook
5dcaf7b0b9 am fcf1948a: Moved Rfc822 validator test 
Merge commit 'fcf1948aeb0b548d1f89890d58baefd008880cb7' into gingerbread-plus-aosp

* commit 'fcf1948aeb0b548d1f89890d58baefd008880cb7':
  Moved Rfc822 validator test
 2010-09-30 11:45:05 -07:00
Steve Howard
538c3fa35f am cdcc0a65: Merge "Have download manager give more details when downloads are paused" into gingerbread 
Merge commit 'cdcc0a65fae7e649f0f07e396dbe0dd59ceffada' into gingerbread-plus-aosp

* commit 'cdcc0a65fae7e649f0f07e396dbe0dd59ceffada':
  Have download manager give more details when downloads are paused
 2010-09-30 11:42:16 -07:00
Alex Sakhartchouk
f5b3510c70 Adding anisotropic filtering and related samples. 
Change-Id: Idb173274417feb5e25bfd64c5e9fa2492a23a17e
 2010-09-30 11:36:37 -07:00
Paul Westbrook
fcf1948aeb Moved Rfc822 validator test 
Moved rfc822 validator test to framework/ex, as this is where
the code lives

Change-Id: Ia12e67364df9c8f9351dea423d769454a5d4e58d
 2010-09-30 11:32:42 -07:00
Ying Wang
4f4870f0bb am 3b197dfc: am 3caaa64e: Merge "Fix proguard flag file dependency." into gingerbread 
Merge commit '3b197dfc7f90b5b7b65cbf7e62a13b088ef416d6'

* commit '3b197dfc7f90b5b7b65cbf7e62a13b088ef416d6':
  Fix proguard flag file dependency.
 2010-09-30 11:27:47 -07:00
Joe Onorato
0cf6418e09 am 9a042772: am 2a0b3c0d: Merge "AnimatedImageView: Stop the animation when we\'re not visible." into gingerbread 
Merge commit '9a042772c2d76dba3a541dc4190b7be1a438445a'

* commit '9a042772c2d76dba3a541dc4190b7be1a438445a':
  AnimatedImageView: Stop the animation when we're not visible.
 2010-09-30 11:26:02 -07:00
David Brown
648e1aeb8a am 5cf44f69: am 87fbcc2b: Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread 
Merge commit '5cf44f6907cde1126dd982af2d4dfd5c35da9eb9'

* commit '5cf44f6907cde1126dd982af2d4dfd5c35da9eb9':
  Implement contacts lookup (caller-id) for incoming SIP calls.
 2010-09-30 11:25:54 -07:00
Doug Zongker
ca2e0293f2 am ab9f5082: am 981dec69: Merge "don\'t delete /cache/recovery/last_log on boot" into gingerbread 
Merge commit 'ab9f508292f9a1eb54bf97bdd1566bdf8dd43fb3'

* commit 'ab9f508292f9a1eb54bf97bdd1566bdf8dd43fb3':
  don't delete /cache/recovery/last_log on boot
 2010-09-30 11:25:26 -07:00
Jaikumar Ganesh
659d3d566b am c10207b6: am a5c742bf: Merge "Update local cache before sending intent." into gingerbread 
Merge commit 'c10207b6bfcfe09636dd2035b4237f1001008a48'

* commit 'c10207b6bfcfe09636dd2035b4237f1001008a48':
  Update local cache before sending intent.
 2010-09-30 11:25:18 -07:00