StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,485 Commits 1 Branch 0 Tags
c63a2b36d74dadb51a9cdcc71ad470111ebe3f02
Commit Graph

8167 Commits

Author SHA1 Message Date
Scott Main
a5a849aee7 am b66f9b3e: am 9958256b: am 1da82386: docs only. use normal DOM mod instead of jquery to load the lists.js file because jquery was appending GET parameters that eliminated any caching of the file. 
Merge commit 'b66f9b3e367c4f15eeab7a54cd8d5331f3787b1e'

* commit 'b66f9b3e367c4f15eeab7a54cd8d5331f3787b1e':
  docs only.
 2009-09-17 12:45:36 -07:00
Scott Main
b66f9b3e36 am 9958256b: am 1da82386: docs only. use normal DOM mod instead of jquery to load the lists.js file because jquery was appending GET parameters that eliminated any caching of the file. 
Merge commit '9958256b202e5ad5554bf91d4d77655662b31d5b' into eclair-plus-aosp

* commit '9958256b202e5ad5554bf91d4d77655662b31d5b':
  docs only.
 2009-09-17 12:36:03 -07:00
Scott Main
9958256b20 am 1da82386: docs only. use normal DOM mod instead of jquery to load the lists.js file because jquery was appending GET parameters that eliminated any caching of the file. 
Merge commit '1da823869ccbc5f848cdd35d52d1630886288446' into eclair

* commit '1da823869ccbc5f848cdd35d52d1630886288446':
  docs only.
 2009-09-17 12:29:05 -07:00
Scott Main
1da823869c docs only. 
use normal DOM mod instead of jquery to load the lists.js
file because jquery was appending GET parameters that
eliminated any caching of the file.

Change-Id: I926ef8c164ba81d040256accaf78883807c3b57e
 2009-09-17 10:54:05 -07:00
Dirk Dougherty
107662f637 am f2ffc366: am 60bbe187: am c66c90a8: Change sdk doc template so that ADT download link bypasses clickthrough. 
Merge commit 'f2ffc36648c5660846f8e8c173644e0b6b4e0288'

* commit 'f2ffc36648c5660846f8e8c173644e0b6b4e0288':
  Change sdk doc template so that ADT download link bypasses clickthrough.
 2009-09-17 09:57:12 -07:00
Mike Ritter
2f37944a4a am 31d00206: am e44fadeb: Bug in Mac build where it gets confused over case, fix no longer needed. 
Merge commit '31d002062e3735767401a26728e8bd5807095532'

* commit '31d002062e3735767401a26728e8bd5807095532':
  Bug in Mac build where it gets confused over case, fix no longer needed.
 2009-09-17 06:38:46 -07:00
Dirk Dougherty
f2ffc36648 am 60bbe187: am c66c90a8: Change sdk doc template so that ADT download link bypasses clickthrough. 
Merge commit '60bbe187da1e0b5aa753c3611e81cbb61f886599' into eclair-plus-aosp

* commit '60bbe187da1e0b5aa753c3611e81cbb61f886599':
  Change sdk doc template so that ADT download link bypasses clickthrough.
 2009-09-16 11:30:41 -07:00
Dirk Dougherty
60bbe187da am c66c90a8: Change sdk doc template so that ADT download link bypasses clickthrough. 
Merge commit 'c66c90a803ef256b5f945d10bd0ddd5abae15d64' into eclair

* commit 'c66c90a803ef256b5f945d10bd0ddd5abae15d64':
  Change sdk doc template so that ADT download link bypasses clickthrough.
 2009-09-16 11:23:08 -07:00
Dirk Dougherty
c66c90a803 Change sdk doc template so that ADT download link bypasses clickthrough. 
Change-Id: Ibea052b718f17043c992af7d5334b1c7e4fe2c6b
 2009-09-16 10:11:01 -07:00
Mike Ritter
31d002062e am e44fadeb: Bug in Mac build where it gets confused over case, fix no longer needed. 
Merge commit 'e44fadeb49aac9d762f089ee2f23e4a4907a822f' into eclair-plus-aosp

* commit 'e44fadeb49aac9d762f089ee2f23e4a4907a822f':
  Bug in Mac build where it gets confused over case, fix no longer needed.
 2009-09-15 13:45:42 -07:00
Xavier Ducrohet
c10001ea56 am 2f7cfd2a: am be49598e: Merge change 24712 into eclair 
Merge commit '2f7cfd2a52d7ea17f08874f84eb2240854978e97'

* commit '2f7cfd2a52d7ea17f08874f84eb2240854978e97':
  Fix CS templates to handle non-included classes.
 2009-09-15 13:16:12 -07:00
Scott Main
352e8d79b9 am 40a65ab4: am 5175caf6: am ded57160: docs only. new donut image for compatibility with IE6 transparency issues 
Merge commit '40a65ab4e6b71ad266bb29eb129283d6d709b7e9'

* commit '40a65ab4e6b71ad266bb29eb129283d6d709b7e9':
  docs only.
 2009-09-15 13:14:16 -07:00
Mike Ritter
e44fadeb49 Bug in Mac build where it gets confused over case, fix no longer needed. 2009-09-15 11:18:31 -07:00
Xavier Ducrohet
2f7cfd2a52 am be49598e: Merge change 24712 into eclair 
Merge commit 'be49598e2d7609e50eadd0dcba2190c01265c0a9' into eclair-plus-aosp

* commit 'be49598e2d7609e50eadd0dcba2190c01265c0a9':
  Fix CS templates to handle non-included classes.
 2009-09-11 12:06:49 -07:00
Android (Google) Code Review
be49598e2d Merge change 24712 into eclair 
* changes:
  Fix CS templates to handle non-included classes.
 2009-09-11 14:58:54 -04:00
Xavier Ducrohet
63ec8e3b58 Fix CS templates to handle non-included classes. 
This fix is to handle generate documentation not including base clases
(like java.* or android.*). Links to missing base classes must not be
created or they would point nowhere.

Change-Id: Ic591916fe9b6802903d894bd2cd3c45690533912
 2009-09-11 11:14:00 -07:00
Scott Main
40a65ab4e6 am 5175caf6: am ded57160: docs only. new donut image for compatibility with IE6 transparency issues 
Merge commit '5175caf6eaab1b22c4cc1f352f22cd69d291a68e' into eclair-plus-aosp

* commit '5175caf6eaab1b22c4cc1f352f22cd69d291a68e':
  docs only.
 2009-09-11 10:58:58 -07:00
Scott Main
5175caf6ea am ded57160: docs only. new donut image for compatibility with IE6 transparency issues 
Merge commit 'ded57160b406d5b253206cf5884ab9b33ac23b3c' into eclair

* commit 'ded57160b406d5b253206cf5884ab9b33ac23b3c':
  docs only.
 2009-09-11 10:49:26 -07:00
Scott Main
ded57160b4 docs only. 
new donut image for compatibility with IE6 transparency issues

Change-Id: I444b09d7c5b211b3a07e7221ad96b3a7e4d989f7
 2009-09-11 10:31:36 -07:00
Xavier Ducrohet
a4faa18b6f am 030df428: am 85762123: Merge change 24584 into eclair 
Merge commit '030df428443735eed084286564407198792daa82'

* commit '030df428443735eed084286564407198792daa82':
  Add support for @pending annotation.
 2009-09-10 15:19:55 -07:00
Xavier Ducrohet
c35eaf7e98 am aca5e20e: am a3c35d19: Merge change 24565 into eclair 
Merge commit 'aca5e20e4a47a943fc77c30b8cfafc62a1fb33ea'

* commit 'aca5e20e4a47a943fc77c30b8cfafc62a1fb33ea':
  Add missing @Override to DroidDoc and ApiCheck
 2009-09-10 15:19:51 -07:00
Xavier Ducrohet
030df42844 am 85762123: Merge change 24584 into eclair 
Merge commit '857621233a13b28a31cbd6e0ae4e2df4eed44d83' into eclair-plus-aosp

* commit '857621233a13b28a31cbd6e0ae4e2df4eed44d83':
  Add support for @pending annotation.
 2009-09-10 15:10:39 -07:00
Xavier Ducrohet
aca5e20e4a am a3c35d19: Merge change 24565 into eclair 
Merge commit 'a3c35d197ed533cabd90ac7d6dd309d50c8fdcb2' into eclair-plus-aosp

* commit 'a3c35d197ed533cabd90ac7d6dd309d50c8fdcb2':
  Add missing @Override to DroidDoc and ApiCheck
 2009-09-10 15:10:36 -07:00
Xavier Ducrohet
02e14df59f Add support for @pending annotation. 
This behaves the same as @hide, but can be used to annotate API that are
only hidden pending API approval.

Change-Id: I4c0bf46c6d74ed45a8890ecdfd9b14ce234a5c18
 2009-09-10 14:50:12 -07:00
Xavier Ducrohet
5ee390d856 Add missing @Override to DroidDoc and ApiCheck 
Change-Id: Ic7829a4ea62a614ef8b525bd84f8fbaaa4674d06
 2009-09-10 14:46:21 -07:00
Alexey Tarasov
1fcce11eed Cosmetic fixes in css/js 2009-09-08 15:29:54 -07:00
Jean-Baptiste Queru
dc785843c7 merge from donut 2009-09-03 14:12:45 -07:00
Dirk Dougherty
49a92efc18 am 5043a836: am af2a2a61: am 4d545a82: Merge change 23037 into donut 
Merge commit '5043a836a77a623578590a6a76f34e2b121fe1e1'

* commit '5043a836a77a623578590a6a76f34e2b121fe1e1':
  Doc changes for SDK update.
 2009-09-02 19:04:00 -07:00
Dirk Dougherty
5043a836a7 am af2a2a61: am 4d545a82: Merge change 23037 into donut 
Merge commit 'af2a2a61ed0b60efa4b0e8852333ed4693834aca' into eclair-plus-aosp

* commit 'af2a2a61ed0b60efa4b0e8852333ed4693834aca':
  Doc changes for SDK update.
 2009-09-02 19:01:33 -07:00
Dirk Dougherty
af2a2a61ed am 4d545a82: Merge change 23037 into donut 
Merge commit '4d545a82917db0ca90494e4cfb7944e1b5ea564a' into eclair

* commit '4d545a82917db0ca90494e4cfb7944e1b5ea564a':
  Doc changes for SDK update.
 2009-09-02 18:58:52 -07:00
Android (Google) Code Review
4d545a8291 Merge change 23037 into donut 
* changes:
  Doc changes for SDK update. Update SDK toc template.
 2009-09-02 18:57:09 -07:00
Doug Zongker
dc8d202008 am 0646e78e: am d7d7ab00: do a pass of normal-chunk-merging before comparing src and tgt files 
Merge commit '0646e78e9969762ead938f953c7283d984333d99'

* commit '0646e78e9969762ead938f953c7283d984333d99':
  do a pass of normal-chunk-merging before comparing src and tgt files
 2009-09-02 13:34:19 -07:00
Doug Zongker
99677d23a2 am 279bae71: am 15604b84: use imgdiff -z to diff zipfiles 
Merge commit '279bae719765f4fb9fc372323d680690b5842f90'

* commit '279bae719765f4fb9fc372323d680690b5842f90':
  use imgdiff -z to diff zipfiles
 2009-09-02 13:33:28 -07:00
Doug Zongker
0646e78e99 am d7d7ab00: do a pass of normal-chunk-merging before comparing src and tgt files 
Merge commit 'd7d7ab00f58bd75ac185273f93d15533558a7f54' into eclair-plus-aosp

* commit 'd7d7ab00f58bd75ac185273f93d15533558a7f54':
  do a pass of normal-chunk-merging before comparing src and tgt files
 2009-09-02 11:15:52 -07:00
Doug Zongker
d7d7ab00f5 do a pass of normal-chunk-merging before comparing src and tgt files 
Merge the gzip footer and header together with any adjacent normal
chunks before comparing chunk structures; this should make the
recovery-from-boot diff not fail due to differences in the footer
after the ramdisk part of the image.
 2009-09-02 11:10:51 -07:00
Doug Zongker
279bae7197 am 15604b84: use imgdiff -z to diff zipfiles 
Merge commit '15604b84e246514da6c9721266919003f734380b' into eclair-plus-aosp

* commit '15604b84e246514da6c9721266919003f734380b':
  use imgdiff -z to diff zipfiles
 2009-09-02 08:56:05 -07:00
Doug Zongker
15604b84e2 use imgdiff -z to diff zipfiles 
imgdiff now understands the zip file format and can produce smaller
patches by doing the patching in uncompressed space.  Start taking
advantage of this for .zip, .apk, and .jar files.
 2009-09-01 17:53:34 -07:00
Scott Main
c2b5b036d4 am d90f315f: am cca05d9e: am a01ee1ea: docs only. my previous change to the list styles was the wrong solution. this fixes all prior problems with nested lists in OLs, ULs, and DLs 
Merge commit 'd90f315fc0cba9c473e53c57a74a9071e10dedac'

* commit 'd90f315fc0cba9c473e53c57a74a9071e10dedac':
  docs only.
 2009-09-01 12:15:33 -07:00
Jean-Baptiste Queru
4730a61599 am 37321fde: merge from open-source master 
Merge commit '37321fdeeffc707cb33bd433dca27f18c205d1fe'

* commit '37321fdeeffc707cb33bd433dca27f18c205d1fe':
  kcm tool fix for the keyboard output permissions
 2009-09-01 12:14:15 -07:00
Scott Main
d90f315fc0 am cca05d9e: am a01ee1ea: docs only. my previous change to the list styles was the wrong solution. this fixes all prior problems with nested lists in OLs, ULs, and DLs 
Merge commit 'cca05d9e658b4357995a73ca72793d46100aae8e' into eclair-plus-aosp

* commit 'cca05d9e658b4357995a73ca72793d46100aae8e':
  docs only.
 2009-09-01 10:43:15 -07:00
Scott Main
cca05d9e65 am a01ee1ea: docs only. my previous change to the list styles was the wrong solution. this fixes all prior problems with nested lists in OLs, ULs, and DLs 
Merge commit 'a01ee1ea93cd2a4d876fcb5678392bbd277b6042' into eclair

* commit 'a01ee1ea93cd2a4d876fcb5678392bbd277b6042':
  docs only.
 2009-09-01 10:41:03 -07:00
Scott Main
a01ee1ea93 docs only. 
my previous change to the list styles was the wrong solution.
this fixes all prior problems with nested lists in OLs, ULs, and DLs
 2009-09-01 10:36:55 -07:00
Jean-Baptiste Queru
37321fdeef merge from open-source master 2009-09-01 08:27:43 -07:00
Andy McFadden
9611ceb460 Flush every line of output. 
Works better when the output is piped through "tee" to a file.
 2009-08-31 13:38:35 -07:00
Dirk Dougherty
123bb1228b Doc changes for SDK update. 
Update SDK toc template.
 2009-08-27 16:48:25 -07:00
Doug Zongker
75b4ba0e4d am f76b9c87: remove bootloader assertions 
Merge commit 'f76b9c87b16956aebfe5af497913d698dd03cc01'

* commit 'f76b9c87b16956aebfe5af497913d698dd03cc01':
  remove bootloader assertions
 2009-08-27 16:25:24 -07:00
Jay Schroeder
b7e96e4498 kcm tool fix for the keyboard output permissions 
This patch adds read permission for everyone to the output files of the
kcm tool. The compiled keycharmap files need to be able to be read by
everyone. This fixes a problem at startup being unable to read the
*.kcm.bin files located at <android-root>/system/usr/keychars.
 2009-08-27 18:16:25 -05:00
Doug Zongker
f76b9c87b1 remove bootloader assertions 
These should be done by the device-specific module where necessary;
they aren't appropriate for all devices.
 2009-08-27 16:12:00 -07:00
Joshua Bloch
855003deb7 Making Droiddoc not explode when inherited interfaces disappear. 2009-08-27 14:43:03 -07:00
Scott Main
9aa4927072 am e06d28ec: am dab571d6: Merge change 22524 into donut 
Merge commit 'e06d28ecd7df35d9ab978edbf93129a0f1ad610a'

* commit 'e06d28ecd7df35d9ab978edbf93129a0f1ad610a':
  docs only.
 2009-08-26 09:34:11 -07:00