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

198 Commits

Author SHA1 Message Date
Rich Slogar
703b5f895d am 2f626153: am 39220a7e: am 023901c6: am ffd0e519: Merge "docs: Update Eclipse migrate procedure" into lmp-docs 
* commit '2f6261534b0916714715ffa9e2800716dd900eb8':
  docs: Update Eclipse migrate procedure
 2015-05-05 01:48:06 +00:00
Rich Slogar
ffd0e51929 Merge "docs: Update Eclipse migrate procedure" into lmp-docs 2015-05-04 18:43:39 +00:00
Rich Slogar
0820394f7e resolved conflicts for merge of edf44562 to mnc-dev 
Change-Id: I2df8255d12feed8c17b9c9f009453701cd412676
 2015-04-30 14:20:12 -07:00
Rich Slogar
2a3aa2d343 docs: studio 1.2 updates 
Change-Id: I893af7af0f686d0eeab11f881256c0cf26eb4605
 2015-04-29 19:47:25 -07:00
Rich Slogar
b3e8c4b807 docs: Update Eclipse migrate procedure 
Change-Id: I6cd292d457a7f2e975ceb0a11086fc5e35a78308
 2015-04-28 12:08:13 -07:00
Rich Slogar
7f92c27ff8 am 964b4018: am 40055c22: am 11558e5d: am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs 
* commit '964b4018499a0e1a50364f81f576a7181252841a':
  docs: eclipse revisions update
 2015-03-12 21:33:21 +00:00
Rich Slogar
0c1076b270 Merge "docs: eclipse revisions update" into lmp-docs 2015-03-10 19:15:10 +00:00
Rich Slogar
05298d0fd5 docs: eclipse revisions update 
Change-Id: I163f9ef9d8cd0c4e4fe5d7a19b76e239af2ee2d3
 2015-03-10 11:46:49 -07:00
Rich Slogar
23e182b1e9 am fdbda56a: am 1e72a9b2: am 2ed2c141: am 81049aff: am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs 
* commit 'fdbda56a2d3394c2ff28075162b683e05bf8fb1c':
  docs: note to install linux packages v2 update
 2015-02-26 00:00:12 +00:00
Rich Slogar
69044ae842 docs: note to install linux packages v2 update 
b.android 155803

Change-Id: Ia41c41be82fcbd09c67425ddbd75405eec095834
 2015-02-24 17:01:58 -08:00
Rich Slogar
90fa535569 am 27672017: am 6b5c3802: am c9cc2c22: am bd1fb402: am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs automerge: 0f60943 
* commit '27672017956f5bb672cab15d0f0094018b6fa9d9':
  docs: note to install linux packages
 2015-02-18 11:37:57 +00:00
Chris Banes
6026f73406 resolved conflicts for merge of 1c131eeb to master 
Change-Id: I886d726322514fa3b27cdc80b8dd57faa94bade5
 2015-02-18 11:02:49 +00:00
Rich Slogar
717b4d130f Merge "docs: note to install linux packages" into lmp-docs 2015-02-17 23:54:50 +00:00
Rich Slogar
38f2242e39 docs: studio mipmap update 
Change-Id: Id493c079186585a29a8c6b1ba57d921a7327868d
 2015-02-13 17:17:41 -08:00
Rich Slogar
be8e62388c docs: note to install linux packages 
b/2845850
b.android 98328

Change-Id: I23224f24cb0b42ec4ffb3829e2246628da140f8c
 2015-02-02 16:08:03 -08:00
Ricardo Cervera
c5a1c1363c resolved conflicts for merge of 6302a72a to master 
Change-Id: I3adbbb983a2d7b0b85d3de0b14cbb2619aa711dd
 2015-01-06 16:31:37 -08:00
Joe Fernandez
b63166afd3 am c632031a: am 27195338: am 546a0e8c: am 60925265: am afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs 
automerge: 7cf74ee

* commit '7cf74ee6e2c51afaf07e29f8597475ec289a20ed':
  docs: studio build output dir name update
 2015-01-06 20:01:43 +00:00
Nick Kralevich
cfea9fbc53 resolved conflicts for merge of 175ef812 to master 
Change-Id: I2c6f407fa56b13c54571f8a51573a4b45d251dbb
 2015-01-06 11:50:08 -08:00
Nick Kralevich
0e55e3565e resolved conflicts for merge of 1779fd15 to master 
Change-Id: I36b60b943a9cfe53bbbf455cf4e94579bfbfbc69
 2015-01-06 11:29:44 -08:00
Ricardo Cervera
4bb503cf12 docs: Minor fixes in Android Studio pages. 
https://code.google.com/p/android/issues/detail?id=92839
https://code.google.com/p/android/issues/detail?id=92840
https://code.google.com/p/android/issues/detail?id=92661

Change-Id: I8a45112371da6ca144e0da28701a92254d98774b
 2015-01-05 09:31:41 -08:00
Joe Fernandez
afc3b9e7f5 Merge "docs: studio build output dir name update" into lmp-docs 2014-12-19 05:35:19 +00:00
Joe Fernandez
e6395cd34c Merge "docs: project file and toc updates" into lmp-docs 2014-12-19 05:28:36 +00:00
Joe Fernandez
1092bafa1d Merge "docs: studio tips and ticks grammmar typo" into lmp-docs 2014-12-19 05:20:53 +00:00
Rich Slogar
1dafeb3041 docs: studio build output dir name update 
b/18670283

Change-Id: Iae80825ba205abbd99561acee0bc63986d195b15
 2014-12-18 14:21:39 -08:00
Rich Slogar
3f8e456be7 docs: project file and toc updates 
b/18681310

Change-Id: I0a4d4a85f60d0e9dccfbec86e6e54a718d43503a
 2014-12-18 13:58:06 -08:00
smain@google.com
87e74132bf am eb9a4607: am 1d97aebd: am 9af05a68: am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download automerge: c21b455 
* commit 'eb9a46075f13cb0c0ffbb1dd9cf935fd694f1b76':
  brute force improve suggestions for sdk download
 2014-12-16 11:02:38 +00:00
smain@google.com
68e6819bd0 brute force improve suggestions for sdk download 
Change-Id: I4698058a12472a65e67cadc3d0e3dd1ffed1b384
 2014-12-15 10:00:59 -08:00
smain@google.com
0baa12cee3 Merge "followup fix to conflict resolution in Change-Id: I9cc71d672141c23c0c2ed0a73d3e80aac10f3eb6" 2014-12-15 15:56:55 +00:00
smain@google.com
5d0766a80e followup fix to conflict resolution in Change-Id: I9cc71d672141c23c0c2ed0a73d3e80aac10f3eb6 
Change-Id: I5796348197732f6c9e72fcbdbca5fcd4934f8994
 2014-12-15 07:39:52 -08:00
Rich Slogar
26d4e8f3e8 docs: studio tips and ticks grammmar typo 
Change-Id: Ica1f4849e090b43d9a68de3c350e3839d07f0695
 2014-12-11 13:25:44 -08:00
smain@google.com
848b1c2201 am b1d41255: am 92b6011d: am 9ecc18e2: am 4267450e: am 780a2231: am 2023bec7: revise ADT migration message b/18668828 and fix broken link 
* commit 'b1d41255540256136b058726e0e3efb0439e713f':
  revise ADT migration message b/18668828 and fix broken link
 2014-12-10 17:42:54 +00:00
Nick Kralevich
d5180176cb resolved conflicts for merge of ef7708f8 to master 
Change-Id: I9cc71d672141c23c0c2ed0a73d3e80aac10f3eb6
 2014-12-10 08:36:37 -08:00
Dmitriy Ivanov
33f6c9f45d resolved conflicts for merge of bd5098e6 to master 
Change-Id: I5959958476c3edc16f9a13a06517f70be7ec32e3
 2014-12-09 17:22:31 -08:00
Joe Fernandez
b35a509d0e Merge ":docs studio tips and tricks headings updates" into lmp-docs 2014-12-09 22:56:37 +00:00
Rich Slogar
5053344bb6 :docs studio tips and tricks headings updates 
Change-Id: I5453263b575610b6f418569bdf79f73a693c641b
 2014-12-09 14:23:18 -08:00
smain@google.com
f47eadf7fa am 4df464d0: am 8bd51aa5: am 983ba2ba: am 9a379e73: am 341c518f: am 43838855: fix migrate instruction step 
* commit '4df464d053669392e1f1c235744ff5359b9f84cd':
  fix migrate instruction step
 2014-12-09 22:22:56 +00:00
smain@google.com
b56db728fa resolved conflicts for merge of c137d08c to master 
Change-Id: I1addaa7b46e893014eca23746c6bf5f7e71dc2ca
 2014-12-09 14:19:57 -08:00
Joe Fernandez
ead7b78b9e resolved conflicts for merge of 66189de6 to master 
Change-Id: Id4a80013dd506bd1135dd931450ee2a08a4c77aa
 2014-12-09 13:58:23 -08:00
smain@google.com
2023bec7bf revise ADT migration message 
b/18668828
and fix broken link

Change-Id: I64cba60ebdd0649a0394e0f4284160514f56099e
 2014-12-08 19:37:17 -08:00
smain@google.com
c4a0882a5d edits to sdk install instructions. 
Change-Id: Ic4be9526a5d4db6a2ffa52dc05e25c4c10eb4c97
 2014-12-08 12:28:25 -08:00
smain@google.com
6ae492e672 changes to deprecate eclipse docs and update migration guide 
Change-Id: Icb3c0d93a968d5b1db829ff1db51ecdc47374803
 2014-12-08 11:55:12 -08:00
smain@google.com
4383885575 fix migrate instruction step 
Change-Id: I28cf353f2b21d06ee256673590501487f8645b05
 2014-12-08 08:07:14 -08:00
smain@google.com
35ee301889 revisions to Studio landing page 
Change-Id: I608b8a63b826f2f2ee2603d7426b501a4df24a38
 2014-12-08 01:26:21 -08:00
smain@google.com
2cfdbf5f7f Merge "fix migrate guide and other studio edits cherryick from Ic223d8fa3cd1e66ddd37b8f896fef12869be4268" into lmp-docs 2014-12-08 09:21:56 +00:00
smain@google.com
c07d57d46d fix migrate guide and other studio edits 
cherryick from  Ic223d8fa3cd1e66ddd37b8f896fef12869be4268

Change-Id: Ic223d8fa3cd1e66ddd37b8f896fef12869be4268
 2014-12-08 01:20:22 -08:00
smain@google.com
59a3dd7b0e misc fixes for studio launch: 
update install instructions, update tools nav for AVD page,
update AVD instructions in first app class, other edits to first app.

Change-Id: I086bf63dddc9f653ce06db29eec9998dfa265040
 2014-12-08 00:33:15 -08:00
Joe Fernandez
3ec76e087c doc: SDK install page fix and link fixes 
- remove remainain ADT install instructions
- fix tools/gradle/ links
- fix tools/basics/ links
- fix tools/workflow/ links (some)

Change-Id: I52c314724250ff3aa2a1b4b1154e1d1ef37f4b81
 2014-12-07 22:58:57 -08:00
Rich Slogar
4083327e0e docs:build system updates [CP] 
Cherry-pick from Change-Id: I8a5810824cbef3bb81173d80827075d3754d7573

Change-Id: I1e948a18a5e7cc58ae712c50887e69ab8600e536
 2014-12-07 20:51:00 -08:00
smain@google.com
d0c79c4e95 fix migrate guide and other studio edits [CP] 
Cherry-pick from Change-Id: Ic223d8fa3cd1e66ddd37b8f896fef12869be4268

Change-Id: Iaa878bd8b7dc97391b8f2d635f45a646656891e4
 2014-12-07 20:44:03 -08:00
smain@google.com
5797e272a8 docs:sdk installing file update [CP] 
Cherry-pick from Change-Id: Iea016bb42df95d19058f261f581482ecc4b8b3b4

Change-Id: Id0c330fedaeac54a455459a02a497a45ecccaee6
 2014-12-07 20:35:04 -08:00