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

9259 Commits

Author SHA1 Message Date
Rich Slogar
385f475472 docs: studio workflow links 
Change-Id: I1b06d989c282ce85afa94cd5b4522d895905c3b0
 2014-12-11 13:49:07 -08:00
Rich Slogar
26d4e8f3e8 docs: studio tips and ticks grammmar typo 
Change-Id: Ica1f4849e090b43d9a68de3c350e3839d07f0695
 2014-12-11 13:25:44 -08:00
Joe Fernandez
817796940b am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs 
* commit 'c9014b6d59cae3602027a5ea373d436a7e78b71c':
  docs: studio basics haxm updates
 2014-12-11 20:55:53 +00:00
Ricardo Cervera
af7070e6f0 am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs 
* commit '64d97cb2ad6bfd10511067f178ba8a1ccf9ba452':
  docs: Fixes to watch faces docs.
 2014-12-11 20:55:49 +00:00
Rich Slogar
0564cee3c7 am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs 
* commit 'b490f297101bcf31f56278d21d5f56a5e5998a58':
  docs: studio bundle update
 2014-12-11 20:55:45 +00:00
Joe Fernandez
07877955be am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs 
* commit '5c518b7f01345a414cd260db7762bdb0aa73b55b':
  docs: platform updates for api 21
 2014-12-11 20:55:35 +00:00
Joe Fernandez
e3bac3bc8f am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs 
* commit 'b64545c83a526d17ccbce2d110a06f3789dd4ad8':
  docs: sdk tools 24.0.1 revisions
 2014-12-11 20:55:29 +00:00
Andrew Solovay
13e0a6505f am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes" 
* commit 'a97053fd0ba37feb7382fd30498a6a5e93c52a9e':
  docs: Added info about managed profiles to "Android 5.0 Changes"
 2014-12-11 20:55:23 +00:00
Joe Fernandez
0aa2344577 Merge "docs: studio basics haxm updates" into lmp-docs 2014-12-11 19:43:18 +00:00
Ricardo Cervera
9fe34d9037 Merge "docs: Fixes to watch faces docs." into lmp-docs 2014-12-11 19:28:41 +00:00
Rich Slogar
d35216ad36 Merge "docs: studio bundle update" into lmp-docs 2014-12-11 19:04:03 +00:00
Rich Slogar
2f8f42f897 docs: studio bundle update 
Change-Id: I232a61ae6747b879e8a36f8e4942d6a3406c4162
 2014-12-11 10:51:41 -08:00
Rich Slogar
d282ba778b docs: studio basics haxm updates 
Change-Id: I2c3ef0dae3a091be27f1cfef13fe385f97781492
 2014-12-11 10:03:19 -08:00
Ricardo Cervera
ad69082b50 docs: Fixes to watch faces docs. 
Bug: 18705470
Bug: 18702859
Bug: 18713266

Change-Id: I67f159f3b54a03f08aa1cd4bf3aa40eec4a34631
 2014-12-11 09:17:45 -08:00
smain@google.com
984972fadc am 9a6d1d9f: am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs automerge: e04a9fc automerge: bac113b 
automerge: c73a65d

* commit 'c73a65d61892542ece0dd9b95000048517f36c02':
  add helpouts widget to wave 3 pages
 2014-12-11 10:21:47 +00:00
Luan Nguyen
671dd81eeb am 25964a85: am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index. automerge: 75ec24e automerge: 8470943 
automerge: f5b8651

* commit 'f5b865101d6f47aa5ef49cbd6b121d897116356c':
  docs: Fix link for moved Android Studio index.
 2014-12-11 10:20:17 +00:00
smain@google.com
c73a65d618 am 9a6d1d9f: am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs automerge: e04a9fc 
automerge: bac113b

* commit 'bac113bbcbe7780ca658f09019e5118ec851cd07':
  add helpouts widget to wave 3 pages
 2014-12-11 03:39:57 +00:00
Luan Nguyen
f5b865101d am 25964a85: am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index. automerge: 75ec24e 
automerge: 8470943

* commit '847094397ebac9ab2c5bb7e11844fd2b533bd209':
  docs: Fix link for moved Android Studio index.
 2014-12-11 03:38:41 +00:00
smain@google.com
9a6d1d9fba am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs 
automerge: e04a9fc

* commit 'e04a9fcc2edc4b2527c8233e16f823cec6fb58cc':
  add helpouts widget to wave 3 pages
 2014-12-11 02:56:17 +00:00
Luan Nguyen
25964a854a am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index. 
automerge: 75ec24e

* commit '75ec24e26900fa6e0def1f5e946be41614d8e520':
  docs: Fix link for moved Android Studio index.
 2014-12-11 02:54:57 +00:00
Joe Fernandez
c3daed967d Merge "docs: platform updates for api 21" into lmp-docs 2014-12-11 00:31:54 +00:00
Joe Fernandez
235e4be4c9 Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs 2014-12-11 00:27:02 +00:00
Andrew Solovay
c7ad6e9175 docs: Added info about managed profiles to "Android 5.0 Changes" 
Also a couple of unrelated changes while the file was open.

See first comment for link to staged doc.

Change-Id: I56dd57104729dec353b0dd630715a43a73d043d3
 2014-12-10 16:08:23 -08:00
smain@google.com
8cd0bb2df3 Merge "add helpouts widget to wave 3 pages" into lmp-docs 2014-12-10 23:07:38 +00:00
Joe Fernandez
4c7ec3d469 am e4e1687d: am 5a64a475: am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs automerge: 4ded0a1 
* commit 'e4e1687d73870a3ea05a26fb3a3ec598b42f053d':
  docs:studio basic links
 2014-12-10 22:00:11 +00:00
Luan Nguyen
12a44ca6f4 am 1032dac1: am 596d4e72: am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps automerge: ee501ed 
* commit '1032dac1f80cb46b796ab4fe31eb1139cabdd8c9':
  docs: Fix text on step 5 of the opt-in steps
 2014-12-10 22:00:01 +00:00
Joe Fernandez
60648a6faf am c6ff4552: am 17cf7789: am 5ff08052: am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs automerge: 39409f2 
* commit 'c6ff45522b11fd0e2d31996f532039150773e7fd':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.
 2014-12-10 21:58:33 +00:00
Ricardo Cervera
c07bbcb37c am fc1e25f3: am d56b7a39: am 504e213f: am ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs automerge: a41a241 
* commit 'fc1e25f30deac9f148add51875f92ef4ff473527':
  docs: Creating Custom Watch Faces training class.
 2014-12-10 21:58:28 +00:00
Ricardo Cervera
b2edc00747 am b8217ea7: am 2a34e719: am c0d08616: am c6361d8d: Merge "docs: Add details to Packaging Wearable apps." into lmp-dev automerge: 7061697 
* commit 'b8217ea7f0bc217c0c902657521dc51fd5305a65':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 21:58:22 +00:00
Ricardo Cervera
953cf63418 am 85cc4090: am 0342d70e: am f94ee2c1: am ec656c51: am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs automerge: 1b46c2c 
* commit '85cc40907648070c351b66f26163c8aaf3289073':
  docs: Design guidelines for watch faces draft.
 2014-12-10 21:58:17 +00:00
smain@google.com
2c3c4b168b am 835ad716: am 5a267e72: am 5b16e21b: am 6554bb45: am 1a2308bb: Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased l 
* commit '835ad71635638f1154a887464758fe81457da327':
  misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language.
 2014-12-10 21:58:06 +00:00
Joe Fernandez
54ebc61eff am b721e45a: am 913a683d: am f8527c7f: am c3ae2596: am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs automerge: caad620 
* commit 'b721e45a43b5c8797cea90cf6f908d109689f865':
  docs: Add Distributing to Android Wear doc
 2014-12-10 21:58:02 +00:00
Ricardo Cervera
1e667f650b am b33c8fb4: am 600224c9: am 730a52d0: am eb09f898: am d412b9ab: Merge "docs: Add new classes to Wearable UI library" into lmp-docs automerge: 768d97d 
* commit 'b33c8fb4b528c9d80e88a0283812ab4dc76de911':
  docs: Add new classes to Wearable UI library
 2014-12-10 21:57:57 +00:00
Ricardo Cervera
55338ad207 am 9c6e82e7: am 45ea5690: am 5edaf136: am be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs automerge: 739d0a8c 
* commit '9c6e82e70e9ac2aecd369ee00fadb162b29d5456':
  docs: Add links to wearable support zip for ADT
 2014-12-10 21:57:53 +00:00
Quddus Chong
36e228070a am d7100111: am 15e0f7fd: am bdb327ad: am c24c5797: am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs automerge: 20baf9e 
* commit 'd7100111514560a73fe5032f23e59c9e12b49aa1':
  docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
 2014-12-10 21:57:45 +00:00
Luan Nguyen
4221d7e4cb docs: Fix link for moved Android Studio index. 
Change-Id: Ia0c4cdcf05fddd12e0e50c2b6343809f80ab5f65
 2014-12-10 13:42:05 -08:00
smain@google.com
0aba9daacd fix distribute nav styles. they were not highlighted correctly. 
Change-Id: I53f727353d263eb8caa62261751be3adcdc18273
 2014-12-10 12:45:02 -08:00
Joe Fernandez
f9d2cd9931 am 844af56b: am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs 
automerge: 15cfa4f

* commit '15cfa4f3012f9bdb39b0c9c0d339b3d76694abfa':
  docs: update debug menu for debugging-studio
 2014-12-10 20:04:31 +00:00
Joe Fernandez
e4e1687d73 am 5a64a475: am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs 
automerge: 4ded0a1

* commit '4ded0a166f96da7bcb377c0573ba373b77fe596e':
  docs:studio basic links
 2014-12-10 19:56:05 +00:00
Joe Fernandez
844af56b85 am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs 
* commit 'efab8b6fd50e2e4ad3adb03c4bca2bc531ae5d42':
  docs: update debug menu for debugging-studio
 2014-12-10 19:54:51 +00:00
Joe Fernandez
5a64a47580 am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs 
* commit '9727d1910052e600ebcf417c9fe55436ecf2c9de':
  docs:studio basic links
 2014-12-10 19:46:37 +00:00
Luan Nguyen
1032dac1f8 am 596d4e72: am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps 
automerge: ee501ed

* commit 'ee501ed8483bc66fbff38769da921a37837297f2':
  docs: Fix text on step 5 of the opt-in steps
 2014-12-10 19:36:26 +00:00
Joe Fernandez
d49977d967 Merge "docs: update debug menu for debugging-studio" into lmp-docs 2014-12-10 19:31:12 +00:00
Rich Slogar
7deca3c93f docs: sdk tools 24.0.1 revisions 
Change-Id: I872aaba5844fe7642874147b158c8119d111162d
 2014-12-10 11:27:59 -08:00
Luan Nguyen
596d4e7230 am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps 
* commit 'c9e5c5f72a563c7b8e030a57cf586941d32006f4':
  docs: Fix text on step 5 of the opt-in steps
 2014-12-10 19:26:37 +00:00
Joe Fernandez
3454091dad Merge "docs:studio basic links" into lmp-docs 2014-12-10 19:23:16 +00:00
Rich Slogar
bea1510573 docs: update debug menu for debugging-studio 
Change-Id: I04c71104b1ac9c0e4413c518ccd41ba3e6a90f8f
 2014-12-10 11:14:15 -08:00
David Friedman
65a01238fc Adds link to related video. 
Change-Id: I22823b0df2863c4e733d389d20440debb16c5631
 2014-12-10 11:14:01 -08:00
Joe Fernandez
c6ff45522b am 17cf7789: am 5ff08052: am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs 
automerge: 39409f2

* commit '39409f28e68d1e43f845497c33167f2688b6bce9':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.
 2014-12-10 19:03:32 +00:00
Ricardo Cervera
fc1e25f30d am d56b7a39: am 504e213f: am ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs 
automerge: a41a241

* commit 'a41a241f6e5ef959b8dcc9656422f20dd41f3ba3':
  docs: Creating Custom Watch Faces training class.
 2014-12-10 19:02:10 +00:00