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

65447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Wang
9ad528d51c am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1 
* commit '48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
  Don't use SNR in the invalid check.
 2012-02-06 17:02:30 -08:00
John Wang
48ac0f14de Merge "Don't use SNR in the invalid check." into ics-mr1 2012-02-06 17:00:49 -08:00
Tom Taylor
3b259a0963 CrespoMMS appears after delay in the thread 
Bug 5032682

Part A of several parts to speed up sending MMS's. In this change, don't
allow multiple threads to write out the same pdu at the same time. This
was causing problems between the thread sending the mms message and the
UI trying to refresh and display the in-progress-sending message.

Change-Id: I862081619e6b6808caaba86a3b48820e0ef75aba
 2012-02-06 16:57:39 -08:00
Craig Mautner
61ac6bb250 Extract code from performLayoutAndPlaceSurfacesInnerLocked() into multiple methods. 
Change-Id: I80152c38741ce73b92da9483cfed84efbac34f89
 2012-02-06 16:52:16 -08:00
Xavier Ducrohet
0a59963287 am 82a74bbe: (-s ours) am 82fc005f: am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
* commit '82a74bbe91b7e90ec2fca56650e3d55ebdedeac2':
 2012-02-06 16:48:55 -08:00
Xavier Ducrohet
e1ce916e00 am c9bcd33a: (-s ours) am b1f95c6a: (-s ours) am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
* commit 'c9bcd33afa5c34e0a49955c30aa875ac8205b65f':
  Setup ActionBars in layoutlib the same way the platform does it. do not merge.
 2012-02-06 16:46:46 -08:00
Xavier Ducrohet
82a74bbe91 am 82fc005f: am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
* commit '82fc005f579a20b3c7e63603f056ca095c288196':
 2012-02-06 16:45:21 -08:00
Xavier Ducrohet
c9bcd33afa am b1f95c6a: (-s ours) am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
* commit 'b1f95c6a938f6eaaa7a3fd28574a14647178059b':
  Setup ActionBars in layoutlib the same way the platform does it. do not merge.
 2012-02-06 16:44:32 -08:00
Xavier Ducrohet
b1f95c6a93 am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
* commit '331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
  Setup ActionBars in layoutlib the same way the platform does it. do not merge.
 2012-02-06 16:42:56 -08:00
Xavier Ducrohet
82fc005f57 am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
* commit '331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
  Setup ActionBars in layoutlib the same way the platform does it. do not merge.
 2012-02-06 16:42:41 -08:00
Xavier Ducrohet
331bb0c393 Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
Instead of using a simple ImageView for the icon, this uses the platform
layout/action_bar_home which uses a custom class to position and resize
the icon (and also supports the Up icon that we don't yet support).

This ensures that the icon is properly positionned and sized like
on devices.

(cherry picked from commit 7396348dfcfb45b7ad055f4c18cabbe5e8270d26)

Change-Id: Ifd3bc318089b70ba843519523e366e59d434e919
 2012-02-06 16:40:03 -08:00
James Dong
c10cd4a6e3 Merge "Don't call virtual function in destructor of SurfaceMediaSource" 2012-02-06 16:21:24 -08:00
Xavier Ducrohet
327c8c2fbc Merge "Setup ActionBars in layoutlib the same way the platform does it. do not merge." 2012-02-06 16:17:42 -08:00
Xavier Ducrohet
db3ee88b39 Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
Instead of using a simple ImageView for the icon, this uses the platform
layout/action_bar_home which uses a custom class to position and resize
the icon (and also supports the Up icon that we don't yet support).

This ensures that the icon is properly positionned and sized like
on devices.

(cherry picked from commit 7396348dfcfb45b7ad055f4c18cabbe5e8270d26)

Change-Id: Ie7fde04c6598bfa1b9c9f789233e1215ea3eb950
 2012-02-06 16:15:03 -08:00
Xavier Ducrohet
6c9639803e Merge "Setup ActionBars in layoutlib the same way the platform does it." 2012-02-06 15:52:58 -08:00
Amith Yamasani
13c7b82234 Merge "Check for null ActivityInfo." 2012-02-06 15:39:40 -08:00
Fabrice Di Meglio
a65bc502a4 Fix bug #5968466 system running out of memory during WebView performance test 
- there can be only one Arabic "normal" fallback

Change-Id: I07f8123be0988bbb5b2fb23cc3fbf13870ef36c0
 2012-02-06 15:33:30 -08:00
Amith Yamasani
2f6c9eb9c2 Check for null ActivityInfo. 
Bug: 5970556
Change-Id: I87ebad1918311f24333d16cb6732742a1dd96685
 2012-02-06 15:31:35 -08:00
Mangesh Ghiware
5bd41b2949 Merge "Use WebKit hit testing result for centering on double-tap zoom." 2012-02-06 15:27:08 -08:00
Xavier Ducrohet
7396348dfc Setup ActionBars in layoutlib the same way the platform does it. 
Instead of using a simple ImageView for the icon, this uses the platform
layout/action_bar_home which uses a custom class to position and resize
the icon (and also supports the Up icon that we don't yet support).

This ensures that the icon is properly positionned and sized like
on devices.

Change-Id: I57432afa82d257bb043247001320b368045d7f55
 2012-02-06 15:11:12 -08:00
Mangesh Ghiware
5fe6f951ac Use WebKit hit testing result for centering on double-tap zoom. 
Iterate over the bounding boxes and find one large enough to fit the
screen width at reading scale. Align to left edge of said box.

Bug: 5175030
Bug: 5768421
Change-Id: Iac01e145336918b0a2b21d2864f46ba532aaf18f
 2012-02-06 15:01:57 -08:00
Scott Main
cb6831d7b6 am f9bb376b: am afaec576: am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 
* commit 'f9bb376bd7bfb6bdc77e1621a340122c29afd21c':
 2012-02-06 14:45:41 -08:00
Scott Main
053e0d14bb am dbee29ba: am 5a0fe6fc: am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 
* commit 'dbee29ba559a0c16919b5977ed4972481b0a98ec':
  docs: switch from caps to initial-case for device button names
 2012-02-06 14:45:39 -08:00
Jean-Baptiste Queru
0a3f6d69b6 am 33476f7a: am f79bcd2d: am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library." 
* commit '33476f7ad1c3b4dcaefddb306f315e201c4efb33':
  Skia API changes as a result of an update to the Skia library.
 2012-02-06 14:45:36 -08:00
Scott Main
f9bb376bd7 am afaec576: am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 
* commit 'afaec57668551b797505f43d9d9677979dedf0c9':
 2012-02-06 14:15:06 -08:00
Scott Main
dbee29ba55 am 5a0fe6fc: am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 
* commit '5a0fe6fc13bc1102fbc3da8391dd228ed54bba04':
  docs: switch from caps to initial-case for device button names
 2012-02-06 14:14:09 -08:00
Scott Main
afaec57668 am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 
* commit 'a9d9fa723a10ae41c047a4e8eba330112d344dc8':
  docs: switch from caps to initial-case for device button names
 2012-02-06 14:12:39 -08:00
Jean-Baptiste Queru
33476f7ad1 am f79bcd2d: am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library." 
* commit 'f79bcd2dd5d82376640661f50aa2e9237af7c02c':
  Skia API changes as a result of an update to the Skia library.
 2012-02-06 14:12:05 -08:00
Scott Main
5a0fe6fc13 am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 
* commit 'a9d9fa723a10ae41c047a4e8eba330112d344dc8':
  docs: switch from caps to initial-case for device button names
 2012-02-06 14:12:03 -08:00
Scott Main
a9d9fa723a Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 2012-02-06 14:10:16 -08:00
Jean-Baptiste Queru
f79bcd2dd5 am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library." 
* commit '52da99fac85d1e16a3c95bdd9c039801e920e6d1':
  Skia API changes as a result of an update to the Skia library.
 2012-02-06 14:09:36 -08:00
Scott Main
cf9fe43ce9 docs: switch from caps to initial-case for device button names 
Change-Id: I2affdf7400fd814e43633806cebebee4c6075b0b
 2012-02-06 14:09:00 -08:00
Jean-Baptiste Queru
52da99fac8 am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library." 
* commit 'a081c7b8bc5a3ea19fc7562b333fac525b17bc5f':
  Skia API changes as a result of an update to the Skia library.
 2012-02-06 14:07:31 -08:00
John Wang
7c70cefcae Don't use SNR in the invalid check. 
Since some RILs use -1 instead of INVALID_SNR as invalid vlue for
LTE SNR, SignalStrength will not use LTE SNR to check if LTE valid.

bug:5970403
Change-Id: Ia948e076f8f5878e081e87680076b187857879c8
 2012-02-06 14:03:57 -08:00
Jean-Baptiste Queru
a081c7b8bc Merge "Skia API changes as a result of an update to the Skia library." 2012-02-06 14:01:06 -08:00
Scott Main
e75abda25a am 6f2f42d5: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 
* commit '6f2f42d52a23de0bd639d5e4957331118ccc47b8':
 2012-02-06 13:09:08 -08:00
Scott Main
6d41c9a96e am 584156ad: am 8e399408: am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1 
* commit '584156ad29ec3b62a403ac692b16025c652b984c':
  docs: add Sony USB VID issue 5967572
 2012-02-06 13:09:06 -08:00
Scott Main
6f2f42d52a Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-02-06 13:07:24 -08:00
Scott Main
584156ad29 am 8e399408: am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1 
* commit '8e399408724f3d18d48d13194e05a80108216fed':
  docs: add Sony USB VID issue 5967572
 2012-02-06 13:07:21 -08:00
Scott Main
3cab656d38 am 0654994b: am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1 
* commit '0654994b9e546c50d84b3a9909f190220df65497':
  docs: add Sony USB VID issue 5967572
 2012-02-06 13:07:04 -08:00
Scott Main
0654994b9e am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1 
* commit '4ba15efc5b9c884a7651d699a20f9edd7ebd7cb5':
  docs: add Sony USB VID issue 5967572
 2012-02-06 13:05:28 -08:00
Scott Main
8e39940872 am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1 
* commit '4ba15efc5b9c884a7651d699a20f9edd7ebd7cb5':
  docs: add Sony USB VID issue 5967572
 2012-02-06 13:05:04 -08:00
Scott Main
4ba15efc5b Merge "docs: add Sony USB VID issue 5967572" into ics-mr1 2012-02-06 13:03:16 -08:00
Scott Main
ed4d1f7dcf docs: add Sony USB VID 
issue 5967572

Change-Id: I5735d15bec6bd85b5fa74300193dfba1c9da6f34
 2012-02-06 13:01:44 -08:00
James Dong
f5a9f439b6 Don't call virtual function in destructor of SurfaceMediaSource 
Change-Id: I3cbc2b1222335b61c814b5cdcfaefa495148b0ec
 2012-02-06 12:17:44 -08:00
Xavier Ducrohet
0afa7e2d95 am 9485ca87: am b54f371c: am f8aea993: Make aapt ignore tools-related data. 
* commit '9485ca87edd819e3106a4b8c3d08f1ab73adf818':
 2012-02-06 11:46:49 -08:00
Xavier Ducrohet
30ca4b5269 am 3d4db0dc: am c205a9d6: am f8aea993: Make aapt ignore tools-related data. 
* commit '3d4db0dc1803252b924076f7d10d8e806af71824':
  Make aapt ignore tools-related data.
 2012-02-06 11:44:43 -08:00
Xavier Ducrohet
9485ca87ed am b54f371c: am f8aea993: Make aapt ignore tools-related data. 
* commit 'b54f371cc4cfd32acf0fec35885a1da64accec9e':
 2012-02-06 11:44:19 -08:00
Xavier Ducrohet
3d4db0dc18 am c205a9d6: am f8aea993: Make aapt ignore tools-related data. 
* commit 'c205a9d68c23e9ade2cbe28bba0f257d84d23a97':
  Make aapt ignore tools-related data.
 2012-02-06 11:42:50 -08:00
Xavier Ducrohet
b54f371cc4 am f8aea993: Make aapt ignore tools-related data. 
* commit 'f8aea99385df8373b6edd6d5dd1d15b7b36b525b':
  Make aapt ignore tools-related data.
 2012-02-06 11:41:56 -08:00