Commit Graph

15777 Commits

Author SHA1 Message Date
Leandro Gracia Gil
653fe8eb04 Add the protobuf compiler binary to the Windows SDK build.
Change-Id: I0acca9fc39b8b5528a1ca4bf25b0bacb32b515e2
2014-07-28 15:25:41 -07:00
Andrew Hsieh
a08cfcad45 am 4bfb4d31: am c59b1400: am 0efeb2c6: Merge "Fix the name of the native app glue lib in a header comment"
* commit '4bfb4d3100659dd51bd0d0779de3b2d5d1ee635b':
  Fix the name of the native app glue lib in a header comment
2014-07-28 02:19:11 +00:00
Andrew Hsieh
4bfb4d3100 am c59b1400: am 0efeb2c6: Merge "Fix the name of the native app glue lib in a header comment"
* commit 'c59b1400fdf39d126d668513449af12dc8ad9646':
  Fix the name of the native app glue lib in a header comment
2014-07-28 02:16:22 +00:00
Andrew Hsieh
c59b1400fd am 0efeb2c6: Merge "Fix the name of the native app glue lib in a header comment"
* commit '0efeb2c66bff9b36feecd9315d14d2afb46e4669':
  Fix the name of the native app glue lib in a header comment
2014-07-28 02:12:07 +00:00
Craig Stout
a38b253ebb Merge "Add playback progress." into lmp-dev 2014-07-27 22:35:46 +00:00
Craig Stout
085f437232 Add playback progress.
Change-Id: I9401b46c34e440de14e7cb794a1c3a1733e0d46c
2014-07-25 20:32:25 -04:00
Alan Lau
a63f153934 am b6759681: am afb9296e: am 050972b1: am 2d0d6541: Change setScrollVertically to protected to make scroll work in subclasses.
* commit 'b6759681230574590842edcf8445eec009f3f802':
  Change setScrollVertically to protected to make scroll work in subclasses.
2014-07-25 19:30:57 +00:00
Alan Lau
b675968123 am afb9296e: am 050972b1: am 2d0d6541: Change setScrollVertically to protected to make scroll work in subclasses.
* commit 'afb9296e531adcb5db49b115db4d91d151a8d82f':
  Change setScrollVertically to protected to make scroll work in subclasses.
2014-07-25 19:19:14 +00:00
Alan Lau
afb9296e53 am 050972b1: am 2d0d6541: Change setScrollVertically to protected to make scroll work in subclasses.
* commit '050972b1231819fd2c854ef9bba10d6f6f8b5f00':
  Change setScrollVertically to protected to make scroll work in subclasses.
2014-07-25 18:51:10 +00:00
Alan Lau
050972b123 am 2d0d6541: Change setScrollVertically to protected to make scroll work in subclasses.
* commit '2d0d65410410185c70b2221bdfa8b4c1e4a175d5':
  Change setScrollVertically to protected to make scroll work in subclasses.
2014-07-25 18:32:33 +00:00
Alan Lau
2d0d654104 Change setScrollVertically to protected to make scroll work in subclasses.
setScrollVertically is called by the animator and if it has no access to the
method in the subclass.  This will allow 3P app to extend the view.

Change-Id: I976355168fe1ed4e1f70b66aaab27ca16214dc05
2014-07-25 11:03:48 -07:00
Craig Stout
8a60b3a4b2 am c375cc14: am fb9584cf: Merge "Add PlaybackOverlayFragment" into lmp-dev
* commit 'c375cc1485e42525f5d6a958b99e62cce5e51146':
  Add PlaybackOverlayFragment
2014-07-25 16:15:14 +00:00
Craig Stout
c375cc1485 am fb9584cf: Merge "Add PlaybackOverlayFragment" into lmp-dev
* commit 'fb9584cf67e2335d844dc84d70f7e80aee2d0b00':
  Add PlaybackOverlayFragment
2014-07-25 16:11:07 +00:00
Andrew Hsieh
0efeb2c66b Merge "Fix the name of the native app glue lib in a header comment" 2014-07-25 11:19:19 +00:00
Martin Storsjo
4ff22dcdcb Fix the name of the native app glue lib in a header comment
The incorrect name is misleading and confusing.

Change-Id: I4040d7bc10370c440401dd9de7e1fc472830287a
2014-07-27 22:15:58 +03:00
Alan Viverette
6d239884eb am 095e3946: am 974dc59d: Update ApiDemos themes, remove targetSdkVersion
* commit '095e3946f0c525025e63e7d8f0bc0f409b1a1263':
  Update ApiDemos themes, remove targetSdkVersion
2014-07-24 23:51:55 +00:00
Alan Viverette
095e3946f0 am 974dc59d: Update ApiDemos themes, remove targetSdkVersion
* commit '974dc59d6303a4aef6015858f935ae446c24dab2':
  Update ApiDemos themes, remove targetSdkVersion
2014-07-24 23:35:43 +00:00
Alan Viverette
974dc59d63 Update ApiDemos themes, remove targetSdkVersion
Change-Id: Iba8d56a1cde52d082e7a5111874460e6120b011e
2014-07-24 13:47:07 -07:00
Dongwon Kang
d256f606ef Merge "Remove AtscTvInput in favor of having another sample input under developers." into lmp-dev 2014-07-24 16:04:26 +00:00
Dongwon Kang
4746c9797a Remove AtscTvInput in favor of having another sample input under developers.
- The real sample app for developers will be located under developers/ and
  managed by dev-rel team.

Change-Id: I6d190b2c9a24ad64e79e3fd1c1c824abeda2eb3f
2014-07-29 14:56:06 +09:00
Craig Stout
fb9584cf67 Merge "Add PlaybackOverlayFragment" into lmp-dev 2014-07-24 15:36:51 +00:00
Craig Stout
7e736a4df2 Add PlaybackOverlayFragment
Change-Id: If4c5b2f747885948e0bae422d9d30eec11c027b9
2014-07-24 06:49:35 -07:00
Dake Gu
c4b794b8af am dcf85159: am d54e6b19: SupportLeanbackDemo: activity transition
* commit 'dcf85159fed7e7cfc99bc854ac193b393cf64abb':
  SupportLeanbackDemo: activity transition
2014-07-23 22:05:03 +00:00
Dake Gu
dcf85159fe am d54e6b19: SupportLeanbackDemo: activity transition
* commit 'd54e6b19e4639412fbbb19bf478034634c2907c5':
  SupportLeanbackDemo: activity transition
2014-07-23 22:00:47 +00:00
Dake Gu
d54e6b19e4 SupportLeanbackDemo: activity transition
b/15024618

Change-Id: Ib23746360984f3bbe255e8f75df30c7422b553f2
2014-07-23 14:37:16 -07:00
Sky Faber
e83d6400fb idegen: Skip directories named *.java when parsing source.
Change-Id: I8a6700ebcc198851b80de4832a43d147dc887f3a
2014-07-23 13:50:52 -07:00
Griff Hazen
70d7a611ba am 4be1723b: (-s ours) am 3815535c: am 1fd1d233: (-s ours) am 7003893f: DO NOT MERGE Update version of sdk 20 samples to 2
* commit '4be1723bf3715569b97764e0003fd022367a6725':
  DO NOT MERGE Update version of sdk 20 samples to 2
2014-07-23 00:25:50 +00:00
Griff Hazen
4be1723bf3 am 3815535c: am 1fd1d233: (-s ours) am 7003893f: DO NOT MERGE Update version of sdk 20 samples to 2
* commit '3815535c4a97fa25fb138d681ae69e7bc1f99bdf':
  DO NOT MERGE Update version of sdk 20 samples to 2
2014-07-23 00:18:51 +00:00
Griff Hazen
3815535c4a am 1fd1d233: (-s ours) am 7003893f: DO NOT MERGE Update version of sdk 20 samples to 2
* commit '1fd1d233d3de26873e08f78e16ed6be41d969369':
  DO NOT MERGE Update version of sdk 20 samples to 2
2014-07-23 00:03:19 +00:00
Griff Hazen
1fd1d233d3 am 7003893f: DO NOT MERGE Update version of sdk 20 samples to 2
* commit '7003893fce1691208e34de884c5372acb90a57e2':
  DO NOT MERGE Update version of sdk 20 samples to 2
2014-07-22 23:59:14 +00:00
Griff Hazen
7003893fce DO NOT MERGE Update version of sdk 20 samples to 2
To allow for a release of new API 20 samples.

Bug: 16158275

Change-Id: I459af267ec76271df10d93cf99439d40883d3a83
2014-07-22 15:01:22 -07:00
Jean-Luc Brouillet
48cc8e74d1 am 62e0ab89: am 58668fc5: Merge "Fix directory where CtsTestStubs.apk is found." into lmp-dev
* commit '62e0ab8946f85fba197518771c9fa7b1d8951306':
  Fix directory where CtsTestStubs.apk is found.
2014-07-22 21:55:52 +00:00
Jean-Luc Brouillet
62e0ab8946 am 58668fc5: Merge "Fix directory where CtsTestStubs.apk is found." into lmp-dev
* commit '58668fc5a502e159d1daf79540ee9039153a2697':
  Fix directory where CtsTestStubs.apk is found.
2014-07-22 21:47:48 +00:00
Jean-Luc Brouillet
58668fc5a5 Merge "Fix directory where CtsTestStubs.apk is found." into lmp-dev 2014-07-22 16:29:55 +00:00
Xavier Ducrohet
9abbf84587 am cf946b95: (-s ours) Merge "Update revision of sys-img. do not merge." into lmp-preview-dev
* commit 'cf946b955b4f818c1540a8f6c48453c1d0cf651a':
  Update revision of sys-img. do not merge.
2014-07-22 15:53:58 +00:00
Ying Wang
023ee00821 am 99d2b20c: am 06a0ec0b: new installation path of apks.
* commit '99d2b20cc6b94dfd8584a4007a0b3fbfe78316e0':
  new installation path of apks.
2014-07-21 23:25:59 +00:00
Ying Wang
99d2b20cc6 am 06a0ec0b: new installation path of apks.
* commit '06a0ec0b97451c9b31afb646cb47c557bf8459cb':
  new installation path of apks.
2014-07-21 23:20:56 +00:00
Jean-Luc Brouillet
3bc1e46683 Fix directory where CtsTestStubs.apk is found.
Empirically, it's now found in a subdirectory named CtsTestStubs.

Change-Id: Iae50c37ac7655f0b32cc2cc5a1b50371d1397b54
2014-07-21 16:09:31 -07:00
Ying Wang
06a0ec0b97 new installation path of apks.
To fix the SDK build.

Change-Id: I6c401e791bd59367bbd058f323db0d94bf623db5
2014-07-21 16:05:30 -07:00
Chulwoo Lee
909f697316 am c7269687: am 9f688cc1: Merge "Put input ID when inserting channels" into lmp-dev
* commit 'c72696874638bbc9d0be5adc47201b59c4625588':
  Put input ID when inserting channels
2014-07-21 21:07:57 +00:00
Chulwoo Lee
c726968746 am 9f688cc1: Merge "Put input ID when inserting channels" into lmp-dev
* commit '9f688cc1619791b9001f245f541f7a06bea5c0c6':
  Put input ID when inserting channels
2014-07-21 21:03:22 +00:00
Andrew Hsieh
402c3ccc85 am 5f34909a: am 093774e6: am b50f8f66: Merge "Add APP_ABI for module-exports sample"
* commit '5f34909a36c6be05506cb936cd683b9ec0be8e26':
  Add APP_ABI for module-exports sample
2014-07-21 19:21:34 +00:00
Sungsoo Lim
d71035e7cb am 1d1cb1fb: am 51324e22: Merge "Remove the dummy implementation of onContentUnblocked()" into lmp-dev
* commit '1d1cb1fbcac17fa76734f139e5db3d0a9194ef47':
  Remove the dummy implementation of onContentUnblocked()
2014-07-21 19:19:40 +00:00
Andrew Hsieh
c978734092 am 7eedf0e8: am 41c21169: am 30c2909f: Merge "Refresh 64-bit headers/libs (WW29)"
* commit '7eedf0e8dbd63c631790bb7e8e6236b5b1571e8d':
  Refresh 64-bit headers/libs (WW29)
2014-07-21 19:19:33 +00:00
Andrew Hsieh
d664c76338 am 126032dd: am 8e1ad1c9: am fa902f33: Merge "Fix gl3stub.h"
* commit '126032ddaeb694770e576a0e4b9c7e91a7e553b9':
  Fix gl3stub.h
2014-07-21 19:19:32 +00:00
Baligh Uddin
f305727276 am b6fa917d: (-s ours) am dbd7a9fb: Remove deprecated locales - DO NOT MERGE
* commit 'b6fa917df41eefa7d6ae2ff18d228c4fb643ff7a':
  Remove deprecated locales - DO NOT MERGE
2014-07-21 18:28:05 +00:00
Deepanshu Gupta
641a4496d9 am 52119669: am 7f295eef: am 8d6dee77: am 9605eaa7: am fddc192f: am 7b9c13b5: am 292e62aa: am babc7880: am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit '5211966913da9cd866161f6dc3a3e944e04b273d':
2014-07-21 18:28:03 +00:00
Deepanshu Gupta
cbb30ac89c am 8748bd78: am 8b8fca48: am db204c79: am 626baa07: am 1dcb4f05: am ae75543c: am 54c50b59: am d67beb9a: am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit '8748bd7852e599daa086739efd3beedf0da16290':
  Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-21 18:28:01 +00:00
Deepanshu Gupta
17ba703ecd am 6ec20997: (-s ours) am 3b929a7a: am 2aad5082: (-s ours) am 2cdeb60c: am a2c022fa: am 5b6f4fc6: am a20f555a: (-s ours) am f5838d24: am f26c608b: am 197b278f: (-s ours) am 716666be: am a9078f4a: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit '6ec209973505f014039264bbf5c23d3012e01dec':
2014-07-21 18:28:00 +00:00
Deepanshu Gupta
34d687f642 am 11e8e542: (-s ours) am 884d4cb4: am d898a214: (-s ours) am 591f5c8b: am 1fa56bef: am 3271adb9: am 1b0b90c5: (-s ours) am 385f3bb6: am c5a8318a: am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit '11e8e542a5674a4b3db0bb4c6eeb594c318db306':
  Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-21 18:27:59 +00:00