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

8649 Commits

Author SHA1 Message Date
Joe Fernandez
00ba894b49 am 2cbfc845: am 353da3f9: am 88e04fcb: am e9a816c5: am 1f5acf84: docs: December 2014 Dashboard update 
* commit '2cbfc8455d51cb89cdd161f5e46d1f56023c903b':
  docs: December 2014 Dashboard update
 2014-12-01 20:01:15 +00:00
smain@google.com
230df25726 am e979e259: am 77e889ed: am 446bab79: am 7512a46e: am fdff66ee: change Trulia context image 
* commit 'e979e259d22279cd35f9ebcc7b42efbae1b77ce1':
  change Trulia context image
 2014-12-01 20:01:10 +00:00
Joe Fernandez
353da3f98d am 88e04fcb: am e9a816c5: am 1f5acf84: docs: December 2014 Dashboard update 
* commit '88e04fcbc679ae85043d5db4f7f17bbb7fc3f2d3':
  docs: December 2014 Dashboard update
 2014-12-01 19:44:04 +00:00
smain@google.com
77e889ed84 am 446bab79: am 7512a46e: am fdff66ee: change Trulia context image 
* commit '446bab79564e50c497e6ce5cf75a30ddd94855fe':
  change Trulia context image
 2014-12-01 19:43:58 +00:00
Scott Main
46f0ffa99b am cd79f9f0: am 4a45a441: am 2995bd80: am 5a27b4b8: am fc793074: Merge "docs:advmgr-updates" into lmp-docs 
* commit 'cd79f9f0f4a3fb3527023450839313aa67e5e106':
  docs:advmgr-updates
 2014-12-01 19:32:31 +00:00
smain@google.com
183d9e4a75 am b8de593e: am 576e248f: am 277fb8fd: am d3c17270: am 3a4b011c: define height for context images to avoid content jumps on load 
* commit 'b8de593ec2ca04009835960357c59feff28af551':
  define height for context images to avoid content jumps on load
 2014-12-01 19:32:25 +00:00
Joe Fernandez
1f5acf8480 docs: December 2014 Dashboard update 
Change-Id: I80e2477d02ef5eb0964ae6e68ffa11d703db4fe5
 2014-12-01 10:40:54 -08:00
smain@google.com
fdff66ee03 change Trulia context image 
Change-Id: I99e43b358af518750cf7ddae4856bb8ee42729f5
 2014-12-01 09:40:42 -08:00
Elliott Hughes
07b4a29131 am 3e2848d2: am 8fc88562: am 85e21bd5: Mention ProGuard in the JNI documentation. 
* commit '3e2848d249cafbf1cc79b600eab9bce055adcf8e':
  Mention ProGuard in the JNI documentation.
 2014-11-27 18:57:00 +00: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
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
Scott Main
4a45a44152 am 2995bd80: am 5a27b4b8: am fc793074: Merge "docs:advmgr-updates" into lmp-docs 
* commit '2995bd8033ecbf4e1a5b3392ec27008d2d184b8a':
  docs:advmgr-updates
 2014-11-27 10:08:51 +00:00
smain@google.com
576e248f3c am 277fb8fd: am d3c17270: am 3a4b011c: define height for context images to avoid content jumps on load 
* commit '277fb8fdaeb546119bc31269425edc72b75e87dd':
  define height for context images to avoid content jumps on load
 2014-11-27 10:08:45 +00:00
Elliott Hughes
8e1bbfe0f1 Mention ProGuard in the JNI documentation. 
Change-Id: I7822ec1eca0290eba1f4b08eca6794b41172d606
 2014-11-26 10:51:37 -08:00
smain@google.com
804830f83c am 357efcd1: am ee032263: am 9da0881f: am 59f4624a: am be718f7c: Merge "add wear design guide for contextual apps" into lmp-docs 
* commit '357efcd1d9b23036bd4e858155696ed2ed27f5dc':
  add wear design guide for contextual apps
 2014-11-26 18:41:53 +00:00
Scott Main
fc79307406 Merge "docs:advmgr-updates" into lmp-docs 2014-11-26 03:13:27 +00:00
smain@google.com
3a4b011c9e define height for context images to avoid content jumps on load 
Change-Id: I95fb6d628f8be12c31c0b7fa2978dd266f72dbf6
 2014-11-25 18:05:39 -08:00
smain@google.com
ee03226304 am 9da0881f: am 59f4624a: am be718f7c: Merge "add wear design guide for contextual apps" into lmp-docs 
* commit '9da0881ffbcdc566cc1bf60b817ab4f617d0049a':
  add wear design guide for contextual apps
 2014-11-26 00:59:45 +00:00
Rich Slogar
0ed88b9a2e docs:advmgr-updates 
Change-Id: I4895f8dc91d0397a615a358d97cbd229b171f507
 2014-11-25 16:40:28 -08:00
smain@google.com
be718f7ceb Merge "add wear design guide for contextual apps" into lmp-docs 2014-11-26 00:18:59 +00:00
smain@google.com
98ee16c52a add wear design guide for contextual apps 
Change-Id: I2c5709f02352def34c5c6a0c7dcf7193ebd58e4f
 2014-11-25 16:12:48 -08:00
Natalie Masse
18c295bf8b am a05d4a4b: am 8d9e6434: am 65e51fcd: am d7c7d275: am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs 
* commit 'a05d4a4bb38df792cbf19a0f1e198a26f1509281':
  Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
 2014-11-25 18:45:38 +00:00
Dirk Dougherty
e264e1f046 am be8da57a: am 5977f7d5: am d23a8692: am 14e40f04: am fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861 
* commit 'be8da57a33103f9257d1a23eee372a703d8c181a':
  Doc change: zh-cn translation of Android L overviews. cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
 2014-11-25 18:45:11 +00:00
smain@google.com
cde2015889 am f00d46db: am 79b496e8: am 75cd7c74: am 5f3ba993: am 1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs 
* commit 'f00d46db377b97da673f8699928d8343b3bc132d':
  add intro videos (w/ shadowbox) to Auto and Wear landing pages.
 2014-11-25 17:38:15 +00:00
Natalie Masse
8d9e64343d am 65e51fcd: am d7c7d275: am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs 
* commit '65e51fcda25c33cdfa73e8ca3a4f71cf987bd0d2':
  Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
 2014-11-25 11:22:05 +00:00
Natalie Masse
77283ec981 Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs 2014-11-25 11:05:52 +00:00
Dirk Dougherty
5977f7d520 am d23a8692: am 14e40f04: am fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861 
* commit 'd23a8692ac96b7da73949d2dc4c549e73931609c':
  Doc change: zh-cn translation of Android L overviews. cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
 2014-11-25 02:58:25 +00:00
Dirk Dougherty
fd117ff2a4 Doc change: zh-cn translation of Android L overviews. 
cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861

Change-Id: Ic02b747917b11a88c2adf38a73c046dc32af6ce9
 2014-11-24 17:39:14 -08:00
smain@google.com
79b496e867 am 75cd7c74: am 5f3ba993: am 1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs 
* commit '75cd7c74ab38a55914f1658234a0031c907eb3ed':
  add intro videos (w/ shadowbox) to Auto and Wear landing pages.
 2014-11-24 19:11:04 +00:00
smain@google.com
1b23ee962a Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs 2014-11-24 18:51:03 +00:00
Natalie Masse
e24908e342 Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation 
Change-Id: Ie433d4bfd7ac7fd2e524a201497c250a7aede47d
 2014-11-24 18:38:00 +00:00
Eino-Ville Talvala
bd9567e156 am e289082a: am dfa99f63: Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev 
* commit 'e289082a7066a86032190aa100425ce29cd2a4f2':
  Camera: Add new capability flags as system features as well
 2014-11-24 18:05:40 +00:00
Joe Fernandez
7ce31112b2 am 0c7d2d2f: am 85f463c5: am fbdfdef4: am 9034ead0: am 5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources 
* commit '0c7d2d2fa8ce801d608db2da6670d10720eaea16':
  docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
 2014-11-24 18:05:17 +00:00
Scott Rowe
7863922116 am 9e9d1cd3: am a505d0be: am 63108ee3: am 02cb1fe6: am 14f78ed7: Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs 
* commit '9e9d1cd3ff536e8c9d00469f01b00b94fe73e0a2':
  docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
 2014-11-24 18:05:11 +00:00
smain@google.com
43eabc8f13 add intro videos (w/ shadowbox) to Auto and Wear landing pages. 
Change-Id: Ieb730416b7a469c7cbd0e80d1e9f74f14a7adb70
 2014-11-24 09:25:00 -08:00
Eino-Ville Talvala
dfa99f6367 Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev 2014-11-22 04:57:49 +00:00
Joe Fernandez
85f463c5b5 am fbdfdef4: am 9034ead0: am 5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources 
* commit 'fbdfdef43da5d946e8559d47d8bd79db0bceedb1':
  docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
 2014-11-22 00:25:13 +00:00
Scott Rowe
a505d0becb am 63108ee3: am 02cb1fe6: am 14f78ed7: Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs 
* commit '63108ee3623cc2b57c3a0a2e730dc9bf5c06c825':
  docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
 2014-11-22 00:24:51 +00:00
Joe Fernandez
5b94d00b89 docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources 
- Chinese pages are showing Japanese (not good)
- Chinese resource page is not rendering because of bad video links

Change-Id: Ia4508c2db85b9cbd5bdad34ae8bedc411df98360
 2014-11-21 20:27:13 +00:00
Scott Rowe
14f78ed7b8 Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs 2014-11-21 17:34:29 +00:00
Ricardo Cervera
bc250401fe am d4ea7b3c: am 9aede602: am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev automerge: 161dce4 
* commit 'd4ea7b3cb626dbd807fed9477c50726fb7dd38a2':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 10:26:37 +00:00
Andrew Solovay
a1c2b6a9e9 am d3e2fd99: am c79173c7: am 05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs automerge: b5b9c9b 
automerge: 5a75a66

* commit '5a75a660c0db30fcf0ab748d9907ec2374603232':
  docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
 2014-11-21 10:23:22 +00:00
Dirk Dougherty
448d1ffcad am 40343340: am ef629f1f: am a79acc03: Doc change: localized content. automerge: 4d82f8a 
automerge: 1896e58

* commit '1896e5890489842aad280402d6144d272bce6730':
  Doc change: localized content.
 2014-11-21 10:21:02 +00:00
smain@google.com
2dc4cfa096 am 74bafd41: am 555d6e70: am 2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs automerge: 6e08d30 
automerge: 39d6b21

* commit '39d6b21ee5021d3efd1bb4e8f2041d9d8251c298':
  add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
 2014-11-21 10:19:49 +00:00
Quddus Chong
5b51858dc2 am ecccf10b: am 5b944f4a: am 8428c114: am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. automerge: a1e1890 
* commit 'ecccf10b42e0964bd5ee77f1f3fe3094b53d788c':
  docs: Added link to CarExtender class from Auto Getting Started doc.
 2014-11-21 10:17:06 +00:00
Ricardo Cervera
9aede602ff am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev 
automerge: 161dce4

* commit '161dce465ef528568eac119235e635b217322485':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 10:15:17 +00:00
Andrew Solovay
d3e2fd99e2 am c79173c7: am 05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs 
automerge: b5b9c9b

* commit 'b5b9c9b589c058d9e21ca23976d7574f9c604e38':
  docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
 2014-11-21 10:12:52 +00:00
Elliott Hughes
2d7320066f am 03c80408: am 6c43e6b5: Fix and be more explicit about plurals best practices. 
automerge: 4db3fc1

* commit '4db3fc1c28d3894aed92c5aae40f25e713a69894':
  Fix and be more explicit about plurals best practices.
 2014-11-21 10:11:34 +00:00
Dirk Dougherty
403433401b am ef629f1f: am a79acc03: Doc change: localized content. 
automerge: 4d82f8a

* commit '4d82f8ad32f9caa3aff237600c4693f8907009e9':
  Doc change: localized content.
 2014-11-21 10:10:32 +00:00
smain@google.com
74bafd41af am 555d6e70: am 2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs 
automerge: 6e08d30

* commit '6e08d30da4db5fc8a433b93f16ada2bcf6d1a5cd':
  add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
 2014-11-21 10:09:15 +00:00