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

62612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
fc19160a6a Merge "Add a config to set Dun capabilities." into ics-mr1 2012-02-14 13:37:44 -08:00
Justin Ho
8a3bf55942 am c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1 
* commit 'c312ba322b5f204753a2ad8e40062c26114a15d8':
  Update 4G WiMAX assets for notification area as well Bug: 5724605
 2012-02-14 13:31:28 -08:00
Justin Ho
c312ba322b Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1 2012-02-14 13:29:08 -08:00
Joe Fernandez
6a9beb536f 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:43 -08:00
Mike Lockwood
5f423d8875 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:40 -08:00
John Wang
749b32dfe6 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:38 -08:00
Justin Ho
9dd3a66286 Update 4G WiMAX assets for notification area as well 
Bug: 5724605

Change-Id: Iade031923f1d3a07ca6dd366642c04071168d495
 2012-02-14 12:10:54 -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
Robert Greenwalt
2384386f31 Stop using shared DUN APN when tethering stops. 
Backported from master, including a bug fix and a cdma enhancement.

Even if other people are sharing the connection (ie, carrier wants
default and tethered traffic on the same APN) stop using a carrier-
described APN when the tethering stops.

bug:5972599
Change-Id: I25e4831855e6b62c0c3ab3a6f4d4846aaee6ac50
 2012-02-14 11:44:09 -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
Robert Greenwalt
8d27f20ac2 Add a config to set Dun capabilities. 
Since CDMA doesn't use APN settings there was no place to say what a cdma
device's DUN connection would support, so by default normal device
originating traffic would be blocked on a tethering single-connection device.

With this change you can (via overlay) say that it supports everything
so mms and on-device browsing/email will still work even when on a dun connection.

The reason to allow both: some carriers will charge per byte for dun access
and so they don't want lots of non-tethering traffic used (costs the user alot)
but other carriers just use a dun connection to limit access to tethering, but
once there give unlimited data, so it makes sense to support everything there.

bug:5972599
Change-Id: I78fd7f3ac63c51a0560b659ed5ec219b10a93f8d
 2012-02-14 11:29:36 -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
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
Ramanan Rajeswaran
8046e294c5 Merge "DO NOT MERGE" into ics-scoop 2012-02-13 14:22:44 -08:00
Ramanan Rajeswaran
9d29031417 DO NOT MERGE 
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."

This reverts commit c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.

Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
 2012-02-13 14:17:06 -08:00
Tsu Chiang Chuang
eb56ad183a am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1 
* commit '08eb7dd630a2de8dd51a988a747da26ff9d3f8fb':
  extending timeout to stabilize tests
 2012-02-13 13:42:45 -08:00
Tsu Chiang Chuang
08eb7dd630 Merge "extending timeout to stabilize tests" into ics-mr1 2012-02-13 13:41:37 -08:00
Dianne Hackborn
c1496d2d9a Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc. 
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
 2012-02-13 12:01:56 -08:00
Wink Saville
f11b6fbfc8 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
a2c9241869 am 650462bb: Import revised translations. DO NOT MERGE 
* commit '650462bbfd6218c918cd9507ea0a33fa9a936f26':
  Import revised translations.  DO NOT MERGE
 2012-02-10 13:11:46 -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
0fc225ed37 am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1 
* commit '744c5b0bdee6a26e2dc7e740a695d53c32104326':
  Import translations. DO NOT MERGE
 2012-02-10 10:10:39 -08:00
Justin Ho
744c5b0bde Merge "Import translations. DO NOT MERGE" into ics-mr1 2012-02-10 10:07:07 -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
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
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
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
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
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
1bd8111bbc Reconcile with ics-mr1-release 
Change-Id: I628448f7b618988e20f7dfdf58c53133874a3958
 2012-02-07 10:18:32 -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
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
48ac0f14de Merge "Don't use SNR in the invalid check." into ics-mr1 2012-02-06 17:00:49 -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
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
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
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
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
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
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