drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,317 Commits 1 Branch 0 Tags
Commit Graph

3461 Commits

Author SHA1 Message Date
Peter Ng
81a9bece12 Merge "copy and image updates to patterns and building blocks" into jb-dev 2012-07-30 14:37:26 -07:00
Dirk Dougherty
f852a1d3f5 am 9ddc6ed3: am 36e055bd: Doc change: fix typo. 
* commit '9ddc6ed30f2fa23d6946fca2ef0ddb17f23845b5':
  Doc change: fix typo.
 2012-07-27 17:42:12 -07:00
Dirk Dougherty
9ddc6ed30f am 36e055bd: Doc change: fix typo. 
* commit '36e055bd2e55d9b8f13d0d0d37259fa0ce5507d1':
  Doc change: fix typo.
 2012-07-27 17:39:42 -07:00
Dirk Dougherty
36e055bd2e Doc change: fix typo. 
Change-Id: Icd0d01a3047e86544dcea9188499e1433778184a
 2012-07-27 17:36:07 -07:00
Scott Main
b37165782b am f64e9a8f: am 03345389: Merge "Delete everything from the shareables/ directory to save space on dac. All of the training ZIPs are now located in development/samples/training/zips/ Added a readme file to explain this change toward using cloud storage instead." into 
* commit 'f64e9a8fe9e6a75bd217705cd15a72b2dedf00cf':
  Delete everything from the shareables/ directory to save space on dac. All of the training ZIPs are now located in development/samples/training/zips/ Added a readme file to explain this change toward using cloud storage instead.
 2012-07-26 15:45:24 -07:00
Scott Main
f64e9a8fe9 am 03345389: Merge "Delete everything from the shareables/ directory to save space on dac. All of the training ZIPs are now located in development/samples/training/zips/ Added a readme file to explain this change toward using cloud storage instead." into jb-dev 
* commit '0334538983ee7031bf06c4961ce6185e099ef655':
  Delete everything from the shareables/ directory to save space on dac. All of the training ZIPs are now located in development/samples/training/zips/ Added a readme file to explain this change toward using cloud storage instead.
 2012-07-26 15:43:06 -07:00
Scott Main
0334538983 Merge "Delete everything from the shareables/ directory to save space on dac. All of the training ZIPs are now located in development/samples/training/zips/ Added a readme file to explain this change toward using cloud storage instead." into jb-dev 2012-07-26 15:40:24 -07:00
Scott Main
70b43e4fef am f1d4dc38: am db242310: Merge "docs: add Settings dev guide; a few changes to javadocs" into jb-dev 
* commit 'f1d4dc3844510eb02cffd49c81ce2ec297758a6f':
  docs: add Settings dev guide; a few changes to javadocs
 2012-07-25 22:23:54 -07:00
Scott Main
f1d4dc3844 am db242310: Merge "docs: add Settings dev guide; a few changes to javadocs" into jb-dev 
* commit 'db24231057bdf8b11a10c772084cfc0e4294ec04':
  docs: add Settings dev guide; a few changes to javadocs
 2012-07-25 21:49:46 -07:00
Scott Main
db24231057 Merge "docs: add Settings dev guide; a few changes to javadocs" into jb-dev 2012-07-25 15:51:29 -07:00
Alexander Lucas
58ae40ec8f am aa9e2c0b: am 11ed0a1f: Merge "Initial commit of GCM lesson for Cloudsync class." into jb-dev 
* commit 'aa9e2c0be9e9a6302b99e41c60097f79fa980ef5':
  Initial commit of GCM lesson for Cloudsync class.
 2012-07-25 15:05:48 -07:00
Scott Main
75c691a8fb am 2f52ec3e: am b1e4a4f2: Merge "fix broken links bug 6879771" into jb-dev 
* commit '2f52ec3ef18146c7f70c77dd1afb937461213e01':
  fix broken links bug 6879771
 2012-07-25 15:05:44 -07:00
Scott Main
54da5b5d68 am dd4448ef: am 32189e26: Merge "misc doc bug fixes" into jb-dev 
* commit 'dd4448ef6807f096cdfdf632857baefd7cbc85ec':
  misc doc bug fixes
 2012-07-25 15:05:39 -07:00
Scott Main
baecca685f Delete everything from the shareables/ directory to save space on dac. 
All of the training ZIPs are now located in development/samples/training/zips/
Added a readme file to explain this change toward using cloud storage instead.

Change-Id: I1f56ac35b88506d0ba0eaa54861e4a2a7d4c566a
 2012-07-25 14:57:15 -07:00
Scott Main
bbb3f41e26 docs: add Settings dev guide; 
a few changes to javadocs

Change-Id: I2d671aafe91e4c6e224e2a556a60dce9f93f11ae
 2012-07-25 13:52:46 -07:00
Alexander Lucas
aa9e2c0be9 am 11ed0a1f: Merge "Initial commit of GCM lesson for Cloudsync class." into jb-dev 
* commit '11ed0a1fbc6e30d5e8c72c19a4b88c8d35c2533f':
  Initial commit of GCM lesson for Cloudsync class.
 2012-07-25 12:14:02 -07:00
Alexander Lucas
11ed0a1fbc Merge "Initial commit of GCM lesson for Cloudsync class." into jb-dev 2012-07-25 12:11:16 -07:00
Scott Main
2f52ec3ef1 am b1e4a4f2: Merge "fix broken links bug 6879771" into jb-dev 
* commit 'b1e4a4f25f9fd4d1cee4629e71acb04e3d4e5ec0':
  fix broken links bug 6879771
 2012-07-25 11:56:54 -07:00
Scott Main
dd4448ef68 am 32189e26: Merge "misc doc bug fixes" into jb-dev 
* commit '32189e260c8dee27d561bf67c0333c9b9927636b':
  misc doc bug fixes
 2012-07-25 11:55:09 -07:00
Scott Main
c5e128c048 fix broken links 
bug 6879771

Change-Id: I106016c96070beaef6dba387110aea2a9e4f6089
 2012-07-25 11:51:12 -07:00
Quddus Chong
432f86d126 am 38f849ca: am 4eb6973b: Merge "docs: Added docs for lint tool. Change-Id: I06192262b56e0333bcfbcac223395788f7b0d072 Bug: 5942358" into jb-dev 
* commit '38f849ca81394fae6af83dd68c34f7cbf46d5760':
  docs: Added docs for lint tool. Change-Id: I06192262b56e0333bcfbcac223395788f7b0d072 Bug: 5942358
 2012-07-24 22:16:10 -07:00
Quddus Chong
38f849ca81 am 4eb6973b: Merge "docs: Added docs for lint tool. Change-Id: I06192262b56e0333bcfbcac223395788f7b0d072 Bug: 5942358" into jb-dev 
* commit '4eb6973bc1f8cd51a2466708b227fb51314ad0c1':
  docs: Added docs for lint tool. Change-Id: I06192262b56e0333bcfbcac223395788f7b0d072 Bug: 5942358
 2012-07-24 22:13:46 -07:00
Scott Main
113f8745c7 am f5746984: am 0804b6db: docs: specify that adt v20 or higher is required for class 
* commit 'f574698404bf3f5aeeb2665ae53f165d629e6951':
  docs: specify that adt v20 or higher is required for class
 2012-07-24 22:11:19 -07:00
Scott Main
f574698404 am 0804b6db: docs: specify that adt v20 or higher is required for class 
* commit '0804b6dbf557df6d69f96c18ebd638ee74c7c050':
  docs: specify that adt v20 or higher is required for class
 2012-07-24 22:08:52 -07:00
Joe Fernandez
84ed76b63a am c7f59ec1: am 156671ef: Merge "docs: ADT r20.0.2 Release Notes, bug fixes - reprise of reverted: Change-Id: I66cfcb46c5f8a4825f1a12640dacc3c2c42ff348" into jb-dev 
* commit 'c7f59ec1a1e962f7672467ac963006921bb18f62':
  docs: ADT r20.0.2 Release Notes, bug fixes - reprise of reverted: Change-Id: I66cfcb46c5f8a4825f1a12640dacc3c2c42ff348
 2012-07-24 22:03:37 -07:00
Scott Main
576238a331 am 6ce3887a: am 707e6321: Merge "typo fix" into jb-dev 
* commit '6ce3887a62e99586172af7aec8ea54a71e56e634':
  typo fix
 2012-07-24 22:03:28 -07:00
Joe Fernandez
63ac83ac39 am 881a2f66: am 614b7307: Merge "doc: fix for NDK r8b release notes" into jb-dev 
* commit '881a2f6676720cdbba7146748420aacfaca3cbfb':
  doc: fix for NDK r8b release notes
 2012-07-24 22:03:23 -07:00
Joe Fernandez
c7f59ec1a1 am 156671ef: Merge "docs: ADT r20.0.2 Release Notes, bug fixes - reprise of reverted: Change-Id: I66cfcb46c5f8a4825f1a12640dacc3c2c42ff348" into jb-dev 
* commit '156671ef9a6581b6790bb17bfda8a9efcf9f0693':
  docs: ADT r20.0.2 Release Notes, bug fixes - reprise of reverted: Change-Id: I66cfcb46c5f8a4825f1a12640dacc3c2c42ff348
 2012-07-24 22:01:00 -07:00
Scott Main
6ce3887a62 am 707e6321: Merge "typo fix" into jb-dev 
* commit '707e6321fd1dbff33e6fa3437fdce4eeaa3e1168':
  typo fix
 2012-07-24 22:00:49 -07:00
Joe Fernandez
881a2f6676 am 614b7307: Merge "doc: fix for NDK r8b release notes" into jb-dev 
* commit '614b7307c771db7a6328a55b14983c34554440be':
  doc: fix for NDK r8b release notes
 2012-07-24 22:00:45 -07:00
Scott Main
fe3b1cb27d misc doc bug fixes 
Change-Id: I68963d79422e5cedb1726e91e9639860b13a2471
 2012-07-24 18:13:11 -07:00
Quddus Chong
4eb6973bc1 Merge "docs: Added docs for lint tool. Change-Id: I06192262b56e0333bcfbcac223395788f7b0d072 Bug: 5942358" into jb-dev 2012-07-24 17:59:11 -07:00
Quddus Chong
375d72baa7 docs: Added docs for lint tool. Change-Id: I06192262b56e0333bcfbcac223395788f7b0d072 
Bug: 5942358

Change-Id: Ib15f96f267aa0a713fbd03b3bf5dced8c37da12e
 2012-07-24 17:44:55 -07:00
Alexander Lucas
e38a6c50ea Initial commit of GCM lesson for Cloudsync class. 
Change-Id: I7d4020e60f30a162f74bd2e1d0360c14ee9766b2
 2012-07-24 17:32:08 -07:00
Scott Main
0804b6dbf5 docs: specify that adt v20 or higher is required for class 
Change-Id: I11b9bdf59d10fad2dc49ccda47078e273fe064f7
 2012-07-24 15:51:27 -07:00
Joe Fernandez
156671ef9a Merge "docs: ADT r20.0.2 Release Notes, bug fixes - reprise of reverted: Change-Id: I66cfcb46c5f8a4825f1a12640dacc3c2c42ff348" into jb-dev 2012-07-24 11:47:04 -07:00
Joe Fernandez
cb58e6b7cf docs: ADT r20.0.2 Release Notes, bug fixes - reprise of reverted: Change-Id: I66cfcb46c5f8a4825f1a12640dacc3c2c42ff348 
Change-Id: I590028c0eebc5d3142c63036e3fffb1a53cb55a6
 2012-07-24 11:41:17 -07:00
Scott Main
707e6321fd Merge "typo fix" into jb-dev 2012-07-24 10:21:17 -07:00
Joe Fernandez
614b7307c7 Merge "doc: fix for NDK r8b release notes" into jb-dev 2012-07-24 09:11:25 -07:00
Scott Main
0e848d4e8a am 2e5d7c53: am 9f061e28: fix information about layout overrides bug: 6852515 
* commit '2e5d7c539a1aa9f5c644b4e0d44fb69d480cc036':
  fix information about layout overrides bug: 6852515
 2012-07-23 19:53:43 -07:00
Scott Main
6bfeabedcd am 26db8b95: am fc815c32: Merge "docs: update Building Your First App class to reflect changes to New Project setup in eclipse" into jb-dev 
* commit '26db8b95948a1aa0e42829d98ebefcb02491da68':
  docs: update Building Your First App class to reflect changes to New Project setup in eclipse
 2012-07-23 19:53:39 -07:00
Joe Fernandez
9a8c7a4cde am abfbce08: am 7ba01780: Merge "Revert "docs: ADT r20.0.2 Release Notes, bug fixes"" into jb-dev 
* commit 'abfbce0844c43b05d057b06c92002f227bac18e5':
  Revert "docs: ADT r20.0.2 Release Notes, bug fixes"
 2012-07-23 19:53:03 -07:00
Scott Main
aedcb3f553 am 87a80039: am 67922bb2: docs: add new IO videos playlist and update blog posts to show N7 post and Tools 20 
* commit '87a800394639bdf680ce6c89abdeb44d7f803c0f':
  docs: add new IO videos playlist and update blog posts to show N7 post and Tools 20
 2012-07-23 19:52:51 -07:00
Scott Main
61e358eceb am 95f83fd7: am c7504032: Merge "docs: remove link that points to empty page" into jb-dev 
* commit '95f83fd79fce13566e55dd5c522baa33cb6b803c':
  docs: remove link that points to empty page
 2012-07-23 19:52:15 -07:00
Joe Fernandez
3120e9d984 am d3e05689: am 04364be7: docs: ADT r20.0.2 Release Notes, bug fixes 
* commit 'd3e05689ba3acf8ee199accff96bf2e8ae10c5e1':
  docs: ADT r20.0.2 Release Notes, bug fixes
 2012-07-23 19:04:55 -07:00
Scott Main
eb48884133 typo fix 
Change-Id: Ib7c8f17fd0f2a1e2b462b6ab9b711c3b4bf3edda
 2012-07-23 18:58:19 -07:00
Scott Main
2e5d7c539a am 9f061e28: fix information about layout overrides bug: 6852515 
* commit '9f061e2809ce89e0646519791cb69825abbb03a5':
  fix information about layout overrides bug: 6852515
 2012-07-23 18:49:55 -07:00
Scott Main
26db8b9594 am fc815c32: Merge "docs: update Building Your First App class to reflect changes to New Project setup in eclipse" into jb-dev 
* commit 'fc815c328bea63c2dee7e67b81c95d7c4d5696bb':
  docs: update Building Your First App class to reflect changes to New Project setup in eclipse
 2012-07-23 18:49:50 -07:00
Scott Main
9f061e2809 fix information about layout overrides 
bug: 6852515

Change-Id: I80681a06e87aad3de8243bb731d7513e5aa29d08
 2012-07-23 18:32:03 -07:00
Scott Main
39871b7e43 docs: update Building Your First App class to reflect changes to New Project setup in eclipse 
Change-Id: I57c02676fbc2886872c2d294c5517b458e8751c5
 2012-07-23 18:16:54 -07:00