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

63127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
57f55d7f9c am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1 
* commit '835e07f8f437e1872451dd23c0faf925388e1aef':
  docs: Android NDK r7b Release Notes
 2012-02-14 12:37:18 -08:00
Mike Lockwood
b9be8eff22 am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1 
* commit 'ffc89899652f5c815b6d156f55a909001420891e':
  Don't pulse LED on new notification unless notification has LED flag set
 2012-02-14 12:37:16 -08:00
John Wang
252c64f9c3 am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1 
* commit '63b596664c3fdb70ad32c8f641f477ec9140d6ec':
  Only use CDMA rssi for config_alwaysUseCdmaRssi.
 2012-02-14 12:37:14 -08:00
Joe Fernandez
835e07f8f4 Merge "docs: Android NDK r7b Release Notes" into ics-mr1 2012-02-14 12:05:25 -08:00
Joe Fernandez
0ae5cacf6c docs: Android NDK r7b Release Notes 
Change-Id: Ib1a92b1bbdb190f3aae6dcc69a78cbf5ad3c4760
 2012-02-14 11:49:27 -08:00
Mike Lockwood
ffc8989965 Merge "Don't pulse LED on new notification unless notification has LED flag set" into ics-mr1 2012-02-14 11:30:05 -08:00
John Wang
63b596664c Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1 2012-02-14 10:09:26 -08:00
Mike Lockwood
ece18efb35 Don't pulse LED on new notification unless notification has LED flag set 
Bug: 6006131

Change-Id: I719c7d68e310bfaca227f6286159b3993784926b
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2012-02-13 20:42:19 -08:00
Jean-Baptiste Queru
fca4ff3851 am eaf2617f: am 472512f6: Merge "Fix incorrect prototype for JNI call" 
* commit 'eaf2617fc20dd6484722edc9df41faf6e91d73cc':
  Fix incorrect prototype for JNI call
 2012-02-13 19:58:09 -08:00
Jean-Baptiste Queru
eaf2617fc2 am 472512f6: Merge "Fix incorrect prototype for JNI call" 
* commit '472512f6970fa170e2e1a3e1c24ac2b742e2e6b6':
  Fix incorrect prototype for JNI call
 2012-02-13 19:55:52 -08:00
John Wang
d55cde1384 Only use CDMA rssi for config_alwaysUseCdmaRssi. 
If config_alwaysUseCdmaRssi is true, the RSSI signal bar only
shows the CDMA value, no matter it connects to EVDO or WiMax .

bug:5941743
Change-Id: I4187571898a9fb47162e1ccf0cc4c59c3136ae0b
 2012-02-13 17:48:24 -08:00
Jean-Baptiste Queru
472512f697 Merge "Fix incorrect prototype for JNI call" 2012-02-13 14:32:33 -08:00
Tsu Chiang Chuang
3ded587cc1 am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1 
* commit '08eb7dd630a2de8dd51a988a747da26ff9d3f8fb':
  extending timeout to stabilize tests
 2012-02-13 13:43:07 -08:00
Tsu Chiang Chuang
08eb7dd630 Merge "extending timeout to stabilize tests" into ics-mr1 2012-02-13 13:41:37 -08:00
Wink Saville
812c2ff631 am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1 
* commit '197fe26940022be75384f4038dd789f446d33122':
  Add OEM specific USB mode enumeration based on ro.bootmode property
 2012-02-10 15:14:40 -08:00
Wink Saville
197fe26940 Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1 2012-02-10 15:12:19 -08:00
Eric Fischer
8b6d7b063b am 650462bb: Import revised translations. DO NOT MERGE 
* commit '650462bbfd6218c918cd9507ea0a33fa9a936f26':
  Import revised translations.  DO NOT MERGE
 2012-02-10 13:11:45 -08:00
Eric Fischer
650462bbfd Import revised translations. DO NOT MERGE 
Change-Id: Ibfc588d17f79baa0359d3a20a0a5ff7a2f3f152b
 2012-02-10 12:29:26 -08:00
Kazuhiro Ondo
afd8f1820e Add OEM specific USB mode enumeration based on ro.bootmode property 
This patch is adding a capability so that OEM can override USB mode
in case the device is boot up with OEM specific mode. (i.e. modem
debug, factory test etc.)

Bug:5964042
Change-Id: Ic8e23d302563ce71eedb74ce94cca8c65838a4f7
 2012-02-10 12:29:12 -08:00
Justin Ho
448249d1a7 am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1 
* commit '744c5b0bdee6a26e2dc7e740a695d53c32104326':
  Import translations. DO NOT MERGE
 2012-02-10 10:09:42 -08:00
Justin Ho
744c5b0bde Merge "Import translations. DO NOT MERGE" into ics-mr1 2012-02-10 10:07:07 -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
d9c8bbd56a docs: fix xss issue 
bug 5125642

Change-Id: I326b619643e3b3de20aa9303e92c9218fdfe50f7
 2012-02-09 15:57:09 -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
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
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
09ff04d789 docs: fix typo in menu TOC 
Change-Id: Ief511803ef5b4bed1823a12918de814aca119681
 2012-02-07 21:45:00 -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
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
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
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
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
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
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
Xavier Ducrohet
f8aea99385 Make aapt ignore tools-related data. 
This patchset introduces a new standard namespace http://schemas.android.com/tools
which will be used for tools specific XML attributes.
Any attributes using this namespace will not be compiled into the binary XML file.

The namespace node is also not written at all, and its string is not collected
to ensure that there is no impact on the devices.

(cherry picked from commit a5d5e9d906583ebeb590ca200ca9840302a5cd1a)

Change-Id: I62937b8bc34c07ac544930aa8eadd7797e0179d5
 2012-02-06 11:25:28 -08:00
Tsu Chiang Chuang
a8c57bf6ad extending timeout to stabilize tests 
Change-Id: I2e0a7ae35babdda18ade4f70d61b4c83c9d2c2d9
 2012-02-01 15:24:51 -08:00