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

41171 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Flynn
f1b552b6e0 Merge "DO NOT MERGE Return 1.5 * density as default for large screens." into ics-scoop 2012-02-23 16:09:36 -08:00
Joe Fernandez
892dd2e7a9 am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1 
* commit '566328a2a5fcd8c40fc67d8974d6df0df48b0056':
  docs: NDK overview, remove x86 instruction set mention (b/6044027)
 2012-02-23 14:24:53 -08:00
Joe Fernandez
2ea80d5afa Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1 2012-02-23 14:22:41 -08:00
Michael Jurka
1836a969f8 am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen 
* commit 'bf378fd7d7a91085685fe9e5528b84c485041c77':
  Don't allow screen invalidations to go outside bounds of screen
 2012-02-23 08:07:51 -08:00
Scott Main
b38c4a66f3 am 68d97aa2: Merge "docs: fix broken link" into ics-mr1 
* commit '68d97aa2c1ff16f327491fed5afb8b318f034a01':
  docs: fix broken link
 2012-02-22 16:23:03 -08:00
Scott Main
271d668dfd Merge "docs: fix broken link" into ics-mr1 2012-02-22 16:20:49 -08:00
Xavier Ducrohet
70eaeb38b8 am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1 
* commit '503247f213ef2894324a22e7608101e90a7fe8fb':
  Make sure resource references are resolved.
 2012-02-22 10:49:35 -08:00
Xavier Ducrohet
9bbfdcab00 Merge "Make sure resource references are resolved." into ics-mr1 2012-02-22 10:47:32 -08:00
Rich Hyndman
bce35365bd am 942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1 
* commit '942b823ce4b2e0e11d395dffb2d340de01811612':
  docs: Added Lint into Android Training and removed Layoutopt.
 2012-02-22 03:43:35 -08:00
Rich Hyndman
862fa82bc9 Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1 2012-02-22 03:41:05 -08:00
The Android Open Source Project
d4a885e630 Reconcile with ics-mr1-release 
Change-Id: Id8505107b41a8b89c123c16d33f609480a555632
 2012-02-21 15:36:34 -08:00
The Android Automerger
17cfa90294 merge in ics-mr1-release history after reset to ics-mr1 2012-02-21 15:27:33 -08:00
The Android Open Source Project
85e18a7f10 Reconcile with ics-mr1-release 
Change-Id: Ic0dc3fd4a476aecd8854c8a919ba1e096cc938f0
 2012-02-21 15:13:30 -08:00
Dianne Hackborn
51695ca139 am 01011c3d: Fix issue #6037252: Screen shifts after all apps are upgraded 
* commit '01011c3d7ce4f76c1a76b33a04fc63da784ddbea':
  Fix issue #6037252: Screen shifts after all apps are upgraded
 2012-02-21 14:57:55 -08:00
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