StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,306 Commits 1 Branch 0 Tags
e80e8b4c5cbde72338ee6e88d3b51a5f36656be2
Commit Graph

8345 Commits

Author SHA1 Message Date
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
Scott Main
e06d28ecd7 am dab571d6: Merge change 22524 into donut 
Merge commit 'dab571d613c2d9955163fa672e3b8ad92fdf5cb7' into eclair

* commit 'dab571d613c2d9955163fa672e3b8ad92fdf5cb7':
  docs only.
 2009-08-26 09:29:28 -07:00
Scott Main
694972774e docs only. 
fix api level highlighting for the treeview navigation.
 2009-08-24 17:33:06 -07:00
Doug Zongker
ce8f172e1f am 2f78b8ba: am 8fead691: Merge change 22448 into donut 
Merge commit '2f78b8ba1225a92305ce6c03ef2898055b6a99ac'

* commit '2f78b8ba1225a92305ce6c03ef2898055b6a99ac':
  incremental OTAs should remove /system/recovery.img
 2009-08-24 13:43:52 -07:00
Doug Zongker
2f78b8ba12 am 8fead691: Merge change 22448 into donut 
Merge commit '8fead6912ed3f04867974631935435a887ed889d' into eclair

* commit '8fead6912ed3f04867974631935435a887ed889d':
  incremental OTAs should remove /system/recovery.img
 2009-08-24 13:39:30 -07:00
Android (Google) Code Review
8fead6912e Merge change 22448 into donut 
* changes:
  incremental OTAs should remove /system/recovery.img
 2009-08-24 10:36:06 -07:00
Doug Zongker
3b949f0725 incremental OTAs should remove /system/recovery.img 
This file has been replaced by the recovery_from_boot.p patch file,
but needs to be removed from existing devices if it exists.
 2009-08-24 10:24:32 -07:00
Scott Main
d59c2ce372 am aab0d4c9: am 72a5cc82: Merge change 22354 into donut 
Merge commit 'aab0d4c9f9c175a287aca3954921cbf7731bf1f7'

* commit 'aab0d4c9f9c175a287aca3954921cbf7731bf1f7':
  docs only.
 2009-08-22 07:50:38 -07:00
Scott Main
4fcef1e3bf am 102400f8: am eca5e16e: Merge change 22348 into donut 
Merge commit '102400f8e235e066bde697f8165b9b0d35e59ac7'

* commit '102400f8e235e066bde697f8165b9b0d35e59ac7':
  docs only.
 2009-08-22 07:50:35 -07:00
Scott Main
aab0d4c9f9 am 72a5cc82: Merge change 22354 into donut 
Merge commit '72a5cc829038254988054046c302550d6821a300' into eclair

* commit '72a5cc829038254988054046c302550d6821a300':
  docs only.
 2009-08-22 07:44:20 -07:00
Scott Main
102400f8e2 am eca5e16e: Merge change 22348 into donut 
Merge commit 'eca5e16e057cc6915c07ea4138929c44a013aba6' into eclair

* commit 'eca5e16e057cc6915c07ea4138929c44a013aba6':
  docs only.
 2009-08-22 07:44:16 -07:00
Android (Google) Code Review
72a5cc8290 Merge change 22354 into donut 
* changes:
  docs only. add donut image for homepage announcement.
 2009-08-21 16:38:35 -07:00
Scott Main
37a4d1cb5c docs only. 
add donut image for homepage announcement.
 2009-08-21 16:37:09 -07:00
Android (Google) Code Review
eca5e16e05 Merge change 22348 into donut 
* changes:
  docs only. remove preliminary watermak
 2009-08-21 16:12:25 -07:00
Scott Main
d22b5e108d docs only. 
remove preliminary watermak
 2009-08-21 16:11:02 -07:00
Doug Zongker
98cb09e37a am 1f8b697a: am e05628cc: fix signing user builds 
Merge commit '1f8b697a7fc3102e495972fec0d8bca7e5698098'

* commit '1f8b697a7fc3102e495972fec0d8bca7e5698098':
  fix signing user builds
 2009-08-20 18:23:05 -07:00
Doug Zongker
1f8b697a7f am e05628cc: fix signing user builds 
Merge commit 'e05628cc8df4ec4b69befa9652d81eb81f0ab008' into eclair

* commit 'e05628cc8df4ec4b69befa9652d81eb81f0ab008':
  fix signing user builds
 2009-08-20 18:18:29 -07:00
Doug Zongker
e05628cc8d fix signing user builds 
When unzipping a target-files which has been signed with OTA key
replacement, you'll get "overwrite this file?" prompts because the key
files appear in the zip files twice.  Suppress these prompts.

Many developer phone products don't define PRODUCT_OTA_PUBLIC_KEYS, so
add a default key.

This change doesn't affect device code.
 2009-08-20 18:02:47 -07:00
Dirk Dougherty
9e85734425 am 724735d2: am 6f7ba2dc: Merge change 20234 into donut 
Merge commit '724735d2be4dd75207e53dff752feb6bd3a9dd6b'

* commit '724735d2be4dd75207e53dff752feb6bd3a9dd6b':
  Remove extraneous quotation mark in template file
 2009-08-20 10:41:02 -07:00
Dirk Dougherty
724735d2be am 6f7ba2dc: Merge change 20234 into donut 
Merge commit '6f7ba2dce2c112eb4be33dbad54751d55ddd2276' into eclair

* commit '6f7ba2dce2c112eb4be33dbad54751d55ddd2276':
  Remove extraneous quotation mark in template file
 2009-08-20 10:36:47 -07:00
Android (Google) Code Review
6f7ba2dce2 Merge change 20234 into donut 
* changes:
  Remove extraneous quotation mark in template file
 2009-08-20 10:33:11 -07:00
Scott Main
aeb8fd7ee1 am f036631b: am 54161d14: DOCS ONLY. styleheet changes to fix some errors in the print layout and remove extra space from above nested lists, so they fit closer to the parent list item. 
Merge commit 'f036631b02bca65818cc02767c5389e5de1f67a8'

* commit 'f036631b02bca65818cc02767c5389e5de1f67a8':
  DOCS ONLY.
 2009-08-19 12:16:10 -07:00
Scott Main
f036631b02 am 54161d14: DOCS ONLY. styleheet changes to fix some errors in the print layout and remove extra space from above nested lists, so they fit closer to the parent list item. 
Merge commit '54161d143931c5be2d49e8f9f215ec8bff2237af' into eclair

* commit '54161d143931c5be2d49e8f9f215ec8bff2237af':
  DOCS ONLY.
 2009-08-19 11:05:04 -07:00