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

64157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
1139a4f1e0 am 8f16f8bc: am 7fa4a28e: docs: add Coolpad to oem driver list 
* commit '8f16f8bc7299656c1e3200daa525610ae80a3f22':
 2012-03-26 14:54:11 -07:00
Scott Main
3aba4df731 am 0824035b: am af9a26b2: Merge "docs: replace the "Contribute" message with "Design"" into ics-mr1 
* commit '0824035b56056abcb64e516ab27f669fc0689681':
  docs: replace the "Contribute" message with "Design"
 2012-03-26 14:48:20 -07:00
Scott Main
0824035b56 am af9a26b2: Merge "docs: replace the "Contribute" message with "Design"" into ics-mr1 
* commit 'af9a26b21262500c5f864bcd82bc14ee805fdaac':
  docs: replace the "Contribute" message with "Design"
 2012-03-26 14:44:15 -07:00
Scott Main
d87f2262d8 am af9a26b2: Merge "docs: replace the "Contribute" message with "Design"" into ics-mr1 
* commit 'af9a26b21262500c5f864bcd82bc14ee805fdaac':
  docs: replace the "Contribute" message with "Design"
 2012-03-26 14:43:59 -07:00
Scott Main
af9a26b212 Merge "docs: replace the "Contribute" message with "Design"" into ics-mr1 2012-03-26 14:42:22 -07:00
Scott Main
e5f1f3b828 am 123f828d: am 7fa4a28e: docs: add Coolpad to oem driver list 
* commit '123f828de0339221f8bd7e24fc4a3764de51c8bb':
  docs: add Coolpad to oem driver list
 2012-03-26 14:35:29 -07:00
Scott Main
8f16f8bc72 am 7fa4a28e: docs: add Coolpad to oem driver list 
* commit '7fa4a28e1e37cb66d28dc16b7128da1fba01da0e':
  docs: add Coolpad to oem driver list
 2012-03-26 14:30:01 -07:00
Scott Main
123f828de0 am 7fa4a28e: docs: add Coolpad to oem driver list 
* commit '7fa4a28e1e37cb66d28dc16b7128da1fba01da0e':
  docs: add Coolpad to oem driver list
 2012-03-26 14:29:23 -07:00
Scott Main
f3ebd8ff3f docs: replace the "Contribute" message with "Design" 
Change-Id: I38c5990b3b5ee6538197c59671cec7adeadea913
 2012-03-26 14:25:01 -07:00
Scott Main
7fa4a28e1e docs: add Coolpad to oem driver list 
Change-Id: I0cb6267a35d9a691c6cacea471a9fca9d5dc61b8
 2012-03-26 12:12:24 -07:00
Joe Malin
7e25805dd6 am 5d181a39: am 093ed383: Merge "DOC CHANGE: IME subtype article" into ics-mr1 
* commit '5d181a390b63970c08175afa64babb3dd46b11de':
 2012-03-25 13:08:55 -07:00
Joe Malin
2249327207 am 8ea93aa6: am 093ed383: Merge "DOC CHANGE: IME subtype article" into ics-mr1 
* commit '8ea93aa6adc0e46c8931d31d4f940cdde97c672f':
  DOC CHANGE: IME subtype article
 2012-03-25 13:07:06 -07:00
Joe Malin
8ea93aa6ad am 093ed383: Merge "DOC CHANGE: IME subtype article" into ics-mr1 
* commit '093ed3838c3f2847be1893ea49c6b15b90e0afc3':
  DOC CHANGE: IME subtype article
 2012-03-25 13:04:59 -07:00
Joe Malin
5d181a390b am 093ed383: Merge "DOC CHANGE: IME subtype article" into ics-mr1 
* commit '093ed3838c3f2847be1893ea49c6b15b90e0afc3':
  DOC CHANGE: IME subtype article
 2012-03-25 13:04:58 -07:00
Joe Malin
093ed3838c Merge "DOC CHANGE: IME subtype article" into ics-mr1 2012-03-25 13:02:53 -07:00
Reto Meier
674228845c am 106d8460: am 20f394df: Docs: Added efficient downloads Android U class 
* commit '106d846080d6d239ab0eb3539cd92516046dcd4d':
 2012-03-23 13:34:25 -07:00
Reto Meier
284f9717d3 am 278296b5: am 20f394df: Docs: Added efficient downloads Android U class 
* commit '278296b59fb16b5dcb7cc8e5a7538518a2a3dbb7':
  Docs: Added efficient downloads Android U class
 2012-03-23 13:33:02 -07:00
Reto Meier
106d846080 am 20f394df: Docs: Added efficient downloads Android U class 
* commit '20f394df4db02c492d7920f4f366b777451c2067':
  Docs: Added efficient downloads Android U class
 2012-03-23 13:30:13 -07:00
Reto Meier
278296b59f am 20f394df: Docs: Added efficient downloads Android U class 
* commit '20f394df4db02c492d7920f4f366b777451c2067':
  Docs: Added efficient downloads Android U class
 2012-03-23 13:30:04 -07:00
Reto Meier
20f394df4d Docs: Added efficient downloads Android U class 
Change-Id: I2a9484c5a224a7e0688fbd9afb16246db8f3ddf9
 2012-03-23 11:32:02 -07:00
Joe Malin
528aff54f5 DOC CHANGE: IME subtype article 
Change-Id: Ie7addcc6155c275b247e15787fe226b43b0dee1a
 2012-03-23 11:04:34 -07:00
Jason Noguchi
41d88d5f58 Adding camera zoom test to mediaframework stress suite. 
Change-Id: I3ee72156f42cf189ff1d0bd469f83b938a6b87ff
 2012-03-22 17:52:03 -07:00
Andrew Hsieh
52058b4b55 am 1c4c320d: am 3347d659: am 1f9e7499: Added rules to build f/b/libs/utils in 64-bit: lib64utils.a 
* commit '1c4c320da7832129621e9e44d3f8d8902cb58462':
  Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
 2012-03-22 10:22:24 -07:00
Andrew Hsieh
1c4c320da7 am 3347d659: am 1f9e7499: Added rules to build f/b/libs/utils in 64-bit: lib64utils.a 
* commit '3347d6597bd6214f037825e41be7e58198d9079d':
  Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
 2012-03-22 10:18:59 -07:00
Andrew Hsieh
3347d6597b am 1f9e7499: Added rules to build f/b/libs/utils in 64-bit: lib64utils.a 
* commit '1f9e749914c7c636bd759da0209e68d5801407ac':
  Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
 2012-03-22 10:16:42 -07:00
Andrew Hsieh
1f9e749914 Added rules to build f/b/libs/utils in 64-bit: lib64utils.a 
It's needed to build four shared libraries in 64-bit for 64-bit
emulator with "-gpu on"
  lib64OpenglRender.so
  lib64EGL_translator.so
  lib64GLES_CM_translator.so
  lib64GLES_V2_translator.so

Change-Id: Ia6c05b23df1e9cd9e7f2e94e4cd5bde4be5d336b
 2012-03-22 09:46:46 -07:00
Joe Fernandez
34da2ffe24 am f20ebda6: am 66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)" into ics-mr1 
* commit 'f20ebda6efb711d1cda132ae89439e7aed5944f1':
 2012-03-21 16:47:34 -07:00
Joe Fernandez
5a8fb3727f am 9eea8881: am 66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)" into ics-mr1 
* commit '9eea888105b3d8d69a28e2dea840808d394f07b9':
  docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)
 2012-03-21 16:46:38 -07:00
Joe Fernandez
9eea888105 am 66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)" into ics-mr1 
* commit '66f1bafb2326e12814df703a4285373e8651a3ce':
  docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)
 2012-03-21 16:43:33 -07:00
Joe Fernandez
f20ebda6ef am 66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)" into ics-mr1 
* commit '66f1bafb2326e12814df703a4285373e8651a3ce':
  docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)
 2012-03-21 16:43:29 -07:00
Joe Fernandez
66f1bafb23 Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)" into ics-mr1 2012-03-21 16:41:19 -07:00
Joe Fernandez
1e72b34f11 docs: Android SDK r17 (RC7) Release Notes (fix for build feature info) 
Change-Id: Id10c2d5eec9f81d1c6ce52067b7e25b7f411d91c
 2012-03-21 16:25:21 -07:00
The Android Open Source Project
fcf2f4b173 am 98e1b541: Reconcile with ics-mr1-release 
* commit '98e1b541f271e92b9dc25d54e275c28102746b04':
 2012-03-21 09:06:34 -07:00
The Android Open Source Project
98e1b541f2 Reconcile with ics-mr1-release 
Change-Id: Id19190393a665dd1b07c073970925758aa383691
 2012-03-21 09:00:43 -07:00
The Android Open Source Project
a4a0946556 am 35a8f94d: Reconcile with ics-mr1-release 
* commit '35a8f94da6a8a3a6757e5663bfcbcd044f72a92a':
  Fix 5960562: Show emergency button on PukUnlock screen
 2012-03-21 08:26:56 -07:00
The Android Open Source Project
35a8f94da6 Reconcile with ics-mr1-release 
Change-Id: I10d78e60e39606f85cfa6fc7e9a7da14db0eeb0a
 2012-03-21 08:23:03 -07:00
Jim Miller
df331873c8 Fix 5960562: Show emergency button on PukUnlock screen 
This fixes an issue where the device doesn't show the emergency button
on the SIM PUK unlock screen. The problem was introduced in I3127bfd5
where we allowed the button to be conditionally shown.

Change-Id: I3e2aae2bce89399a2564c3f8a726a8db99cdec86
 2012-03-20 17:15:22 -07:00
Jim Miller
a612fad1f1 am 890266fa: am 928d3470: Fix 5960562: Show emergency button on PukUnlock screen 
* commit '890266fa5702292517774ca2aa56a410df535b28':
 2012-03-20 16:46:06 -07:00
Jim Miller
d5b5db73fc am b7a6f5d7: am 928d3470: Fix 5960562: Show emergency button on PukUnlock screen 
* commit 'b7a6f5d7e87eb4fba6d6868e73a9c06d73789517':
  Fix 5960562: Show emergency button on PukUnlock screen
 2012-03-20 16:44:43 -07:00
Jim Miller
890266fa57 am 928d3470: Fix 5960562: Show emergency button on PukUnlock screen 
* commit '928d34704b96db9133e28dc77b716518d335b356':
  Fix 5960562: Show emergency button on PukUnlock screen
 2012-03-20 16:42:20 -07:00
Jim Miller
b7a6f5d7e8 am 928d3470: Fix 5960562: Show emergency button on PukUnlock screen 
* commit '928d34704b96db9133e28dc77b716518d335b356':
  Fix 5960562: Show emergency button on PukUnlock screen
 2012-03-20 16:41:56 -07:00
Jim Miller
928d34704b Fix 5960562: Show emergency button on PukUnlock screen 
This fixes an issue where the device doesn't show the emergency button
on the SIM PUK unlock screen. The problem was introduced in I3127bfd5
where we allowed the button to be conditionally shown.

Change-Id: I3e2aae2bce89399a2564c3f8a726a8db99cdec86
 2012-03-20 15:30:43 -07:00
Eric Laurent
d58b6cd1e3 am cbc90453: am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1 
* commit 'cbc90453248bd3f9a11fdbc07e544d4a39592934':
 2012-03-19 08:38:45 -07:00
Eric Laurent
a48285c4f2 am 165ee4c5: am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1 
* commit '165ee4c53da462b1b6d131e25456dade51c18496':
  audioflinger: fix issue with camcorder and A2DP
 2012-03-19 08:37:48 -07:00
Eric Laurent
165ee4c53d am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1 
* commit '14958e21c12f922d7501d32c3bec05109eb342d5':
  audioflinger: fix issue with camcorder and A2DP
 2012-03-19 08:34:56 -07:00
Eric Laurent
cbc9045324 am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1 
* commit '14958e21c12f922d7501d32c3bec05109eb342d5':
  audioflinger: fix issue with camcorder and A2DP
 2012-03-19 08:34:44 -07:00
Eric Laurent
14958e21c1 Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1 2012-03-19 08:32:35 -07:00
Joe Fernandez
c2c444f5a8 am f9737a89: am dbab18f6: Merge "docs: Android SDK r17 (RC6) Release Notes" into ics-mr1 
* commit 'f9737a890bbaff30268c8137e6375cfa249c3f1a':
 2012-03-19 08:32:32 -07:00
Joe Fernandez
58a0ea9c2d am 9018447a: am dbab18f6: Merge "docs: Android SDK r17 (RC6) Release Notes" into ics-mr1 
* commit '9018447a10b7cfe518b4138186acd69d8fd7f31e':
  docs: Android SDK r17 (RC6) Release Notes
 2012-03-19 08:31:14 -07:00
Joe Fernandez
9018447a10 am dbab18f6: Merge "docs: Android SDK r17 (RC6) Release Notes" into ics-mr1 
* commit 'dbab18f64a1b17311a0c865ed43200e9dc239113':
  docs: Android SDK r17 (RC6) Release Notes
 2012-03-19 08:28:13 -07:00