Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
168,013 Commits 3 Branches 0 Tags
e8079baab3cb379ccd494eca435bccf0bea42ed5
Commit Graph

8095 Commits

Author SHA1 Message Date
Rich Slogar
87e144de8e am fbe9a6af: am 18535b07: am 68c537f1: am 60e74b49: Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev 
* commit 'fbe9a6affc47b7d32e55a347001c2ed4cedc5f31':
  :docs Platform Tools Rel Note Nexus 6/9 dpi updates
 2014-10-16 21:00:45 +00:00
Scott Rowe
6b7bca2cbb am d534cf04: am 0e328222: am c9f6bb8e: am 447369f2: am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 
* commit 'd534cf04f014096e23fa533614a25eafeaafb771':
  docs: update reference to FragmentRetainInstance
 2014-10-16 19:17:06 +00:00
Joe Fernandez
b3b530165b am 3ecfba13: am ebdafcbd: am 518a54ae: am 7e19b402: am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs 
* commit '3ecfba13c015c3dd2c76bde99c4e639cfb7d3584':
  Typo fixed in sample code
 2014-10-16 19:17:00 +00:00
David Friedman
bc6c216540 am 57c63dbf: am b0683f0c: am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev automerge: f8e428d 
* commit '57c63dbf271ebc66c9ce09eaac05b1d1f524944e':
  OpenGL 3.1 and AEP documentation for L-release.
 2014-10-16 19:16:25 +00:00
Rich Slogar
9d2a9772e9 am 436d4df6: am 349e3640: am 70807ab1: Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev automerge: 6b1edcd 
* commit '436d4df6433e444fa08ec8258f48187e67018dda':
  docs:Build and Platform Tools Updates for Android 5
 2014-10-16 19:16:20 +00:00
Andrew Solovay
917a861766 am 3b278f61: am 0b7e1baf: am 34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev automerge: 11014fe 
* commit '3b278f61fb8f52e7601759081f293c7c9b7e1266':
  Moved TV Input Framework (TIF) page out of preview.
 2014-10-16 19:16:15 +00:00
Rich Slogar
8ee2b2dace :docs Platform Tools Rel Note Nexus 6/9 dpi updates 
Change-Id: I34d71a4c42fababbce1ad13dee4fa8f722798e7b
 2014-10-16 12:07:35 -07:00
Scott Rowe
8a1faa9c3d am f1b9b1f9: am f83c56cd: am a3bc95c5: am 8f93624e: docs: delete preview pages 
* commit 'f1b9b1f9927b8ea009a449045020fdac48cf3610':
  docs: delete preview pages
 2014-10-16 18:45:33 +00:00
Scott Rowe
447369f2d2 am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 
* commit 'a1e3063ebe04c8c304f48a02117085962f75cb63':
  docs: update reference to FragmentRetainInstance
 2014-10-16 18:23:42 +00:00
Joe Fernandez
7e19b402c6 am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs 
* commit '2f9ea27c6c95fa53eef0228edc0b3f63dbeb21e7':
  Typo fixed in sample code
 2014-10-16 18:23:18 +00:00
David Friedman
d12e6de645 Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev 2014-10-16 18:06:01 +00:00
Dirk Dougherty
e51d313ce8 am 07d717af: am 7e4a3aec: am 0cd670b3: am a0b3796d: Merge "Doc change: Add diffs for API level 21." into lmp-dev 
* commit '07d717affca58f2a68999e30c1cca34201f87ca4':
  Doc change: Add diffs for API level 21.
 2014-10-16 18:04:58 +00:00
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
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
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
Quddus Chong
9847ff5a54 am e58249f8: am 7ef4ba61: am 073c80d3: am 0a276b94: Merge "docs: Added L API overview." into lmp-dev 
* commit 'e58249f84a4b8b66b178db909106489ad16d77e9':
  docs: Added L API overview.
 2014-10-16 06:55:23 +00:00
Dirk Dougherty
d7ad7a1428 am 382170af: am b175ee29: am 41d5d14d: am 8ca0f84e: Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev 
* commit '382170af6d904efe463cd32a3c392ccf678e787c':
  Doc change: Add diffs for l-preview -> API level 21.
 2014-10-16 06:55:17 +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
a0b3796d93 Merge "Doc change: Add diffs for API level 21." into lmp-dev 2014-10-16 00:20:02 +00:00
Ricardo Cervera
4436006ef5 am 908e1ad4: am 257507c4: am e0cf20b5: am 7e50d970: am dc1f3080: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 
* commit '908e1ad44bfd8de4448560d3374e5350e28c3915':
  docs: Fixing notify link. Bug: 17571861
 2014-10-15 23:56:49 +00:00
Luan Nguyen
7e10f8f931 am e1c07844: am 295d5a76: am faea1ffa: am bff5c193: am c07a288a: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs 
* commit 'e1c07844734f1625cc2336a92301f7e323010899':
  docs: Android Wear Design fixes
 2014-10-15 23:56:43 +00:00
smain@google.com
8d95287864 am 6512c697: am d7ce4f56: am fcebd6c3: am b3994c2e: am e43bb6a9: am 075531ae: add the butterbar for L announce to Preview landing page 
* commit '6512c697ac21b2f71360ac5079be86fce016bb79':
  add the butterbar for L announce to Preview landing page
 2014-10-15 23:56:38 +00:00
smain@google.com
e5c65131c4 am abde6dee: am 235bc036: am 24ff6491: am 2912627e: am 6fbe299f: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 
* commit 'abde6dee74222d4814666ebf4cd3a1d5ea3f9722':
  update analytics event tracking calls to use new script bug: 16331906
 2014-10-15 23:56:33 +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
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
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
Ricardo Cervera-Navarro
8b58a391a1 am 96400c7f: am 8df05a58: am ac293d16: am a4f9c087: am c93723bd: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
* commit '96400c7f93827a78468d2b2f7f22833ae3353152':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-15 02:07:14 +00:00
Rich Slogar
d1baa50d4f am cdfa492e: am b42cd383: am 389e4ccd: am a89ac60e: am 858cfad9: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 
* commit 'cdfa492e2420d97177f32a77e177bb7ba0c5ebb3':
  docs:SDK tools 23.0.5 Release Note
 2014-10-15 02:03:44 +00:00
Nick Kralevich
a26487cb28 am 55bb6a7b: am 01edf579: am fce896fe: am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev 
* commit '55bb6a7b68595ee83b543eda40d191636de1831e':
  Docs: adding closing bracket to un-break javadoc tokens.
 2014-10-15 02:03:37 +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
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