Commit Graph

42756 Commits

Author SHA1 Message Date
John Wang
6e52b21f09 Merge "Hide emergency call text if not support it." into ics-mr1 2011-12-20 10:41:08 -08:00
Chet Haase
bedb941ad7 Merge "Fix ViewAnimator.getDisplayedChild() bug" 2011-12-20 10:37:14 -08:00
Chet Haase
032056d328 Merge "Minor small fixes to old Animation code and docs." 2011-12-20 10:36:55 -08:00
Glenn Kasten
bff9d90e36 Merge "Remove dead code" 2011-12-20 10:29:49 -08:00
Tom Taylor
ca2cecf51a Merge "Received MMS is not displayed properly with 'Avea' SIM Card" 2011-12-20 10:15:26 -08:00
Jonathan Dixon
4c29a404e5 Merge "Remove misleading API council comments" 2011-12-20 08:17:43 -08:00
Chet Haase
fd2dc0d352 Merge "Fix AnimationDrawable double-start bug" 2011-12-19 18:02:23 -08:00
Bill Gruber
6d95090b7f am c296892a: am 1d56f41c: Doc Fix: Sensors and Cameras
* commit 'c296892aa2dee5f9e0fee376a2b97a4fa06f3f88':
  Doc Fix: Sensors and Cameras
2011-12-19 17:47:21 -08:00
Bill Gruber
09058a87d2 am 1d56f41c: Doc Fix: Sensors and Cameras
* commit '1d56f41c9d1dcccf1faef343047375cb14799678':
  Doc Fix: Sensors and Cameras
2011-12-19 17:45:24 -08:00
Eric Laurent
cda4e48f18 Merge "audio effects: rename configure command" 2011-12-19 17:26:24 -08:00
Nick Pelly
47aff3da43 Merge "Rewrite NDEF parsing in Java, clean-up API." 2011-12-19 15:53:10 -08:00
Bart Sears
7764509548 Merge "Add glyphs for Vertical Text" 2011-12-18 15:38:59 -08:00
Scott Main
9aabec8f9b am 3204c523: am 8f04ae36: docs: fix sidenav typo
* commit '3204c52377ca508709cb66b24398af58ca32efdd':
  docs: fix sidenav typo
2011-12-18 14:05:23 -08:00
Scott Main
46268e72de am 8f04ae36: docs: fix sidenav typo
* commit '8f04ae361cd34fdaea41fbedefb85cff2c684e36':
  docs: fix sidenav typo
2011-12-18 14:03:30 -08:00
Chet Haase
fa9b2a5397 Merge "De-allocate caches for large glyphs when trimming memory" 2011-12-17 10:20:14 -08:00
Hong Teng
5b62d261fd Merge "Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test failed." 2011-12-16 15:17:46 -08:00
Glenn Kasten
2c569638a2 Merge "Use constants for 2 and 32" 2011-12-16 15:10:36 -08:00
Glenn Kasten
5e7392addc Merge "Extract out audio DSP code to utility library" 2011-12-16 15:02:30 -08:00
Jeff Brown
a621e426ff Merge "Fix invalid madvise() during concurrent alloc/dealloc of MemoryDealer" 2011-12-16 14:35:16 -08:00
Elliott Hughes
2f9e1a5f35 Merge "Fix the JNI documentation for ICS." 2011-12-16 14:04:51 -08:00
Chet Haase
349ea6de5b Merge "Make Property objects in View final" 2011-12-16 13:59:49 -08:00
Glenn Kasten
9acb3c2689 Merge "Use switch in AudioMixer::setParameter" 2011-12-16 13:31:33 -08:00
Scott Main
fbd0b1e217 am a2086cfc: am df440164: docs: add driver info for Hisense
* commit 'a2086cfc12b5da29190a17eb415fc881c6adb880':
  docs: add driver info for Hisense
2011-12-16 12:59:03 -08:00
Scott Main
2d1553d6bb am df440164: docs: add driver info for Hisense
* commit 'df440164ba09bcce8b409bb5a2d4a4ef8f704148':
  docs: add driver info for Hisense
2011-12-16 12:56:33 -08:00
Jeff Brown
e6967cb357 Merge "Add plumbing for dumping database info using dumpsys." 2011-12-16 12:33:54 -08:00
Jeff Brown
c68c9be294 Merge "Make SQLiteQuery and SQLiteProgram final." 2011-12-16 12:33:46 -08:00
Jeff Brown
51a4965d8b Merge "Raise default connection pool size." 2011-12-16 12:33:42 -08:00
Dianne Hackborn
578fe998d5 Merge "Don't forget to close files." 2011-12-16 12:30:25 -08:00
Joe Onorato
a1e4bdbef6 Merge "Add a new ui mode for "appliance"" 2011-12-16 12:27:03 -08:00
Roman Nurik
619dc95252 am 8cffc318: am a8001e2a: am 00697a90: docs: Add missing intent flag to Android U nav class
* commit '8cffc31810a7645c70183cfb0b43c8b78a299918':
  docs: Add missing intent flag to Android U nav class
2011-12-16 12:09:51 -08:00
Roman Nurik
8f75161dbf am a8001e2a: am 00697a90: docs: Add missing intent flag to Android U nav class
* commit 'a8001e2ae908c413b626a82f5ab925f18559509c':
  docs: Add missing intent flag to Android U nav class
2011-12-16 12:07:27 -08:00
Roman Nurik
a4c0530828 am 00697a90: docs: Add missing intent flag to Android U nav class
* commit '00697a90bec4e0536cfa0873602b64bb6785022e':
  docs: Add missing intent flag to Android U nav class
2011-12-16 12:05:32 -08:00
The Android Automerger
ad6e29040c merge in ics-mr1-release history after reset to ics-mr1 2011-12-16 12:01:35 -08:00
Justin Ho
01da3368d8 am 9edb26ea: am 043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1
* commit '9edb26ea551bec24fa417a854ecec3801f15dc1d':
  Cherry-picking Id45abeba and Ia065dec6 for MR1
2011-12-16 11:56:19 -08:00
Jeff Sharkey
d79cad7814 Merge "Include roaming in NetworkIdentity.hashCode()." 2011-12-16 11:56:06 -08:00
Justin Ho
65cd774f30 am 043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1
* commit '043c5f8f1d9a8e9077e1c16af28509b30f00324d':
  Cherry-picking Id45abeba and Ia065dec6 for MR1
2011-12-16 11:54:01 -08:00
Justin Ho
fe7a2124ae Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1 2011-12-16 11:52:08 -08:00
Alexander Lucas
60d511ddfa am f5ed1d4c: am 6469ee80: Merge "Fixed table labelling issues in \'Multiple Dimensions\' multiple apk lesson" into ics-mr1
* commit 'f5ed1d4c553de5d5e1fa1f8df52e6a2bba3ceb2e':
  Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson
2011-12-16 11:41:45 -08:00
Alexander Lucas
678a2adf1a am 6469ee80: Merge "Fixed table labelling issues in \'Multiple Dimensions\' multiple apk lesson" into ics-mr1
* commit '6469ee8016d1e02673e05356b2590d3175dcd062':
  Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson
2011-12-16 11:39:40 -08:00
Alexander Lucas
a02222af29 Merge "Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson" into ics-mr1 2011-12-16 11:38:05 -08:00
Scott Main
c55beb73f9 am 5e7bed0b: am 0f52d766: Merge "docs: fix whitespace in sidenav" into ics-mr1
* commit '5e7bed0b2a16c91d90bd274b4fdfe7c6718f11c2':
  docs: fix whitespace in sidenav
2011-12-16 11:34:19 -08:00
Scott Main
784d3ca78c am 0f52d766: Merge "docs: fix whitespace in sidenav" into ics-mr1
* commit '0f52d7666e83a7aa1979d65820ece865c7e1fd08':
  docs: fix whitespace in sidenav
2011-12-16 11:32:24 -08:00
Scott Main
c144f4e74a Merge "docs: fix whitespace in sidenav" into ics-mr1 2011-12-16 11:30:00 -08:00
Roman Nurik
02c26c2cf8 am 1410f8a2: am 795c271f: am eb946fbd: Merge "docs: Minor link fix in Android U class" into ics-mr0
* commit '1410f8a2a58beacc84f9e5444af6032f92ef6845':
  docs: Minor link fix in Android U class
2011-12-16 11:27:02 -08:00
Roman Nurik
b260344f6c am 795c271f: am eb946fbd: Merge "docs: Minor link fix in Android U class" into ics-mr0
* commit '795c271f448704561cd1312dd51826dca82f392f':
  docs: Minor link fix in Android U class
2011-12-16 11:25:02 -08:00
Roman Nurik
487f720b2b am eb946fbd: Merge "docs: Minor link fix in Android U class" into ics-mr0
* commit 'eb946fbdc800d56e1cbac515a1c73de806e74711':
  docs: Minor link fix in Android U class
2011-12-16 11:23:27 -08:00
Roman Nurik
ff2cb33d88 Merge "docs: Minor link fix in Android U class" into ics-mr0 2011-12-16 11:21:59 -08:00
Bill Gruber
5cdb6c0507 am 590ba7a4: am e2a95b59: am 97aafdf4: Merge "Dev guide for sensors" into ics-mr0
* commit '590ba7a4f03717ebe3171499637e3964c5860c8a':
  Dev guide for sensors
2011-12-16 11:17:49 -08:00
Bill Gruber
f92eadf431 am e2a95b59: am 97aafdf4: Merge "Dev guide for sensors" into ics-mr0
* commit 'e2a95b59f554d1d60b7e6c27d870158ec7051e31':
  Dev guide for sensors
2011-12-16 11:15:46 -08:00
Bill Gruber
bef088b1c4 am 97aafdf4: Merge "Dev guide for sensors" into ics-mr0
* commit '97aafdf46e5007fa7b3f6eae4e54d692877ad824':
  Dev guide for sensors
2011-12-16 11:13:13 -08:00