Commit Graph

2149 Commits

Author SHA1 Message Date
Dianne Hackborn 472e07c8f4 am cc45ee9c: On to Kraken... 2010-04-15 16:59:38 -07:00
Dianne Hackborn cc45ee9c3c On to Kraken...
Change-Id: Ib5f57d8095a0e88fdbbc933ccb2ea0c6d83010ae
2010-04-15 14:06:28 -07:00
Brian Carlstrom 67a9131270 Merge "Fix get_abs_build_var to work from below $ANDROID_BUILD_TOP" 2010-04-15 13:08:09 -07:00
Wu-cheng Li 05a119ea27 am d31ae2fc: am 8b687440: am fcc7cf77: Fix the check of double quoted @see tag. 2010-04-13 16:22:33 -07:00
Dan Morrill 6d30b72be1 Removing unnecessary tabs, and fixing an IE bug.
Change-Id: I055243ebd47c9319333aa837061015650d57d923
2010-04-13 14:51:28 -07:00
Wu-cheng Li d31ae2fc73 am 8b687440: am fcc7cf77: Fix the check of double quoted @see tag.
Merge commit '8b687440688ac41d6b6754537bf4a0f9dcb14fbd' into kraken

* commit '8b687440688ac41d6b6754537bf4a0f9dcb14fbd':
  Fix the check of double quoted @see tag.
2010-04-13 11:53:15 -07:00
Wu-cheng Li 8b68744068 am fcc7cf77: Fix the check of double quoted @see tag.
Merge commit 'fcc7cf779905613d6bd48344b5c3a994237c02bd' into froyo-plus-aosp

* commit 'fcc7cf779905613d6bd48344b5c3a994237c02bd':
  Fix the check of double quoted @see tag.
2010-04-13 09:20:18 -07:00
Wu-cheng Li fcc7cf7799 Fix the check of double quoted @see tag.
Originally \n was not discarded so a balanced quoted string still
has compile error.

bug:2553570
Change-Id: I073c0c0ba370d55493d3ee6d17c7ebe9f42afe7a
2010-04-13 23:49:18 +08:00
Scott Main d9ec1f1c5d am 52e67ac2: am db00a567: am 479f4a5c: Merge "cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444 docs: various stylesheet changes indent tables revise figure class add caption classes for tables and images add styles for xml reference docs (used by res 2010-04-10 11:56:33 -07:00
Scott Main 52e67ac24e am db00a567: am 479f4a5c: Merge "cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444 docs: various stylesheet changes indent tables revise figure class add caption classes for tables and images add styles for xml reference docs (used by resource types d
Merge commit 'db00a567759a6785c97a21fd3fbc1e6b792df4c7' into kraken

* commit 'db00a567759a6785c97a21fd3fbc1e6b792df4c7':
  cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444
2010-04-10 11:46:50 -07:00
Scott Main db00a56775 am 479f4a5c: Merge "cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444 docs: various stylesheet changes indent tables revise figure class add caption classes for tables and images add styles for xml reference docs (used by resource types docs) tweak st
Merge commit '479f4a5cc4db72024123d36145028fe557e72f98' into froyo-plus-aosp

* commit '479f4a5cc4db72024123d36145028fe557e72f98':
  cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444
2010-04-10 11:40:08 -07:00
Scott Main 479f4a5cc4 Merge "cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444 docs: various stylesheet changes indent tables revise figure class add caption classes for tables and images add styles for xml reference docs (used by resource types docs) tweak styles for the icon tables to eliminate obscure 'caption' class" into froyo 2010-04-09 17:03:42 -07:00
Xavier Ducrohet 8797d5333b am b15c119d: am 19e9fff3: am 74134a50: Add camera sounds to the emulator system image build. 2010-04-09 08:52:54 -07:00
Jean-Baptiste Queru ff59a5a60f resolved conflicts for merge of 693e6555 to master
Change-Id: I968f5cf82764562ce5a0b61408b8d290d4027aac
2010-04-09 08:49:11 -07:00
Xavier Ducrohet b15c119d26 am 19e9fff3: am 74134a50: Add camera sounds to the emulator system image build.
Merge commit '19e9fff37e4d3309557d07cf963dc577ca49fcf0' into kraken

* commit '19e9fff37e4d3309557d07cf963dc577ca49fcf0':
  Add camera sounds to the emulator system image build.
2010-04-08 22:50:33 -07:00
Xavier Ducrohet 19e9fff37e am 74134a50: Add camera sounds to the emulator system image build.
Merge commit '74134a503fc908b28ad0ff87e1291698fbceb9cf' into froyo-plus-aosp

* commit '74134a503fc908b28ad0ff87e1291698fbceb9cf':
  Add camera sounds to the emulator system image build.
2010-04-08 22:38:52 -07:00
Xavier Ducrohet 74134a503f Add camera sounds to the emulator system image build.
Bug: 2538315

Change-Id: I30c477ecbe5f0c0a64ca7c3796e72642df0002bf
2010-04-08 18:07:40 -07:00
Scott Main 7b6cee7653 cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444
docs: various stylesheet changes
indent tables
revise figure class
add caption classes for tables and images
add styles for xml reference docs (used by resource types docs)
tweak styles for the icon tables to eliminate obscure 'caption' class

Change-Id: I23f53d884f39a5f6a4b45172186e0d1c7619da30
2010-04-08 17:32:02 -07:00
Daniel Sandler 693e655513 am 83f002f7: am f96cb307: Merge "Add Protips to all builds." into froyo
Merge commit '83f002f758a54fbb7b690a3d0432cc911353eb18' into kraken

* commit '83f002f758a54fbb7b690a3d0432cc911353eb18':
  Add Protips to all builds.
2010-04-08 17:05:02 -07:00
Daniel Sandler 83f002f758 am f96cb307: Merge "Add Protips to all builds." into froyo
Merge commit 'f96cb307e3c6d0eb08fd3e4a17d1d1af7c46d385' into froyo-plus-aosp

* commit 'f96cb307e3c6d0eb08fd3e4a17d1d1af7c46d385':
  Add Protips to all builds.
2010-04-08 16:59:27 -07:00
Daniel Sandler f96cb307e3 Merge "Add Protips to all builds." into froyo 2010-04-08 16:54:50 -07:00
Jesse Wilson 5a32cee203 Merge "Fixing apicheck to cope with interfaces inherited from other interfaces." 2010-04-08 11:20:40 -07:00
Jesse Wilson 32fd763272 Fixing apicheck to cope with interfaces inherited from other interfaces.
For example, in Java 5, FutureTask was declared like this:
    public class FutureTask<V> implements Runnable, Future<V> {}

In Java 6, it's declared like this:
    public class FutureTask<V> implements RunnableFuture<V> {}
    public interface RunnableFuture extends Runnable, Future<V> {}

Change-Id: I0cd66a655fbe7fd5c7c48099d656b7a39368dac4
2010-04-08 09:44:42 -07:00
Dianne Hackborn 7d25429b67 am f2a1c24d: am 966c7355: am 303b3412: Add clean step for SDK version change. 2010-04-07 14:38:15 -07:00
Dianne Hackborn f2a1c24dd1 am 966c7355: am 303b3412: Add clean step for SDK version change.
Merge commit '966c7355c3705095532bcc71ae6d893bdbe3531d' into kraken

* commit '966c7355c3705095532bcc71ae6d893bdbe3531d':
  Add clean step for SDK version change.
2010-04-07 14:31:10 -07:00
Dianne Hackborn 966c7355c3 am 303b3412: Add clean step for SDK version change.
Merge commit '303b34121e0d331570bcb156b03251cca93a5631' into froyo-plus-aosp

* commit '303b34121e0d331570bcb156b03251cca93a5631':
  Add clean step for SDK version change.
2010-04-07 14:26:06 -07:00
Dianne Hackborn 303b34121e Add clean step for SDK version change.
Change-Id: I2ea85496af49572115dbbd9a98787b1fd54adc50
2010-04-07 14:13:47 -07:00
Daniel Sandler a63b57c0cf Add Protips to all builds.
Bug: 2559083
Change-Id: Ibd6333516a798f88e4d4ef08a6246812b1009a76
2010-04-07 16:49:07 -04:00
Shih-wei Liao 5702120438 Merge "Add libbcc.so" 2010-04-07 12:26:16 -07:00
Joe Onorato 93d20ad420 am e0a18a75: Finish moving the policies out of frameworks/policies/base and into frameworks/base. 2010-04-06 23:47:45 -07:00
Joe Onorato e0a18a75a9 Finish moving the policies out of frameworks/policies/base and into frameworks/base.
Change-Id: I6b3991de3276258318cab2aff9651f18b3d07f85
2010-04-06 20:21:29 -05:00
Scott Main c2c53783d0 Merge "docs: various stylesheet changes indent tables revise figure class add caption classes for tables and images add styles for xml reference docs (used by resource types docs) tweak styles for the icon tables to eliminate obscure 'caption' class" 2010-04-06 15:02:11 -07:00
Brian Carlstrom 177285a31e Fix get_abs_build_var to work from below $ANDROID_BUILD_TOP
I tried running gdbclient from a subdirectory of $ANDROID_BUILD_TOP
and found that the absolute paths generated by get_abs_build_var
included my subdirectory's path. This fixed get_abs_build_var to
changing directory in a subshell to $ANDROID_BUILD_TOP before invoking
make.

Change-Id: I12b9d9135ac7c044c21c88ed5705b22b0700c039
2010-04-06 13:22:02 -07:00
Dianne Hackborn da16574ab9 am a98976b7: am efba0b98: It\'s beginning to look a lot like release time! 2010-04-06 13:11:49 -07:00
Dianne Hackborn a98976b7c9 am efba0b98: It\'s beginning to look a lot like release time!
Merge commit 'efba0b9829ae375a7d7e2093dee707b79f1b8951' into froyo-plus-aosp

* commit 'efba0b9829ae375a7d7e2093dee707b79f1b8951':
  It's beginning to look a lot like release time!
2010-04-06 12:58:50 -07:00
Dianne Hackborn efba0b9829 It's beginning to look a lot like release time!
Everywhere we build...

Froyo is now Android 2.2, API 8.

This breaks the YouTube prebuilt (yay prebuilts!) but little else.
Does this mean we are becoming mature?

Change-Id: I15d228d57853a0dfabc47dda253d55339a5b3d17
2010-04-05 12:33:11 -07:00
Jean-Baptiste Queru 4cdeb39d07 am 43e31a20: Add extra IMEs in the full config 2010-04-05 12:07:00 -07:00
Jean-Baptiste Queru 43e31a2056 Add extra IMEs in the full config
Bug: 2556582
Change-Id: I46de0d6d7755b169acaa7689de4ddadb0df9c41f
2010-04-05 11:40:20 -07:00
Xavier Ducrohet c90f5d7356 am 3c9c36b7: am 47c4bbe9: Package the proper vold config file in SDK system image. 2010-04-01 23:47:40 -07:00
Xavier Ducrohet 3c9c36b70d am 47c4bbe9: Package the proper vold config file in SDK system image.
Merge commit '47c4bbe9ebdf58a0f1b3fe2ecd979a341ee072d2' into froyo-plus-aosp

* commit '47c4bbe9ebdf58a0f1b3fe2ecd979a341ee072d2':
  Package the proper vold config file in SDK system image.
2010-04-01 17:43:12 -07:00
Ying Wang f663ff4f13 Add generic makefiles.
Change-Id: I6598e87606fc8ce26e34eedb5975a58e0c152982
2010-04-01 13:37:59 -07:00
Xavier Ducrohet 47c4bbe9eb Package the proper vold config file in SDK system image.
Change-Id: I7698c76d8d704837106450a32cba7b9c8f5b4446
2010-04-01 13:20:21 -07:00
Xavier Ducrohet 266bdf2ec3 am 04fd11d1: Merge "Add CarHome to the SDK." into froyo
Merge commit '04fd11d11246e419473f38bdddf31329182ae0a6' into froyo-plus-aosp

* commit '04fd11d11246e419473f38bdddf31329182ae0a6':
  Add CarHome to the SDK.
2010-04-01 10:56:35 -07:00
Xavier Ducrohet 04fd11d112 Merge "Add CarHome to the SDK." into froyo 2010-04-01 10:50:01 -07:00
Ying Wang 434f0092d3 am 139e3324: Add symbols.zip and build.prop to sdk dist.
Merge commit '139e33243bbe92858f39919c220a4d65fe8790bd' into froyo-plus-aosp

* commit '139e33243bbe92858f39919c220a4d65fe8790bd':
  Add symbols.zip and build.prop to sdk dist.
2010-03-31 23:17:45 -07:00
Ying Wang 139e33243b Add symbols.zip and build.prop to sdk dist.
Change-Id: I667f5ef847a6e8e78c6b3df5c2b092bb5d863955
http://b/issue?id=2394164
2010-03-31 17:29:04 -07:00
Scott Main c715e05b08 docs: various stylesheet changes
indent tables
revise figure class
add caption classes for tables and images
add styles for xml reference docs (used by resource types docs)
tweak styles for the icon tables to eliminate obscure 'caption' class

Change-Id: I615602a3d8f9970e36399b98dadb5e2f03638444
2010-03-31 15:01:47 -07:00
The Android Open Source Project 8b32022eae merge from open-source master
Change-Id: Ic4d166897b594c4d5552a2bb1a89ed368cf2b782
2010-03-31 14:00:21 -07:00
Ying Wang 6714dbc236 Add comments for ANDROID_BUILD_SHELL
Change-Id: I71f0a1a08b097cd179bbcb684a9114267f9bf0db
2010-03-30 16:42:15 -07:00
Ying Wang 2ce495a0a7 Allow use of alternative to bash as the build shell.
Change-Id: Ib92217f90c98e04a1d16efd4904d9d7ba9dda3cf
http://b/issue?id=2557214
2010-03-30 12:55:13 -07:00