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
fb9584cf67
Merge "Add PlaybackOverlayFragment" into lmp-dev
2014-07-24 15:36:51 +00:00
Alan Viverette
974dc59d63
Update ApiDemos themes, remove targetSdkVersion
...
Change-Id: Iba8d56a1cde52d082e7a5111874460e6120b011e
2014-07-24 13:47:07 -07:00
Craig Stout
7e736a4df2
Add PlaybackOverlayFragment
...
Change-Id: If4c5b2f747885948e0bae422d9d30eec11c027b9
2014-07-24 06:49:35 -07:00
Dake Gu
d54e6b19e4
SupportLeanbackDemo: activity transition
...
b/15024618
Change-Id: Ib23746360984f3bbe255e8f75df30c7422b553f2
2014-07-23 14:37:16 -07: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
58668fc5a5
Merge "Fix directory where CtsTestStubs.apk is found." into lmp-dev
2014-07-22 16:29:55 +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
Deepanshu Gupta
8d6dee7759
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 '9605eaa78b4b757d7319184e383b662eba2c2781':
2014-07-18 23:13:07 +00:00
Deepanshu Gupta
9605eaa78b
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 'fddc192fc3f19d43eae63b242f488fc181b29ff3':
2014-07-18 23:06:36 +00:00
Deepanshu Gupta
db204c7992
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 '626baa07c8fb1b8b2c038c927c84e4942db8f9b2':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 23:05:10 +00:00
Deepanshu Gupta
fddc192fc3
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 '7b9c13b5dcac9c3e800ab2feea323a20b8bc10b2':
2014-07-18 23:01:22 +00:00
Deepanshu Gupta
626baa07c8
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 '1dcb4f05dc21c5aa36d78469f74e39d1cb765b65':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 23:01:07 +00:00
Deepanshu Gupta
1dcb4f05dc
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 'ae75543ce01ab673951516c8dbf313233a8c946a':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:57:47 +00:00
Deepanshu Gupta
7b9c13b5dc
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 '292e62aa0d092de56c7b26e75a59beaa0f26fb4e':
2014-07-18 22:57:25 +00:00
Deepanshu Gupta
ae75543ce0
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 '54c50b59d5539ec6096f89ef72a360f55f23a6f2':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:53:44 +00:00
Deepanshu Gupta
292e62aa0d
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 'babc7880785ea22074bd58dbf5b5144dd33521d7':
2014-07-18 22:52:25 +00:00
Deepanshu Gupta
54c50b59d5
am d67beb9a: am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit 'd67beb9aa9dfd4db1b12bcf932492acac221df04':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:48:49 +00:00
Deepanshu Gupta
babc788078
am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit '38e59046d835fd6edb6eb333053a0c84fa4c02c9':
2014-07-18 22:48:17 +00:00
Deepanshu Gupta
d67beb9aa9
am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit 'dbea3d7d5eba6b149a08325036ab353eb385ef66':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:44:43 +00:00
Deepanshu Gupta
38e59046d8
am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit 'dd0fcf2f8386a7d7b1b9bb293ae689bd2489e0d9':
2014-07-18 22:43:11 +00:00
Deepanshu Gupta
dbea3d7d5e
am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit '53e1237a8edbad2de948f55b13df596853ae578f':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:39:44 +00:00
Deepanshu Gupta
dd0fcf2f83
am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit '9f1005fdbe41f842708884801f9c313cf87a0cde':
2014-07-18 22:38:42 +00:00
Deepanshu Gupta
53e1237a8e
am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit '8ae03adcc1ae490c6ef1ee79bb203201ab4e45a6':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:35:08 +00:00
Deepanshu Gupta
9f1005fdbe
am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit '84e3386eb261b45db60090c8cb8a7c8df0fa0660':
2014-07-18 22:34:54 +00:00
Deepanshu Gupta
8ae03adcc1
am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit '5fff297a34f2699a64a055700da4d3411e7c7ca2':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:31:44 +00:00
Deepanshu Gupta
84e3386eb2
am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit '5fff297a34f2699a64a055700da4d3411e7c7ca2':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:31:29 +00:00
Deepanshu Gupta
5fff297a34
am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit 'e2ee1baff8f1c0275e28ad4ccd5018545933a6e3':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:27:07 +00:00
Deepanshu Gupta
2aad5082c4
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 '2cdeb60c3a98c1ceb8208f641f8df9f988a84f20':
2014-07-18 22:25:31 +00:00
Deepanshu Gupta
d898a214c0
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 '591f5c8b14d1760cc8b11dd3f2a1b7715e279f43':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 22:25:30 +00:00
Deepanshu Gupta
2cdeb60c3a
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 'a2c022fa211e62e2f2007ed35b3024b9792af1b3':
2014-07-18 22:20:18 +00:00
Deepanshu Gupta
591f5c8b14
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 '1fa56befffded934f1101760a279b2ff8e55f655':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 22:20:17 +00:00
Deepanshu Gupta
e2ee1baff8
resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
Change-Id: I8b4d344b4cf0004b377e0e9b08f3bbaf0a7641f0
2014-07-18 15:17:44 -07:00
Deepanshu Gupta
a2c022fa21
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 '5b6f4fc6e00c5a77691e0a413d83b29ec34ea59a':
2014-07-18 22:15:21 +00:00
Deepanshu Gupta
1fa56befff
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 '3271adb9958beaf3d9651d6a6e1406731d12306f':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 22:15:20 +00:00
Deepanshu Gupta
5b6f4fc6e0
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 'a20f555a255918ac0c6a366352dece8732232eb8':
2014-07-18 22:10:09 +00:00
Deepanshu Gupta
3271adb995
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 '1b0b90c5b3a277c2d3c798232beab4776253e2fe':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 22:10:08 +00:00
Deepanshu Gupta
6b014b7966
am 25337462: am ab4bad87: am 8a4e0831: am e377c65b: (-s ours) am d4402051: am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '2533746207287c806f46fa6bb3339965fac25a36':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 22:07:48 +00:00
Deepanshu Gupta
a20f555a25
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 'f5838d2491807833ca963b98d5aed802d9c5d128':
2014-07-18 22:05:35 +00:00
Deepanshu Gupta
1b0b90c5b3
am 385f3bb6: am c5a8318a: am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '385f3bb6c4dfd2e630b64c6afdde69507eef5d8c':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 22:05:34 +00:00
Deepanshu Gupta
2533746207
am ab4bad87: am 8a4e0831: am e377c65b: (-s ours) am d4402051: am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit 'ab4bad872a7a03e3ab4164252942fa227ca4f1cc':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 22:02:32 +00:00
Deepanshu Gupta
6458c80c00
resolved conflicts for merge of 3baef70c to jb-mr1-dev
...
Change-Id: I93a460f4ba7c9e2d8e417c53061072773f9ef9fd
2014-07-18 15:00:58 -07:00
Deepanshu Gupta
f5838d2491
am f26c608b: am 197b278f: (-s ours) am 716666be: am a9078f4a: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit 'f26c608bf020a0ab93d549d7e483930fe1e7b00f':
2014-07-18 22:00:39 +00:00
Deepanshu Gupta
ab4bad872a
am 8a4e0831: am e377c65b: (-s ours) am d4402051: am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '8a4e0831b1144b9d809306c56a0bd387342dcb15':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 21:57:46 +00:00
Deepanshu Gupta
385f3bb6c4
am c5a8318a: am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit 'c5a8318a78f40087ae564753fa57167cbb12af46':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 21:57:08 +00:00
