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

8236 Commits

Author SHA1 Message Date
Rich Slogar
70807ab128 Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev 2014-10-16 17:10:49 +00:00
Andrew Solovay
2fe578301a am 34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev 
* commit '34ef4ff9b7a3625477b0eccd20db15129f2732f3':
  Moved TV Input Framework (TIF) page out of preview.
 2014-10-16 17:08:20 +00:00
Andrew Solovay
34ef4ff9b7 Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev 2014-10-16 17:03:02 +00:00
Rich Slogar
54444f66a4 docs:Build and Platform Tools Updates for Android 5 
Change-Id: Ib7adf35c302d24a1c2394a89b3a04ca8d77cd296
 2014-10-16 10:02:22 -07:00
Scott Rowe
a1e3063ebe am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 
* commit 'ab64919c0e683dcd0f32f95f580f0d95ce29476d':
  docs: update reference to FragmentRetainInstance
 2014-10-16 17:01:04 +00:00
Scott Rowe
ab64919c0e Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 2014-10-16 16:56:55 +00:00
Scott Rowe
1d5f5ef077 am 8f93624e: docs: delete preview pages 
* commit '8f93624eafd3518d97c88506bbb9a93c81eb7f03':
  docs: delete preview pages
 2014-10-16 16:45:05 +00:00
Scott Rowe
8f93624eaf docs: delete preview pages 
Change-Id: I76b6b8545bfed3ad0604043105ccf4795ab8be62
 2014-10-16 09:39:04 -07:00
Joe Fernandez
2f9ea27c6c am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs 
* commit '58c64870a8f3505d032ec7c5ac0fc4faba08347a':
  Typo fixed in sample code
 2014-10-16 14:39:16 +00:00
Joe Fernandez
58c64870a8 Merge "Typo fixed in sample code" into klp-modular-docs 2014-10-16 14:34:47 +00:00
David Friedman
778d3552d6 OpenGL 3.1 and AEP documentation for L-release. 
Change-Id: I21b75a6f38977729fa8c1c94c66354054bdb780c
 2014-10-15 19:59:43 -07:00
Dirk Dougherty
3e9ee941f7 am a0b3796d: Merge "Doc change: Add diffs for API level 21." into lmp-dev 
* commit 'a0b3796d937dff83b5dd94e8f091a36bc9b304dd':
  Doc change: Add diffs for API level 21.
 2014-10-16 00:23:32 +00:00
Dirk Dougherty
a0b3796d93 Merge "Doc change: Add diffs for API level 21." into lmp-dev 2014-10-16 00:20:02 +00:00
Quddus Chong
11e613963a am 0a276b94: Merge "docs: Added L API overview." into lmp-dev 
* commit '0a276b9448d907822bee1c3009608694fc480fcc':
  docs: Added L API overview.
 2014-10-15 23:59:00 +00:00
Dirk Dougherty
a197af5d1b am 8ca0f84e: Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev 
* commit '8ca0f84ea3c6f17e7d0121a87197bfd25f9becfa':
  Doc change: Add diffs for l-preview -> API level 21.
 2014-10-15 23:58:49 +00:00
Quddus Chong
0a276b9448 Merge "docs: Added L API overview." into lmp-dev 2014-10-15 23:26:43 +00:00
Dirk Dougherty
8ca0f84ea3 Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev 2014-10-15 22:40:19 +00:00
Dirk Dougherty
6034230b29 Doc change: Add diffs for API level 21. 
Change-Id: I6efad4bb407dbfc7684a5651788e116d624e778e
 2014-10-15 15:06:50 -07:00
Dirk Dougherty
963dca1a5d Doc change: Add diffs for l-preview -> API level 21. 
Change-Id: Ie60fbe9ed5891dd87fd9ca53f126c4617e09d3bd
 2014-10-15 14:59:15 -07:00
Quddus Chong
ccd80045a3 docs: Added L API overview. 
Change-Id: Idd042b41a99f61faa6b011c2900210ed38b017b9
 2014-10-15 13:25:55 -07:00
Ricardo Cervera
05957deeb9 am 7e50d970: am dc1f3080: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 
* commit '7e50d9706cd0d7cd5c58c976fd582c81478a975c':
  docs: Fixing notify link. Bug: 17571861
 2014-10-15 19:21:58 +00:00
Luan Nguyen
892f693e12 am bff5c193: am c07a288a: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs 
* commit 'bff5c1932c6bdd2a777b4236f9f1d562a53029fb':
  docs: Android Wear Design fixes
 2014-10-15 19:21:53 +00:00
smain@google.com
e2b8270c78 am b3994c2e: am e43bb6a9: am 075531ae: add the butterbar for L announce to Preview landing page 
* commit 'b3994c2e58c7cebef8274ff6d801819a2b189183':
  add the butterbar for L announce to Preview landing page
 2014-10-15 19:21:48 +00:00
smain@google.com
1ca528ee4e am 2912627e: am 6fbe299f: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 
* commit '2912627e007b95cf4b16c9e52a3acbec0c8bae60':
  update analytics event tracking calls to use new script bug: 16331906
 2014-10-15 19:21:43 +00:00
Ricardo Cervera
7e50d9706c am dc1f3080: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 
* commit 'dc1f308048a732572fae3cf92ddfe5cd943c0059':
  docs: Fixing notify link. Bug: 17571861
 2014-10-15 19:12:26 +00:00
Luan Nguyen
bff5c1932c am c07a288a: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs 
* commit 'c07a288a889ac88282118d4089e969f20c1aabe3':
  docs: Android Wear Design fixes
 2014-10-15 19:12:18 +00:00
smain@google.com
b3994c2e58 am e43bb6a9: am 075531ae: add the butterbar for L announce to Preview landing page 
* commit 'e43bb6a9ec8cd0841926e7df8cc738d5357814c1':
  add the butterbar for L announce to Preview landing page
 2014-10-15 19:12:05 +00:00
smain@google.com
2912627e00 am 6fbe299f: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 
* commit '6fbe299fa5bcc084cd69899afdc3c77767b7c1f5':
  update analytics event tracking calls to use new script bug: 16331906
 2014-10-15 19:11:43 +00:00
Vince Harron
1c9cff294a Updated Android SDK/Studio system requirements 
We're not really supporting ancient Linux/OSX systems, we should
update the website to accurately reflect this.

Change-Id: Id05df4c4e2a4235d325e099a1f29fb7cbe749675
 2014-10-15 10:57:19 -07:00
Andrew Solovay
bab257453b Moved TV Input Framework (TIF) page out of preview. 
See first comment on CL for the doc staging location. Setting up a
redirect for the old page with CL http://ag/566783

Change-Id: Ibd391cb3fe357495ecf3dc70b1edeadee12075f3
 2014-10-15 10:10:11 -07:00
Ricardo Cervera
dc1f308048 am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 
* commit '8a7ba4c681d16aab194e1c4ab7b7bfcce5012d17':
  docs: Fixing notify link. Bug: 17571861
 2014-10-15 15:50:42 +00:00
Ricardo Cervera
8a7ba4c681 Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 2014-10-15 15:47:31 +00:00
Luan Nguyen
c07a288a88 am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs 
* commit '2a364235d27245d999bb1d6e7621c0d6a0e89ef0':
  docs: Android Wear Design fixes
 2014-10-15 15:17:40 +00:00
Luan Nguyen
2a364235d2 Merge "docs: Android Wear Design fixes" into klp-modular-docs 2014-10-15 15:12:24 +00:00
smain@google.com
e43bb6a9ec am 075531ae: add the butterbar for L announce to Preview landing page 
* commit '075531ae190dd6e64d3a53991a209a624cb0ec63':
  add the butterbar for L announce to Preview landing page
 2014-10-15 03:36:11 +00:00
smain@google.com
075531ae19 add the butterbar for L announce to Preview landing page 
Change-Id: Id84a5a62153281b3daaefc287450d392ecb51bbc
 2014-10-14 19:39:11 -07:00
smain@google.com
6fbe299fa5 am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 
* commit 'd8d20f52ec0550477b773cee4c0f0343f2a9301f':
  update analytics event tracking calls to use new script bug: 16331906
 2014-10-15 02:15:35 +00:00
smain@google.com
d8d20f52ec update analytics event tracking calls to use new script 
bug: 16331906

Change-Id: I4cd8f08509cfb887a424696553404ba3c635151b
 2014-10-14 19:03:08 -07:00
Ricardo Cervera-Navarro
fb213fe222 am a4f9c087: am c93723bd: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
* commit 'a4f9c0873f1d414d6721989f44d88de9a1f6d01a':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-14 22:31:25 +00:00
Ricardo Cervera-Navarro
a4f9c0873f am c93723bd: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
* commit 'c93723bdf9b2ce4dc0426817b8bec924d9f97a79':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-14 22:27:21 +00:00
Ricardo Cervera-Navarro
c93723bdf9 am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
* commit '7668aa27999e5650fe8776853565f792311fb57d':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-14 22:20:02 +00:00
Ricardo Cervera-Navarro
7668aa2799 am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
* commit 'aa7bcf140d95049f1482c896b770de7ba339f7c9':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-14 22:14:16 +00:00
Ricardo Cervera-Navarro
aa7bcf140d Merge "Revert "docs: Watermarked images for codes that weren't found."" into klp-docs 2014-10-14 21:59:48 +00:00
Rich Slogar
21bb71e4d8 am a89ac60e: am 858cfad9: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 
* commit 'a89ac60e25eb77b4c605fc1a40c96416b199bea5':
  docs:SDK tools 23.0.5 Release Note
 2014-10-14 16:04:16 +00:00
Rich Slogar
a89ac60e25 am 858cfad9: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 
* commit '858cfad9482817305cc5b846102c3f8e5d12782a':
  docs:SDK tools 23.0.5 Release Note
 2014-10-14 15:55:37 +00:00
Nick Kralevich
0763a03d22 am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev 
* commit '0ae82b05be47df85551a1c759a93e84c8009947c':
  Docs: adding closing bracket to un-break javadoc tokens.
 2014-10-14 15:50:15 +00:00
Ricardo Cervera-Navarro
0813e29817 Revert "docs: Watermarked images for codes that weren't found." 
Remove easter eggs.

This reverts commit 453df8e6e33f30808ea2244eaa1dd32169996129.

Change-Id: Iaa8c815a876d163c35cc83f3cf4899dd426def7b
 2014-10-14 15:49:07 +00:00
Nick Kralevich
0ae82b05be resolved conflicts for merge of a4eb81b6 to lmp-dev 
Change-Id: I73b225141e09826b40e4941140b59d1c163bd9c7
 2014-10-14 08:38:05 -07:00
Sarah Maddox
948417f4be am 8601b1b1: Merge "Fixed a typo in Perf Tips." into lmp-dev 
* commit '8601b1b1ca75512177aa3539d33292250b5c9a2d':
  Fixed a typo in Perf Tips.
 2014-10-13 22:03:37 +00:00
Sarah Maddox
8601b1b1ca Merge "Fixed a typo in Perf Tips." into lmp-dev 2014-10-13 21:50:30 +00:00