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

63256 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
758fe1511e am cf18f420: am 52bfc243: docs: fix misc doc bugs from external issue tracker 
* commit 'cf18f42026b6dea9e1ec2f243718a6b7aebae3a2':
 2012-02-09 21:07:08 -08:00
Scott Main
ad231a303e am db7da7ee: am d9c8bbd5: docs: fix xss issue bug 5125642 
* commit 'db7da7ee40231225861f4d39ea2f256bbca06f24':
  docs: fix xss issue bug 5125642
 2012-02-09 16:04:15 -08:00
Scott Main
db7da7ee40 am d9c8bbd5: docs: fix xss issue bug 5125642 
* commit 'd9c8bbd56a9c76a111f9441871e79516c521aa75':
  docs: fix xss issue bug 5125642
 2012-02-09 16:01:51 -08:00
Scott Main
98c313340a am d9c8bbd5: docs: fix xss issue bug 5125642 
* commit 'd9c8bbd56a9c76a111f9441871e79516c521aa75':
  docs: fix xss issue bug 5125642
 2012-02-09 16:01:38 -08:00
Scott Main
d9c8bbd56a docs: fix xss issue 
bug 5125642

Change-Id: I326b619643e3b3de20aa9303e92c9218fdfe50f7
 2012-02-09 15:57:09 -08:00
Joe Fernandez
4f21e3a08a am 20b9c795: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 
* commit '20b9c795d4dedaabac335eb5bcd8f7ba32e38af3':
  docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
 2012-02-09 13:48:46 -08:00
Joe Fernandez
a300ea98df am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 
* commit '1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
  docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
 2012-02-09 13:46:55 -08:00
Joe Fernandez
20b9c795d4 am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 
* commit '1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
  docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
 2012-02-09 13:46:41 -08:00
Joe Fernandez
1c66faab73 Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 2012-02-09 13:45:01 -08:00
Scott Main
ec12ae9933 am 79cfde69: am 52bfc243: docs: fix misc doc bugs from external issue tracker 
* commit '79cfde69fdd9952d51d4d9915c8b7fca98331e2c':
  docs: fix misc doc bugs from external issue tracker
 2012-02-09 12:50:18 -08:00
Scott Main
cf18f42026 am 52bfc243: docs: fix misc doc bugs from external issue tracker 
* commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6':
  docs: fix misc doc bugs from external issue tracker
 2012-02-09 12:48:18 -08:00
Scott Main
79cfde69fd am 52bfc243: docs: fix misc doc bugs from external issue tracker 
* commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6':
  docs: fix misc doc bugs from external issue tracker
 2012-02-09 12:48:08 -08:00
Scott Main
52bfc24368 docs: fix misc doc bugs from external issue tracker 
Change-Id: If6ff3476670e42b321d56d4a1482ccff96d4d500
 2012-02-09 12:45:16 -08:00
Joe Fernandez
a61f842040 docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132) 
Change-Id: I9d504017c507b2e203b8e0448d720714bec32e8c
 2012-02-09 11:16:20 -08:00
Eric Fischer
e42fe553a7 Import translations. DO NOT MERGE 
Change-Id: Id6eb7d951bbbd8d01ce11670946282eecd7bc984
 2012-02-08 18:46:47 -08:00
Scott Main
cc9dd9a637 am 02beef84: am 09ff04d7: docs: fix typo in menu TOC 
* commit '02beef8445fbf45b4dfc2472275dc5b49bb41a50':
 2012-02-07 21:50:20 -08:00
Scott Main
f8274e506c am 8561a6b0: am 09ff04d7: docs: fix typo in menu TOC 
* commit '8561a6b0c5e0fbec7101108bf480f2adb485f2bc':
  docs: fix typo in menu TOC
 2012-02-07 21:49:37 -08:00
Scott Main
02beef8445 am 09ff04d7: docs: fix typo in menu TOC 
* commit '09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
  docs: fix typo in menu TOC
 2012-02-07 21:48:03 -08:00
Scott Main
8561a6b0c5 am 09ff04d7: docs: fix typo in menu TOC 
* commit '09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
  docs: fix typo in menu TOC
 2012-02-07 21:47:38 -08:00
Scott Main
09ff04d789 docs: fix typo in menu TOC 
Change-Id: Ief511803ef5b4bed1823a12918de814aca119681
 2012-02-07 21:45:00 -08:00
The Android Open Source Project
6668958cbe am 1bd8111b: Reconcile with ics-mr1-release 
* commit '1bd8111bbc62278d5025de8ba5e3418b7477d8a2':
 2012-02-07 10:21:31 -08:00
The Android Open Source Project
1bd8111bbc Reconcile with ics-mr1-release 
Change-Id: I628448f7b618988e20f7dfdf58c53133874a3958
 2012-02-07 10:18:32 -08:00
The Android Open Source Project
0138357198 am 07bebe8b: Reconcile with ics-mr1-release 
* commit '07bebe8b12555ea0fb57729e8ee2e7efc343e7e2':
  Don't use SNR in the invalid check.
 2012-02-07 10:11:11 -08:00
The Android Open Source Project
07bebe8b12 Reconcile with ics-mr1-release 
Change-Id: Iff5f4c5cc26a9b874bef31bd62d22d3b210dc74f
 2012-02-07 10:09:08 -08:00
John Wang
2ca5fb2f46 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 20:29:06 -08:00
John Wang
a0da8adf55 am 397d3ffc: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1 
* commit '397d3ffcbd27d10b9479e58a46ca6ba70838b697':
 2012-02-06 17:04:42 -08:00
John Wang
7e6295b323 am 9ad528d5: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1 
* commit '9ad528d51c6e7b56e018100897b3c1cd6f9a2c17':
  Don't use SNR in the invalid check.
 2012-02-06 17:04:11 -08:00
John Wang
397d3ffcbd 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:03:15 -08:00
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
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
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
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