Commit Graph

9023 Commits

Author SHA1 Message Date
Siva Velusamy
fd4a73989f Fix # of arguments to startActivity
Change-Id: I01daa8efe56d6a8ba0d35f63290d50281d4723eb
2012-03-09 14:35:44 -08:00
Ying Wang
438a4112b3 Merge "Add framework/native to fix build." 2012-03-09 10:22:13 -08:00
Ying Wang
06f3f54fc0 Add framework/native to fix build.
No framework/native is split out from framework/base.

Change-Id: I3b596a98feee01f433fa0e88d81d780315a3ebb8
2012-03-09 10:04:22 -08:00
Ed Heyl
35c941e726 Merge "Minor makefile tweak to compile with elfutils-0.138" 2012-03-09 09:48:10 -08:00
Mathias Agopian
d069948a49 update Eclipse include paths
Change-Id: Ia73ff3cc256ac0daaf3095441f595e271bc6c44e
2012-03-08 21:05:49 -08:00
Mathias Agopian
cc3332aac7 remove dependency on apparently uneeded libs. might fix sdk build
Change-Id: I78cb49456ccf8bc6df3ebdd76ae63e0b0b6d7e4b
2012-03-08 21:02:36 -08:00
Ben Cheng
e35bfe51a1 Minor makefile tweak to compile with elfutils-0.138
Explicitly specify that this module is only built on linux-x86 and
darwin-x86

Change-Id: I2dba02b25c655af114417fc222a697e4d5294602
2012-03-08 16:14:35 -08:00
Megha Joshi
b1a2cd42eb am 4b46b075: am ca2728fe: am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1
* commit '4b46b0756f1a296f2e14c5ae8d6c701ef5cbf51e':
2012-03-08 12:29:13 -08:00
Megha Joshi
7abd0794f4 am 8288333b: am 3174fec7: am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1
* commit '8288333b0a7d7741631066d11e65dd01d43c9a77':
  Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well.
2012-03-08 12:26:38 -08:00
Megha Joshi
4b46b0756f am ca2728fe: am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1
* commit 'ca2728fe1f4a2592d5cb780ccf8cc756494a8752':
2012-03-08 12:25:32 -08:00
Megha Joshi
8288333b0a am 3174fec7: am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1
* commit '3174fec75f73b92fdaac2958e3cf0c4b6be6a562':
  Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well.
2012-03-08 12:24:14 -08:00
Megha Joshi
ca2728fe1f am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1
* commit '27a6a0f0a5dc74886a7f0c42d6300a2cb92f6da2':
  Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well.
2012-03-08 12:22:03 -08:00
Megha Joshi
3174fec75f am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1
* commit '27a6a0f0a5dc74886a7f0c42d6300a2cb92f6da2':
  Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well.
2012-03-08 12:21:52 -08:00
Megha Joshi
27a6a0f0a5 Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1 2012-03-08 12:20:00 -08:00
Derek Sollenberger
a96af3f6f8 am 3565ea1a: am 89e98da5: am a848b972: am 89b7a104: Merge "Add missing includes for threads.h"
* commit '3565ea1a6ecccc59839d883ee74fc4ba83f4ab02':
  Add missing includes for threads.h
2012-03-08 11:34:13 -08:00
Derek Sollenberger
3565ea1a6e am 89e98da5: am a848b972: am 89b7a104: Merge "Add missing includes for threads.h"
* commit '89e98da5ac2596bd532bd6209ee3bda5a3842577':
  Add missing includes for threads.h
2012-03-08 11:32:04 -08:00
Derek Sollenberger
89e98da5ac am a848b972: am 89b7a104: Merge "Add missing includes for threads.h"
* commit 'a848b97255a15d2ac75db1e367cc60ff46b77e20':
  Add missing includes for threads.h
2012-03-08 11:30:09 -08:00
Derek Sollenberger
a848b97255 am 89b7a104: Merge "Add missing includes for threads.h"
* commit '89b7a104d41c1ecbc1319a3d47199d40d56ebc96':
  Add missing includes for threads.h
2012-03-08 11:28:31 -08:00
Derek Sollenberger
89b7a104d4 Merge "Add missing includes for threads.h" 2012-03-08 08:46:53 -08:00
Xavier Ducrohet
45678a32d4 am e3f5f497: (-s ours) am 83bf8d16: am 88d97250: Prepare for doc package update in rev 2. do not merge.
* commit 'e3f5f497b240f90bf3455e031dc5cc230d12fcd2':
2012-03-08 08:08:50 -08:00
Xavier Ducrohet
be3a667619 am abcaa390: (-s ours) am 624c4870: am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge
* commit 'abcaa39070a6d02ccdaceae11b856545df959a23':
2012-03-08 08:08:49 -08:00
Xavier Ducrohet
42b46a0044 am 3a499b0f: (-s ours) am 8438213c: am 88d97250: Prepare for doc package update in rev 2. do not merge.
* commit '3a499b0fede7508c09dcedb16ea35ede3ade5d03':
  Prepare for doc package update in rev 2. do not merge.
2012-03-08 08:08:48 -08:00
Xavier Ducrohet
e18f7959dc am 1754063f: (-s ours) am 198705d1: am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge
* commit '1754063ff021083adeed4c446f6df285cb018e06':
  Add a prebuilt of the gridlayout support library. do not merge
2012-03-08 08:08:48 -08:00
Xavier Ducrohet
e3f5f497b2 am 83bf8d16: am 88d97250: Prepare for doc package update in rev 2. do not merge.
* commit '83bf8d1673800954c8e7bb474a6a6b4519d33745':
2012-03-07 20:10:30 -08:00
Xavier Ducrohet
abcaa39070 am 624c4870: am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge
* commit '624c487060ff8b20992a738bd8d6ff04ef247fa3':
2012-03-07 20:10:29 -08:00
Xavier Ducrohet
3a499b0fed am 8438213c: am 88d97250: Prepare for doc package update in rev 2. do not merge.
* commit '8438213c2fc9aff20c3244dca5a1b30fadcb5785':
  Prepare for doc package update in rev 2. do not merge.
2012-03-07 20:09:33 -08:00
Xavier Ducrohet
1754063ff0 am 198705d1: am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge
* commit '198705d1ab7f818b146c0c6e0d85f80e4b658e06':
  Add a prebuilt of the gridlayout support library. do not merge
2012-03-07 20:09:32 -08:00
Xavier Ducrohet
8438213c2f am 88d97250: Prepare for doc package update in rev 2. do not merge.
* commit '88d972501ae16197ebabb2f053a69856bca410d9':
  Prepare for doc package update in rev 2. do not merge.
2012-03-07 20:07:39 -08:00
Xavier Ducrohet
198705d1ab am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge
* commit '92b3b05096e23b7ce2b4b841044d518a379ada5d':
  Add a prebuilt of the gridlayout support library. do not merge
2012-03-07 20:07:38 -08:00
Xavier Ducrohet
83bf8d1673 am 88d97250: Prepare for doc package update in rev 2. do not merge.
* commit '88d972501ae16197ebabb2f053a69856bca410d9':
  Prepare for doc package update in rev 2. do not merge.
2012-03-07 20:07:09 -08:00
Xavier Ducrohet
624c487060 am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge
* commit '92b3b05096e23b7ce2b4b841044d518a379ada5d':
  Add a prebuilt of the gridlayout support library. do not merge
2012-03-07 20:07:08 -08:00
Xavier Ducrohet
88d972501a Prepare for doc package update in rev 2. do not merge.
Change-Id: Ibd1e7b8cd25aed33f4f6abe86ed36ccf30d4c714
2012-03-07 17:52:21 -08:00
Xavier Ducrohet
92b3b05096 Add a prebuilt of the gridlayout support library. do not merge
Change-Id: Icd43238672a02f84e37d4301bec34dbe48375200
2012-03-07 17:47:12 -08:00
Jesse Hall
43a5b2b538 am 1beba231: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/development into ics-scoop-plus-aosp
* commit '1beba23120a914aa02aa18569de0c06818bf5d09':
2012-03-07 17:22:11 -08:00
Jesse Hall
e6ab388b7d am de9127c6: am cbd446a9: am 9322c5cb: Work around a y-invert bug on Macs w/ Intel GPU
* commit 'de9127c6b37bcc40c5d60a1b8b8588847ec986d1':
  Work around a y-invert bug on Macs w/ Intel GPU
2012-03-07 17:22:10 -08:00
Jesse Hall
e4e4e59883 am 1d6ccdfa: am 1f4f50c7: am 767d0894: Delete dead code.
* commit '1d6ccdfacbecd977c038817b6cfff3a7f9e45c01':
  Delete dead code.
2012-03-07 17:22:09 -08:00
Dirk Dougherty
722e3231fb am 3c7dc0f4: am 3007c3f5: am 9ba4ba70: Doc change: string changes for Google Play
* commit '3c7dc0f4053abe5cdf8098d92f9beb22cc6f9bee':
2012-03-07 16:48:23 -08:00
Dirk Dougherty
1d7bba6b6f resolved conflicts for merge of b7c3c566 to master
Change-Id: Ibd84692dc7f851b4389427ec2b504c4201e221b3
2012-03-07 16:44:43 -08:00
Megha Joshi
52b557155b Adding values-large-land and values-large-port folders.
This is so that I can replace xlarge with large in
training/multiscreen/screensizes.html for it to be compatible with TVs as well.

Change-Id: I7685f4c51dc01ac76c98318d3ee48c73402bf848
2012-03-07 16:04:24 -08:00
Raphael Moll
482423c8a9 Merge "SDK repo: fix to handle new and old xsd for support lib" 2012-03-07 15:04:14 -08:00
Jesse Hall
1beba23120 Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/development into ics-scoop-plus-aosp 2012-03-07 11:20:07 -08:00
Jesse Hall
de9127c6b3 am cbd446a9: am 9322c5cb: Work around a y-invert bug on Macs w/ Intel GPU
* commit 'cbd446a98ad24ca03a845dfa24cbe4db3f297147':
  Work around a y-invert bug on Macs w/ Intel GPU
2012-03-07 11:19:59 -08:00
Jesse Hall
8b40621965 am ca2d0d1e: am 9322c5cb: Work around a y-invert bug on Macs w/ Intel GPU
* commit 'ca2d0d1e8d883d5b2ee0bd78a1dc95c54ce3c642':
  Work around a y-invert bug on Macs w/ Intel GPU
2012-03-07 11:19:59 -08:00
Jesse Hall
1d6ccdfacb am 1f4f50c7: am 767d0894: Delete dead code.
* commit '1f4f50c7d25cd9b95aec869aa57638703b44d4ec':
  Delete dead code.
2012-03-07 11:19:58 -08:00
Jesse Hall
57a6651c5a am f1ba5cf2: am 767d0894: Delete dead code.
* commit 'f1ba5cf21d7da576f80fdbbf6431a65fcd6a198f':
  Delete dead code.
2012-03-07 11:19:58 -08:00
Jesse Hall
cbd446a98a am 9322c5cb: Work around a y-invert bug on Macs w/ Intel GPU
* commit '9322c5cb2524c4f35408768ee3d1b8030f0360f9':
  Work around a y-invert bug on Macs w/ Intel GPU
2012-03-07 11:17:46 -08:00
Jesse Hall
1f4f50c7d2 am 767d0894: Delete dead code.
* commit '767d08948790527e9df951a752703938ff517d30':
  Delete dead code.
2012-03-07 11:17:45 -08:00
Jesse Hall
ca2d0d1e8d am 9322c5cb: Work around a y-invert bug on Macs w/ Intel GPU
* commit '9322c5cb2524c4f35408768ee3d1b8030f0360f9':
  Work around a y-invert bug on Macs w/ Intel GPU
2012-03-07 11:16:58 -08:00
Jesse Hall
f1ba5cf21d am 767d0894: Delete dead code.
* commit '767d08948790527e9df951a752703938ff517d30':
  Delete dead code.
2012-03-07 11:16:56 -08:00
Jesse Hall
9322c5cb25 Work around a y-invert bug on Macs w/ Intel GPU
On Macs running OS X 10.6 and 10.7 with Intel HD Graphics 3000, some
screens or parts of the screen are displayed upside down. The exact
conditions/sequence that triggers this aren't known yet; I haven't
been able to reproduce it in a standalone test. This also means I
don't know whether it is a driver bug, or a bug in the OpenglRender or
Translator code that just happens to work elsewhere.

Thanks to zhiyuan.li@intel.com for a patch this change is based on.

Change-Id: I04823773818d3b587a6951be48e70b03804b33d0
2012-03-07 10:06:57 -08:00