ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
41,207 Commits 2 Branches 0 Tags 54 MiB
b88b34907b
Commit Graph

41207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
d661097a21 merge in ics-mr1-release history after reset to ics-mr1 2012-02-17 16:38:41 -08:00
Tsu Chiang Chuang
f7285d1418 am 2d559b53: Merge "fix NPE in race condition." into ics-mr1 
* commit '2d559b5311be1cd909e5a445afe75a840688b822':
  fix NPE in race condition.
 2012-02-17 15:55:44 -08:00
Tsu Chiang Chuang
af139111ad Merge "fix NPE in race condition." into ics-mr1 2012-02-17 15:53:50 -08:00
Adam Powell
1ae4c49c32 am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks 
* commit '482ae5f2388a07d60d7f3b54432120172af25eee':
  Bug 6021294 - Contextual action bar animation tweaks
 2012-02-17 15:25:18 -08:00
The Android Open Source Project
c4a6e6758d Reconcile with ics-mr1-release 
Change-Id: I04e83e00da70672ba81716c43919c489e77b14c6
 2012-02-17 09:02:50 -08:00
Marc Blank
c9968559f1 am 094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE 
* commit '094bf51ec0911057263a27db4d79db4eface2d63':
  Use ' for apostrophe in HTML encoding DO NOT MERGE
 2012-02-16 16:54:23 -08:00
The Android Automerger
e2f93ba590 merge in ics-mr1-release history after reset to ics-mr1 2012-02-16 16:26:06 -08:00
Dianne Hackborn
8103a941ba am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held. 
* commit '06a591cdd6d90600db006906d5d1524d156d6529':
  Fix last change -- don't call startInputInner() with lock held.
 2012-02-16 14:43:43 -08:00
The Android Open Source Project
4b33f90eed Reconcile with ics-mr1-release 
Change-Id: I7c4496218c25c8d2b0271782ad08b4b63055ed92
 2012-02-16 10:10:14 -08:00
The Android Automerger
04b944d66f merge in ics-mr1-release history after reset to ics-mr1 2012-02-16 09:40:11 -08:00
Justin Ho
db7eaa3358 am e8e0527a: Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1 
* commit 'e8e0527aa699c7db999b659b044d16cea6c67901':
  Update WiMAX notification icons Bug: 5724605
 2012-02-16 09:28:12 -08:00
Justin Ho
1e1a5d7820 Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1 2012-02-16 09:27:05 -08:00
Justin Ho
0520e2603e am c470b2dd: Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1 
* commit 'c470b2dd49ae2c4894de22f7bdd9f91af1a085f8':
  Part of fixing issue #6006757: Keyboard dismissal lags
 2012-02-16 09:25:03 -08:00
Justin Ho
c7e551a13d Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1 2012-02-16 09:23:01 -08:00
Scott Main
9030258fc6 am 2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; 
* commit '2a1d19174e32bb6056086ec603948cd476a2ea67':
  docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs.
 2012-02-15 17:33:15 -08:00
Scott Main
b37165202a Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs." into ics-mr1 2012-02-15 17:31:54 -08:00
Scott Main
0211a3dc3c am 26703326: docs: Google+ badge now sizes properly; remove reposition hack 
* commit '26703326784a6de45830236bd0a97345f93448d4':
  docs: Google+ badge now sizes properly; remove reposition hack
 2012-02-15 13:26:27 -08:00
The Android Automerger
282ce65def merge in ics-mr1-release history after reset to ics-mr1 2012-02-14 14:15:44 -08:00
Robert Greenwalt
e4f6a70a41 am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1 
* commit 'c8711ca7eb962072ccd6175be3cfa861195ba6cd':
  Stop using shared DUN APN when tethering stops.
 2012-02-14 13:39:55 -08:00
Robert Greenwalt
c5696c721a am fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1 
* commit 'fc19160a6a464eb71e50794fc1aa1e99c4173e31':
  Add a config to set Dun capabilities.
 2012-02-14 13:39:53 -08:00
Robert Greenwalt
34297ab3a2 Merge "Stop using shared DUN APN when tethering stops." into ics-mr1 2012-02-14 13:38:15 -08:00
Robert Greenwalt
b34f2b22a3 Merge "Add a config to set Dun capabilities." into ics-mr1 2012-02-14 13:37:44 -08:00
Justin Ho
37eb849a1c 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
cfcb3a71aa 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
b8c7b5e19b 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
08082daf8c 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
fab67d1b13 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
Joe Fernandez
a9c71f71e6 Merge "docs: Android NDK r7b Release Notes" into ics-mr1 2012-02-14 12:05:25 -08:00
Mike Lockwood
51551a81ec 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
06ea772a19 Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1 2012-02-14 10:09:26 -08:00
Ramanan Rajeswaran
8fa3ba4f47 Merge "DO NOT MERGE" into ics-scoop 2012-02-13 14:22:44 -08:00
Ramanan Rajeswaran
9c7058f299 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
c1720bacf3 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
0137d87be0 Merge "extending timeout to stabilize tests" into ics-mr1 2012-02-13 13:41:37 -08:00
Dianne Hackborn
a4ebe8d29a Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc. 
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
 2012-02-13 12:01:56 -08:00
Wink Saville
e0043bf472 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
23051433d2 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
e67927d80f am 650462bb: Import revised translations. DO NOT MERGE 
* commit '650462bbfd6218c918cd9507ea0a33fa9a936f26':
  Import revised translations.  DO NOT MERGE
 2012-02-10 13:11:46 -08:00
Justin Ho
69e91bd287 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
b96058b1fa Merge "Import translations. DO NOT MERGE" into ics-mr1 2012-02-10 10:07:07 -08:00
Scott Main
8d35a8b077 am d9c8bbd5: docs: fix xss issue bug 5125642 
* commit 'd9c8bbd56a9c76a111f9441871e79516c521aa75':
  docs: fix xss issue bug 5125642
 2012-02-09 16:01:38 -08:00
Joe Fernandez
976238bf5c 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
8ec61aacd3 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
40818f11a9 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
aec806c78b am 09ff04d7: docs: fix typo in menu TOC 
* commit '09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
  docs: fix typo in menu TOC
 2012-02-07 21:47:38 -08:00
The Android Open Source Project
9930f484d0 Reconcile with ics-mr1-release 
Change-Id: I628448f7b618988e20f7dfdf58c53133874a3958
 2012-02-07 10:18:32 -08:00
John Wang
b4305fb3b2 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
5245acf270 Merge "Don't use SNR in the invalid check." into ics-mr1 2012-02-06 17:00:49 -08:00
Xavier Ducrohet
62898802ec 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
Scott Main
435d5b6321 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