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

63214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
c4aa19a578 am ea227787: Merge changes I903353c5,I822dcc74 
* commit 'ea227787253e29da2d688399b097e05708d3bf73':
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit
 2012-02-24 10:24:34 -08:00
Jean-Baptiste Queru
ea22778725 Merge changes I903353c5,I822dcc74 
* changes:
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit
 2012-02-24 10:07:49 -08:00
Jean-Baptiste Queru
5f83b95705 am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct" 
* commit 'bf45bbf3b4a54976b81234ffc8ac41520bc052fc':
  stagefright aacenc: Zero-initialize a struct
 2012-02-24 09:54:58 -08:00
Jean-Baptiste Queru
bf45bbf3b4 Merge "stagefright aacenc: Zero-initialize a struct" 2012-02-24 09:47:23 -08:00
Jean-Baptiste Queru
e7650c3279 am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" 
* commit 'e5bdd24b69c4033163d478d721247691e11cea36':
  stagefright aacenc: Avoid warnings about incompatible pointer types
 2012-02-24 09:45:40 -08:00
Jean-Baptiste Queru
7ffa4546de am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers" 
* commit '47b56c5a46287ea226c05e3c0238a91f4702491a':
  stagefright aacenc: Add const declarations to some pointers
 2012-02-24 09:20:44 -08:00
Jean-Baptiste Queru
e5bdd24b69 Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" 2012-02-24 09:20:37 -08:00
Jean-Baptiste Queru
47b56c5a46 Merge "stagefright aacenc: Add const declarations to some pointers" 2012-02-24 08:53:25 -08:00
Jean-Baptiste Queru
aa86aa60dc am 1b704610: Merge "stagefright aacenc: Fix inline asm" 
* commit '1b7046108c0f381fa8b7efaebae02c1a2b3099b3':
  stagefright aacenc: Fix inline asm
 2012-02-24 08:50:32 -08:00
Jean-Baptiste Queru
1b7046108c Merge "stagefright aacenc: Fix inline asm" 2012-02-24 08:38:23 -08:00
Jean-Baptiste Queru
d7ab4e0c42 am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints" 
* commit 'bf1e85bfc8293646d57f0017afbfb0e09a1a41d7':
  stagefright aacenc: Fix inline asm constraints
 2012-02-24 07:53:43 -08:00
Jean-Baptiste Queru
bf1e85bfc8 Merge "stagefright aacenc: Fix inline asm constraints" 2012-02-24 07:39:03 -08:00
Jean-Baptiste Queru
0e25e4cd29 am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" 
* commit '63e43ba56a95708c229eec539a544967f1bbb7d7':
  Fix for issue 9656 - custom xml attributes in Android Libraries
 2012-02-23 12:57:03 -08:00
Jean-Baptiste Queru
63e43ba56a Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" 2012-02-23 12:38:14 -08:00
Jean-Baptiste Queru
b92aee4e8c am 69e9c30c: Merge "Add stubs for improved compatibility" 
* commit '69e9c30c2641add74c9a3b02d0959c0ded9e66f7':
  Add stubs for improved compatibility
 2012-02-22 12:34:06 -08:00
Jean-Baptiste Queru
69e9c30c26 Merge "Add stubs for improved compatibility" 2012-02-22 12:22:07 -08:00
Jean-Baptiste Queru
fc4215eec9 am 2d03a93e: Merge "Xcode 4.3 compatibility checkin" 
* commit '2d03a93ecf00fb43272364293a21f88720884ce2':
  Xcode 4.3 compatibility checkin
 2012-02-22 10:17:24 -08:00
Jean-Baptiste Queru
aff90790df am 4280891d: Merge "The bigger touch slop still has a problem" 
* commit '4280891dbc2cf60bdf51726e0aa9265ccb64ec88':
  The bigger touch slop still has a problem
 2012-02-22 09:56:27 -08:00
Jean-Baptiste Queru
2d03a93ecf Merge "Xcode 4.3 compatibility checkin" 2012-02-22 09:54:40 -08:00
Jean-Baptiste Queru
4280891dbc Merge "The bigger touch slop still has a problem" 2012-02-22 09:10:43 -08:00
Rich Hyndman
3ebde8a230 am 942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1 
* commit '942b823ce4b2e0e11d395dffb2d340de01811612':
  docs: Added Lint into Android Training and removed Layoutopt.
 2012-02-22 03:43:21 -08:00
Rich Hyndman
942b823ce4 Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1 2012-02-22 03:41:05 -08:00
The Android Open Source Project
64a907c5fd Reconcile with ics-mr1-release 
Change-Id: Ibfaead4c0416959781113e6000356f954fe4cfb8
 2012-02-21 15:34:49 -08:00
The Android Automerger
2c8276d2d2 merge in ics-mr1-release history after reset to ics-mr1 2012-02-21 15:27:33 -08:00
The Android Open Source Project
8013fd391e Reconcile with ics-mr1-release 
Change-Id: I21e41892b352f1deeb7bef163d6b99217bb24a6b
 2012-02-21 15:06:33 -08:00
Dianne Hackborn
f08beab2d1 am 01011c3d: Fix issue #6037252: Screen shifts after all apps are upgraded 
* commit '01011c3d7ce4f76c1a76b33a04fc63da784ddbea':
  Fix issue #6037252: Screen shifts after all apps are upgraded
 2012-02-21 14:57:46 -08:00
Dianne Hackborn
01011c3d7c Fix issue #6037252: Screen shifts after all apps are upgraded 
Two things: (1) make sure the boot message is always positioned within
the entire unrestricted display, and (2) allow the dim background to go
on top of the nav bar when being used for the boot message (this latter
is really a hack that should be more generally fixed in the future).

Change-Id: I7261b044eb802a39cadff931b50a679ff18781d6
 2012-02-21 13:54:21 -08:00
Jean-Baptiste Queru
cd0f3088ef Add stubs for improved compatibility 
Change-Id: I77b348b4c592e0b694aabb069812c94b9cb79a00
 2012-02-21 13:49:15 -08:00
Jean-Baptiste Queru
f3d94b4425 am a91b052e: am fc24982a: Merge "Call onTimeChanged when AM/PM changed." 
* commit 'a91b052e16196436fcd3a24caa894718db4d10d6':
  Call onTimeChanged when AM/PM changed.
 2012-02-21 12:30:46 -08:00
Jean-Baptiste Queru
a91b052e16 am fc24982a: Merge "Call onTimeChanged when AM/PM changed." 
* commit 'fc24982a44d2b2b678fe5aa212b2e709d10e6413':
  Call onTimeChanged when AM/PM changed.
 2012-02-21 12:28:38 -08:00
Jean-Baptiste Queru
fc24982a44 Merge "Call onTimeChanged when AM/PM changed." 2012-02-21 07:21:53 -08:00
Rich Hyndman
0980e41e97 docs: Added Lint into Android Training and removed Layoutopt. 
Change-Id: Ib818ba3ab12fff79dbede69ebf543a8e4be6f3df
 2012-02-20 12:49:10 +01:00
Masanori Ogino
dac640f403 The bigger touch slop still has a problem 
I had submitted the patch about this issue at
https://android-review.googlesource.com/#/c/20438/ before. But it
has never been included in any version.

In the latest implementation, touchSlop is a configurable value
which is declared in config.xml for each device. First of all,
the problem is that BiggerTouchSlop is not scalable and variable
value according to a configured touchSlop.

I don't think that there should be a new api in ViewConfiguration
for this. Because the bigger touch slop is a local threshold value
in GestureDetector. The only thing to be satisfied is that the
value should be bigger than configured touch slop and should not
be over double touch slop.

Change-Id: I2c6662400fcffb4a7192ede4ac8da08559aa7948
 2012-02-20 15:51:17 +09:00
Al Sutton
7a4d92af9b Xcode 4.3 compatibility checkin 
The update compiler in Xcode 4.3 (and 4.4) requires lookups into dependant
bases of class templates to be qualified. This checkin fixes the issues
raised by the compiler by implementing the this-> recommendation from
the llvm page at http://clang.llvm.org/compatibility.html#dep_lookup_bases

Signed-off-by: Al Sutton <al@funkyandroid.com>
 2012-02-19 08:31:19 +00:00
The Android Automerger
9c0b825e83 merge in ics-mr1-release history after reset to ics-mr1 2012-02-17 16:38:41 -08:00
Tsu Chiang Chuang
a626f8d61b am 2d559b53: Merge "fix NPE in race condition." into ics-mr1 
* commit '2d559b5311be1cd909e5a445afe75a840688b822':
  fix NPE in race condition.
 2012-02-17 15:55:56 -08:00
Tsu Chiang Chuang
2d559b5311 Merge "fix NPE in race condition." into ics-mr1 2012-02-17 15:53:50 -08:00
Adam Powell
8035db11ef am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks 
* commit '482ae5f2388a07d60d7f3b54432120172af25eee':
  Bug 6021294 - Contextual action bar animation tweaks
 2012-02-17 15:25:29 -08:00
Adam Powell
482ae5f238 Bug 6021294 - Contextual action bar animation tweaks 
Remove the right-to-left cascade effect from action mode menu
items. Animation time is now fixed at 300ms for scaling in menu items.

Change-Id: I8eef2ed9f93c2af804663dd5e6b3f4915ed45cb1
 2012-02-17 15:18:01 -08:00
Jean-Baptiste Queru
1d4c4d42ed am 44c1f012: Merge "Return error code when composing PDU fails" 
* commit '44c1f012c4ffa75853a068963b212ee1c965b6ea':
  Return error code when composing PDU fails
 2012-02-17 13:18:34 -08:00
Jean-Baptiste Queru
99ccf407bf am c2461eb3: Merge "Add support for bmp and wav content types in MMS" 
* commit 'c2461eb32ebad522a946e9fef9c31e886d98124a':
  Add support for bmp and wav content types in MMS
 2012-02-17 13:18:31 -08:00
Jean-Baptiste Queru
44c1f012c4 Merge "Return error code when composing PDU fails" 2012-02-17 11:36:52 -08:00
Jean-Baptiste Queru
c2461eb32e Merge "Add support for bmp and wav content types in MMS" 2012-02-17 11:03:35 -08:00
Jean-Baptiste Queru
8a33803df5 am a1ee18f1: Merge "Increase PDU parts buffer size for performance reasons" 
* commit 'a1ee18f1413471813f36a1d05927f5513c8931f5':
  Increase PDU parts buffer size for performance reasons
 2012-02-17 10:13:05 -08:00
Jean-Baptiste Queru
a1ee18f141 Merge "Increase PDU parts buffer size for performance reasons" 2012-02-17 09:53:29 -08:00
The Android Open Source Project
c30fdda052 Reconcile with ics-mr1-release 
Change-Id: I0126d92680a2624881870d7c835b3abd02cd6bab
 2012-02-17 08:09:34 -08:00
Matthias Thomae
9962ca12fb Increase PDU parts buffer size for performance reasons 
Changed the size of the temporary buffer used when storing a PDU part
to 8192 bytes instead of the previous 256 bytes. This greatly
decreases the time needed to store relatively large PDU parts. The
times to store PDU parts were so long that we frequently ended up with
an ANR. This change resulted in a total time usage of ~1000 ms instead
of ~10000 ms for ~500 kB worth of data.

Change-Id: Ia02cb28e4fd9dfe3aaa1fa30ff37659951cbed93
 2012-02-17 11:56:27 +01:00
Marc Blank
d3ea733104 am 094bf51e: Use &#39; for apostrophe in HTML encoding DO NOT MERGE 
* commit '094bf51ec0911057263a27db4d79db4eface2d63':
  Use &#39; for apostrophe in HTML encoding DO NOT MERGE
 2012-02-16 16:54:41 -08:00
Marc Blank
094bf51ec0 Use &#39; for apostrophe in HTML encoding DO NOT MERGE 
* We were using &apos; which is not correct

Chery-pick of CL: https://android-git.corp.google.com/g/165367
 2012-02-16 16:47:28 -08:00
The Android Automerger
75b223f2f8 merge in ics-mr1-release history after reset to ics-mr1 2012-02-16 16:26:06 -08:00