Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,602 Commits 3 Branches 0 Tags
ee0fc045dadc65de67af41dc26223dbffc87a574
Commit Graph

32602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Adam Powell
64e2b71893 resolved conflicts for merge of 6e9a021e to master 
Change-Id: I5ea823b752e78cb9d2ef7ccec68addbaa9ca66e9
 2010-09-30 13:09:43 -07: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
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
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
Steve Howard
cdcc0a65fa Merge "Have download manager give more details when downloads are paused" into gingerbread 2010-09-30 11:11:16 -07:00
Wu-cheng Li
6bbc2f1562 am 2fb818ca: Fix the javadoc of Parameters.setRotation. 
Merge commit '2fb818ca7dd53d00646854a2473f1a69be43067c' into gingerbread-plus-aosp

* commit '2fb818ca7dd53d00646854a2473f1a69be43067c':
  Fix the javadoc of Parameters.setRotation.
 2010-09-30 11:07:23 -07:00
Gilles Debunne
51ed8aa9d2 am ed1cf3da: am f0fa2674: Merge "New assets: wifi signal 1, no sim card." into gingerbread 
Merge commit 'ed1cf3dab59d7af51240269308007546a816b1f4'

* commit 'ed1cf3dab59d7af51240269308007546a816b1f4':
  New assets: wifi signal 1, no sim card.
 2010-09-30 11:00:19 -07:00
Eric Fischer
8b75965525 am 97708b19: am 5f0c8fe6: Merge "Split strings with SD card references into variations." into gingerbread 
Merge commit '97708b19c564294182558d757a871abc892d6975'

* commit '97708b19c564294182558d757a871abc892d6975':
  Split strings with SD card references into variations.
 2010-09-30 11:00:01 -07:00
Chia-chi Yeh
5a7c6d298e am 1c2eab2d: am 955ab37c: Merge "RTP: Enable GSM-EFR codec." into gingerbread 
Merge commit '1c2eab2d86faa9c647a9893f761a50cfa28d9d57'

* commit '1c2eab2d86faa9c647a9893f761a50cfa28d9d57':
  RTP: Enable GSM-EFR codec.
 2010-09-30 10:59:48 -07:00
Stephen Hines
ec29213b69 Merge "Fix clear() operation for rsScriptC." 2010-09-30 10:57:17 -07:00
Wu-cheng Li
2fb818ca7d Fix the javadoc of Parameters.setRotation. 
setRotation needs to consider the orientation of cameras.
Change-Id: I3ef23dc088647dacdddbb83e3f303c16b9251185
 2010-09-30 10:49:43 -07:00
Chia-chi Yeh
ab6327bc9a am 20cb2310: Merge "KeyStore: Initialize IV correctly." into gingerbread 
Merge commit '20cb2310cffb787c54016d50b9b5fe320fc5b025' into gingerbread-plus-aosp

* commit '20cb2310cffb787c54016d50b9b5fe320fc5b025':
  KeyStore: Initialize IV correctly.
 2010-09-30 10:11:16 -07:00
Chia-chi Yeh
2b133fc075 am 21ae1ad6: RTP: Minor fixes with polishing. 
Merge commit '21ae1ad6a695d6f1f253797fcf2a77b975b82cd3' into gingerbread-plus-aosp

* commit '21ae1ad6a695d6f1f253797fcf2a77b975b82cd3':
  RTP: Minor fixes with polishing.
 2010-09-30 10:11:07 -07:00
Chia-chi Yeh
92cb1a026a am 2cbb56f9: Merge "KeyStore: Fix the return value when send() or recv() has an error." into gingerbread 
Merge commit '2cbb56f961e4893a3bf7ded560d4bdbf45eabd01' into gingerbread-plus-aosp

* commit '2cbb56f961e4893a3bf7ded560d4bdbf45eabd01':
  KeyStore: Fix the return value when send() or recv() has an error.
 2010-09-30 10:10:59 -07:00
Hung-ying Tyan
c79e74ec1d am d29e0754: Merge "Add uri field to SipManager.ListenerRelay" into gingerbread 
Merge commit 'd29e0754183e4b3945eb7cabae91cd3df47ae4d6' into gingerbread-plus-aosp

* commit 'd29e0754183e4b3945eb7cabae91cd3df47ae4d6':
  Add uri field to SipManager.ListenerRelay
 2010-09-30 10:10:52 -07:00
Chia-chi Yeh
f6381ec1da am dfd1484e: Merge "RTP: Adjust the jitter buffer to 512ms." into gingerbread 
Merge commit 'dfd1484e3ba9c305730ccb39859919ca0e97d720' into gingerbread-plus-aosp

* commit 'dfd1484e3ba9c305730ccb39859919ca0e97d720':
  RTP: Adjust the jitter buffer to 512ms.
 2010-09-30 10:10:46 -07:00
Hung-ying Tyan
34552149e4 am 6a53489a: SipService: add UID check. 
Merge commit '6a53489ae594d7cc373a00687d6ea2f23d0634df' into gingerbread-plus-aosp

* commit '6a53489ae594d7cc373a00687d6ea2f23d0634df':
  SipService: add UID check.
 2010-09-30 10:10:41 -07:00
Adam Powell
6e9a021e96 am bc87ada1: Merge "Fix text anchors" into gingerbread 
Merge commit 'bc87ada10de34c2d7b1301af86d94ed7c4801120' into gingerbread-plus-aosp

* commit 'bc87ada10de34c2d7b1301af86d94ed7c4801120':
  Fix text anchors
 2010-09-30 10:10:34 -07:00
Jeff Brown
76d55a3447 am 5068ad8d: Revert orientation change. 
Merge commit '5068ad8d2396d6d7bfbdb1c2c3fe57104744f1f9' into gingerbread-plus-aosp

* commit '5068ad8d2396d6d7bfbdb1c2c3fe57104744f1f9':
  Revert orientation change.
 2010-09-30 10:10:20 -07:00
Robert Greenwalt
aa03f13c3a am e8dd7160: Merge "Change the 0_fully signal icon to the new style" into gingerbread 
Merge commit 'e8dd7160146803db6660fa10ab3e4f1d41e46c5b' into gingerbread-plus-aosp

* commit 'e8dd7160146803db6660fa10ab3e4f1d41e46c5b':
  Change the 0_fully signal icon to the new style
 2010-09-30 10:10:14 -07:00
Jeff Brown
b8182a382d am 93e3296f: Merge "PointerLocationView: Display orientation correctly." into gingerbread 
Merge commit '93e3296f946bf54e0f8172c9d26355d9a65c878f' into gingerbread-plus-aosp

* commit '93e3296f946bf54e0f8172c9d26355d9a65c878f':
  PointerLocationView: Display orientation correctly.
 2010-09-30 10:10:09 -07:00
Chia-chi Yeh
cbee622954 am 0a537b78: Merge "RTP: Enable AMR codec." into gingerbread 
Merge commit '0a537b78d3fb4db86411d745b2696459d6b98ef6' into gingerbread-plus-aosp

* commit '0a537b78d3fb4db86411d745b2696459d6b98ef6':
  RTP: Enable AMR codec.
 2010-09-30 10:10:02 -07:00