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

686 Commits

Author SHA1 Message Date
Eric Gilmore
6b1ecbea31 am 2195f583: am 41ea13c8: am fe7b93f4: Adding links for the last few files requested by PMs. automerge: 8d2af0f automerge: 65e7a2b 
automerge: 982e5eb

* commit '982e5eb3655f20608c1ae492c4366f2fb35cdd2c':
  Adding links for the last few files requested by PMs.
 2014-12-18 02:02:41 +00:00
Eric Gilmore
fe7b93f4f7 Adding links for the last few files requested by PMs. 
Change-Id: If93e894a690ee5bef4b59caa234a97e3f0f7f6e4
 2014-12-17 15:46:37 -08:00
Sarah Maddox
2f39dd777f am 91a41ac1: am 99c5ac9e: am 48f9c8e4: am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs automerge: 8f0f627 
* commit '91a41ac173b2515bbd110ab3bfc0f95bc25bfc8e':
  docs: Updates lesson 1 of location API training: Get last-known location.
 2014-12-16 11:02:44 +00:00
Sarah Maddox
65dc25da3f docs: Updates lesson 1 of location API training: Get last-known location. 
Uses GoogleApiClient to connect to Play services.
Uses the latest Fused Location Provider API.
Updates the entire tutorial and code sample for clarity and correctness.

Bug: 17109822
Change-Id: I759a184a72d50702030b898a5f2e240cd3bdf4be
 2014-12-15 16:55:36 +11:00
Narayan Kamath
93bb5419aa Merge "Remove references to apache-http from various documents." 2014-12-12 14:56:44 +00:00
Narayan Kamath
56eb989791 Remove references to apache-http from various documents. 
Most of them are pointless links to a "text/plain" constant which are
far clearer when inlined with the relevant text.

Change-Id: Iaed51b4548cb2836741106dc19c9cf500c205d32
 2014-12-12 14:55:18 +00:00
Ricardo Cervera
dd4b92b3fa am c0276ebd: am af7070e6: am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs automerge: 575c8c9 
* commit 'c0276ebd93554b9c3bfde2587b00ca79afa6ed05':
  docs: Fixes to watch faces docs.
 2014-12-12 04:25:54 +00:00
Ricardo Cervera
9fe34d9037 Merge "docs: Fixes to watch faces docs." into lmp-docs 2014-12-11 19:28:41 +00: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
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
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
smain@google.com
1f933dd0cf add helpouts widget to wave 3 pages 
Change-Id: I83c1a0af4975a4544a7f7dcb745bf5fbdf173c6e
 2014-12-10 10:21:36 -08:00
Ricardo Cervera
900efcc91c docs: Add details to Packaging Wearable apps. 
Bug: 17943949

(cherry picked from commit 07c9c63e3dd7ee6c752abed3ba54faa949184ca8)

Change-Id: I765285b7e1a17928778ac161c73b2e48b82b54d6
 2014-12-10 05:36:09 +00:00
Ricardo Cervera
ea15366ae3 am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs 
* commit '26e2105575939918e362f14b854176bc54e39b44':
  docs: Creating Custom Watch Faces training class.
 2014-12-10 05:34:39 +00:00
Ricardo Cervera
c6361d8df2 Merge "docs: Add details to Packaging Wearable apps." into lmp-dev 2014-12-10 05:32:19 +00:00
Ricardo Cervera
26e2105575 Merge "docs: Creating Custom Watch Faces training class." into lmp-docs 2014-12-10 05:28:33 +00:00
Ricardo Cervera
7db2979684 docs: Creating Custom Watch Faces training class. 
Bug: 18338418
Bug: 18533881

Change-Id: I71d38c73b6a76c9bec8b646967a93d60b05c639b
 2014-12-09 21:26:58 -08:00
Ricardo Cervera
d412b9ab74 Merge "docs: Add new classes to Wearable UI library" into lmp-docs 2014-12-10 00:56:50 +00:00
Ricardo Cervera
0d8f141720 Merge "docs: Add links to wearable support zip for ADT" into lmp-docs 2014-12-10 00:56:15 +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
Ricardo Cervera
c2d024255e docs: Add new classes to Wearable UI library 
Bug: 18488927

Change-Id: If91993a456bd939f6c51f60500cf325f5eca1d29
 2014-12-09 10:48:23 -08:00
Ricardo Cervera
369de296b4 docs: Add links to wearable support zip for ADT 
Bug: 16651409
Bug: 18488729

Change-Id: I088fc86a469703f81fdc1e6b36395bcee8ecbf28
 2014-12-09 08:34:32 -08:00
Ricardo Cervera-Navarro
c6b1e5f103 am e2c8b5ba: am 2ca0f49d: am 53966f62: am 8242ae16: am dddc2981: am 1782e526: Merge "Revert "docs: Long press to dismiss fix by Wayne"" into lmp-docs 
* commit 'e2c8b5ba1cb39533464f52bda3ee59334737014d':
  Revert "docs: Long press to dismiss fix by Wayne"
 2014-12-09 00:17:14 +00:00
Joe Fernandez
c7a34fc777 am 29fb654e: am f6b890e4: am ac76a16d: am ae80fd42: am f5aa6752: am 709df4fa: Merge "docs: Fixes for App Indexing training class" into lmp-docs 
* commit '29fb654ee95a4c11c8db70c7c9c6133a161672f2':
  docs: Fixes for App Indexing training class
 2014-12-09 00:16:15 +00:00
Luan Nguyen
2abab3dc2f am 4d1b8b6c: am 37579034: am fded024a: am 0e597e92: am 9b5de582: am daab7426: Merge "docs: Update MessageAPI notes to mention the unreliable transmission nature." into lmp-docs 
* commit '4d1b8b6c290973c3f58dd9eb1e164fa8b08d93c0':
  docs: Update MessageAPI notes to mention the unreliable transmission nature.
 2014-12-09 00:16:11 +00:00
smain@google.com
35ee301889 revisions to Studio landing page 
Change-Id: I608b8a63b826f2f2ee2603d7426b501a4df24a38
 2014-12-08 01:26:21 -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
Rich Slogar
f7f20a4557 docs:building your first app [CP] 
Change-Id: I3d810d0043be59a1eecfac7c02631542e9408f01
(cherry picked from commit 0215606d8d58b93d07550ff6e857442306b96aae)
 2014-12-06 09:29:50 +00:00
Scott Rowe
e829d8fca6 docs: Training refactor for Android Studio [CP] 
Cherrypick from lmp-docs hange-Id: I4c396b1a6b689a32b5a3328e9948f363ebb1e37d, from lmp-dev Change-Id: I830da649d9fac2b87eff5ee5cfc3422d5ab65ffc, Cherrypick from klp-modular-docs Change-Id: Ifaae51e4fa3afbef3d81d260135fd348a6ccb612

Change-Id: I09a9473d73eb9c27ee6966b2a0e1cd736575db06
(cherry picked from commit 8c068aeee06efd2ce0827c81e5919e90358c56e3)
 2014-12-06 08:55:21 +00:00
Rich Slogar
0215606d8d docs:building your first app 
Change-Id: I3d810d0043be59a1eecfac7c02631542e9408f01
 2014-12-05 19:39:09 -08:00
Ricardo Cervera-Navarro
1782e526c7 Merge "Revert "docs: Long press to dismiss fix by Wayne"" into lmp-docs 2014-12-05 00:28:00 +00:00
Ricardo Cervera-Navarro
dc320a0b70 Revert "docs: Long press to dismiss fix by Wayne" 
This reverts commit 6ee2ca2f1e24d27c7a1e2430ad0272ef9f921a4a.

Change-Id: I07a196ca1e5ae827a77c9a17ddc90d8e14129f67
 2014-12-05 00:27:09 +00:00
Joe Fernandez
709df4fa26 Merge "docs: Fixes for App Indexing training class" into lmp-docs 2014-12-04 20:50:49 +00:00
Joe Fernandez
71d58705d8 docs: Fixes for App Indexing training class 
b/18244320
b/17982146

Change-Id: Ic095c3c73d09fa2d7f3c08fa47763fa8589683af
 2014-12-04 12:49:45 -08:00
Luan Nguyen
daab7426b2 Merge "docs: Update MessageAPI notes to mention the unreliable transmission nature." into lmp-docs 2014-12-04 18:50:44 +00:00
Luan Nguyen
050d636bbc docs: Update MessageAPI notes to mention the unreliable transmission nature. 
Bug: 17527501
Change-Id: I385747e4453c5079d7a034fbe7377a5fb260fa1d
 2014-12-03 15:31:27 -08:00
Ricardo Cervera
58d3ddae33 am 24d40b30: am ce9936a8: am 152470a2: am 8c71df8d: am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne 
* commit '24d40b302e5dabc6c435b6549ef5801540edfca8':
  docs: Long press to dismiss fix by Wayne
 2014-12-03 00:31:07 +00:00
Ricardo Cervera
6ee2ca2f1e docs: Long press to dismiss fix by Wayne 
Bug: 17924105

Change-Id: Ifbc26b923771e7389e4df6abe9005bc3f0269c1e
 2014-12-02 13:09:45 -08:00
Ricardo Cervera
85ed352c36 am 4c754150: am 0e8c7737: am affe4732: am aa59bf2d: am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class 
* commit '4c75415055eb023d4f868a6f22a7f05a1115a8e0':
  docs: Layout fixes for the Custom UI on Wear class
 2014-12-02 20:07:53 +00:00
Ricardo Cervera
64f4916246 docs: Layout fixes for the Custom UI on Wear class 
Change-Id: I7e499374b5903fb3412c9c42a44c75f7a0bf28f0
 2014-12-02 11:05:22 -08:00
Luan Nguyen
c03fcb74f8 am 3a8d6c80: am a7ee1243: am dc1baa16: am 2711a539: am 16d0ab86: am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs 
* commit '3a8d6c8086d63d6ad38e1af821c66d892a2e6759':
  docs: Update getting started creating Wearable apps with proper prereqs and instructions.
 2014-12-02 17:31:30 +00:00
Luan Nguyen
6cd78bb261 Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs 2014-12-02 16:42:56 +00:00
Luan Nguyen
0eb0c9944c docs: Update getting started creating Wearable apps with proper prereqs and instructions. 
Bug:17392020
Change-Id: I668cd0766a216786b019425474b0bb36c6e12443
 2014-12-01 15:56:11 -08:00
Elliott Hughes
85e21bd534 Mention ProGuard in the JNI documentation. 
(cherry picked from commit 8e1bbfe0f1e4dac35b20972a71656e4c9bf437a1)

Change-Id: I22731dfb94dcc1271b987ed52914e665704dd378
 2014-11-27 10:28:11 -08:00
Elliott Hughes
d3794d681a am 29e1c36d: am 3afb9f63: am 2c53d22b: Merge "Mention ProGuard in the JNI documentation." 
* commit '29e1c36d4b57854a34c5db43e37282b867bf149b':
  Mention ProGuard in the JNI documentation.
 2014-11-27 18:18:51 +00:00
Elliott Hughes
29e1c36d4b am 3afb9f63: am 2c53d22b: Merge "Mention ProGuard in the JNI documentation." 
* commit '3afb9f6378779e6ee355b0b56c47ad7270e2b832':
  Mention ProGuard in the JNI documentation.
 2014-11-27 18:11:58 +00:00
Elliott Hughes
8e1bbfe0f1 Mention ProGuard in the JNI documentation. 
Change-Id: I7822ec1eca0290eba1f4b08eca6794b41172d606
 2014-11-26 10:51:37 -08:00