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

153160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
b32987ec2f am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs 
* commit 'c3daed967d5ad6b4df8547679c30c4d2efd005b3':
  docs: platform updates for api 21
 2014-12-11 00:36:53 +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
378c71a391 am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs 
* commit '235e4be4c92fbc68544f15bebcc6a92ab5d21183':
  docs: sdk tools 24.0.1 revisions
 2014-12-11 00:29:19 +00:00
Andrew Solovay
f43c057ca6 am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes" 
* commit 'c7ad6e9175e232416c22386b80f2c5c9b5031d81':
  docs: Added info about managed profiles to "Android 5.0 Changes"
 2014-12-11 00:29:14 +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
c0f96532ca am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs 
* commit '8cd0bb2df377b2452d5b12ac5057143da4ecb899':
  add helpouts widget to wave 3 pages
 2014-12-10 23:37:52 +00:00
smain@google.com
8cd0bb2df3 Merge "add helpouts widget to wave 3 pages" into lmp-docs 2014-12-10 23:07:38 +00:00
Luan Nguyen
7e1b348ac5 am 4221d7e4: docs: Fix link for moved Android Studio index. 
* commit '4221d7e4cbcea9ea6be56322c7839f31b2afb828':
  docs: Fix link for moved Android Studio index.
 2014-12-10 22:04:20 +00:00
Luan Nguyen
4221d7e4cb docs: Fix link for moved Android Studio index. 
Change-Id: Ia0c4cdcf05fddd12e0e50c2b6343809f80ab5f65
 2014-12-10 13:42:05 -08:00
Joe Fernandez
bdd6aabd1f am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs 
* commit 'd49977d967d7db24466abba9a97084a955f56aff':
  docs: update debug menu for debugging-studio
 2014-12-10 19:38:28 +00:00
Joe Fernandez
d49977d967 Merge "docs: update debug menu for debugging-studio" into lmp-docs 2014-12-10 19:31:12 +00:00
Joe Fernandez
534ae165f3 am 3454091d: Merge "docs:studio basic links" into lmp-docs 
* commit '3454091dad65256730b714d8ce0f89c137c1c0c2':
  docs:studio basic links
 2014-12-10 19:30:37 +00:00
Rich Slogar
7deca3c93f docs: sdk tools 24.0.1 revisions 
Change-Id: I872aaba5844fe7642874147b158c8119d111162d
 2014-12-10 11:27:59 -08: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
Luan Nguyen
8a65df39e6 am 258da738: docs: Fix text on step 5 of the opt-in steps 
* commit '258da738463f547eab859c21d32cbfe0f8345ae2':
  docs: Fix text on step 5 of the opt-in steps
 2014-12-10 19:10:41 +00:00
Luan Nguyen
258da73846 docs: Fix text on step 5 of the opt-in steps 
Bug: 18702823
Change-Id: I294eb017592e896217d7eeea024aa32b9f4f1511
 2014-12-10 10:37:43 -08:00
smain@google.com
1f933dd0cf add helpouts widget to wave 3 pages 
Change-Id: I83c1a0af4975a4544a7f7dcb745bf5fbdf173c6e
 2014-12-10 10:21:36 -08:00
Rich Slogar
8866975b53 docs:studio basic links 
Change-Id: Ib097530baa3035bc83eeb49a3e14eadbac58aca1
 2014-12-10 10:18:09 -08:00
Ricardo Cervera
933005e9e2 am 900efcc9: docs: Add details to Packaging Wearable apps. 
* commit '900efcc91c980a0b30fc1d3017e33e30198b8eb8':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 05:43:00 +00:00
Joe Fernandez
dfd05f0a86 am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs 
* commit '1832978cf6355515016139e453ced187f4b4e29d':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.
 2014-12-10 05:42:56 +00: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
Joe Fernandez
1832978cf6 Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs 2014-12-10 05:35:22 +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
ec656c51ee am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs 
* commit '0024f12dec948d25738c28175ac26d9829b6cd7b':
  docs: Design guidelines for watch faces draft.
 2014-12-10 05:21:30 +00:00
Ricardo Cervera
0024f12dec Merge "docs: Design guidelines for watch faces draft." into lmp-docs 2014-12-10 05:12:50 +00:00
smain@google.com
6554bb45ea 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 language." into lmp-docs 
* commit '1a2308bb8575602689b02379cb96da008f403b5a':
  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 03:32:44 +00:00
smain@google.com
1a2308bb85 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 language." into lmp-docs 2014-12-10 03:28:26 +00:00
Joe Fernandez
c3ae259639 am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs 
* commit '1e82428495ae0c909a7c67dd2f7879ee1e603245':
  docs: Add Distributing to Android Wear doc
 2014-12-10 03:23:06 +00:00
Ricardo Cervera
eb09f89896 am d412b9ab: Merge "docs: Add new classes to Wearable UI library" into lmp-docs 
* commit 'd412b9ab7435ea03392ef3e710a20c0b69056141':
  docs: Add new classes to Wearable UI library
 2014-12-10 03:23:03 +00:00
Ricardo Cervera
be80b98469 am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs 
* commit '0d8f1417209ba0a38a97ae8e31b4ae87e0f1e7c2':
  docs: Add links to wearable support zip for ADT
 2014-12-10 03:22:59 +00:00
Quddus Chong
c24c579770 am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs 
* commit '09e72628fc9e58659c18b1bbbb1a0ec8a5878221':
  docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
 2014-12-10 03:22:54 +00:00
Joe Fernandez
1e82428495 Merge "docs: Add Distributing to Android Wear doc" into lmp-docs 2014-12-10 02:10:07 +00:00
smain@google.com
cf18fa6cd8 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.

Change-Id: I5e4faef8a6eb0a08eec45981a4f9436cb07a995c
 2014-12-09 17:26:07 -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
Quddus Chong
09e72628fc Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs 2014-12-10 00:02:17 +00:00
Rich Slogar
e950ce30bc docs: platform updates for api 21 
Change-Id: I6dd1897641243a19ece0acfd16866cb0d7c3a24a
 2014-12-09 15:49:39 -08:00
Luan Nguyen
cbd0032df2 docs: Add Distributing to Android Wear doc 
Change-Id: I123f53b4d7a1098c1caabc88a1e6fd6dd828d3fb
 2014-12-09 15:30:24 -08:00
Joe Fernandez
6d4818529e am b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs 
* commit 'b35a509d0eb4d9c150630fc6108f4bc039a09043':
  :docs studio tips and tricks headings updates
 2014-12-09 23:04:13 +00:00
Joe Fernandez
b35a509d0e Merge ":docs studio tips and tricks headings updates" into lmp-docs 2014-12-09 22:56:37 +00:00
Quddus Chong
da125f4f12 docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient. 
Change-Id: I240feafe4002884dbb2495ffefc599a76b6b7a35
 2014-12-09 14:44:05 -08:00
Rich Slogar
5053344bb6 :docs studio tips and tricks headings updates 
Change-Id: I5453263b575610b6f418569bdf79f73a693c641b
 2014-12-09 14:23:18 -08:00
Ricardo Cervera
47fa63553b am 5155840b: Merge "docs: Adding links to material design videos" into lmp-docs 
* commit '5155840ba091f62ea3079328b25a620089223887':
  docs: Adding links to material design videos
 2014-12-09 22:16:58 +00:00
Ricardo Cervera
5155840ba0 Merge "docs: Adding links to material design videos" into lmp-docs 2014-12-09 21:16:41 +00:00
Elliott Hughes
12f100def9 am e8f6cb06: Merge "Fix typo." into lmp-docs 
* commit 'e8f6cb065c33c21dfefe0039739dc38fde5cff6d':
  Fix typo.
 2014-12-09 19:22:33 +00:00