Commit Graph

15649 Commits

Author SHA1 Message Date
Yigit Boyar
a5761855fa am bb5d18dc: Merge "Add elevation settings to cardview demo app" into lmp-dev
* commit 'bb5d18dca81fe644761cb12e0e813e4a8cc56481':
  Add elevation settings to cardview demo app
2014-08-01 16:58:21 +00:00
Andrew Hsieh
348e340245 Merge "Refresh 64-bit headers/libs (WW31)" 2014-08-01 15:55:34 +00:00
Kenny Root
8fb8ee72f7 am b0d83cf4: make_key: reduce raciness of password input
* commit 'b0d83cf4dbb379059a35072ea60e7e96889012c1':
  make_key: reduce raciness of password input
2014-08-01 13:50:48 +00:00
Yigit Boyar
bb5d18dca8 Merge "Add elevation settings to cardview demo app" into lmp-dev 2014-08-01 01:46:21 +00:00
Kenny Root
b6fe1f9381 am 08c5e496: am 2d37bfef: am 9ce4e448: Merge "make_key: reduce raciness of password input"
* commit '08c5e496c092bfd2f55d7a1d014bd70119f6b3cd':
  make_key: reduce raciness of password input
2014-07-31 23:19:39 +00:00
Kenny Root
08c5e496c0 am 2d37bfef: am 9ce4e448: Merge "make_key: reduce raciness of password input"
* commit '2d37bfefedaed94da9eddfaea2787a006d0bc6ce':
  make_key: reduce raciness of password input
2014-07-31 23:16:14 +00:00
Kenny Root
2d37bfefed am 9ce4e448: Merge "make_key: reduce raciness of password input"
* commit '9ce4e448dc69cf2d3ebdcdb56956b3f685f99182':
  make_key: reduce raciness of password input
2014-07-31 23:11:58 +00:00
Kenny Root
b0d83cf4db make_key: reduce raciness of password input
(cherry picked from commit 7f3f83e0e3)

Bug: 14595245
Change-Id: I8a9e4f2c46aa3c85763975c5cb7a47df197f7746
2014-07-31 16:04:20 -07:00
Kenny Root
9ce4e448dc Merge "make_key: reduce raciness of password input" 2014-07-31 19:45:30 +00:00
Kenny Root
7f3f83e0e3 make_key: reduce raciness of password input
Bug: 14595245
Change-Id: I8a9e4f2c46aa3c85763975c5cb7a47df197f7746
2014-07-31 13:00:12 -07:00
Yigit Boyar
eb785dc7f3 Add elevation settings to cardview demo app
Bug: 16501750
Change-Id: I831f191c8db1864ba2f1dfa3af9ffbe4005b2e0c
2014-07-30 13:29:01 -07:00
Dongwon Kang
db8de95ca6 am 65576ddf: am d256f606: Merge "Remove AtscTvInput in favor of having another sample input under developers." into lmp-dev
* commit '65576ddfd97f33dc78571ca6e2374be1054f6d3a':
  Remove AtscTvInput in favor of having another sample input under developers.
2014-07-30 17:01:01 +00:00
Alan Viverette
734e1907f4 am 33b9e4b6: am 7a6a6e7a: Merge "Add switches to the Controls sample in ApiDemos" into lmp-dev
* commit '33b9e4b6c61c5e2a2be26d499a4a9ddb2bb3921f':
  Add switches to the Controls sample in ApiDemos
2014-07-30 17:01:00 +00:00
Brigid Smith
699fc0155b am f4bf5577: am f893e743: Stack tool 32/64 bit compatibility fixes.
* commit 'f4bf5577d8ac88b8bdc5a47fb88a489afb235527':
  Stack tool 32/64 bit compatibility fixes.
2014-07-30 17:00:58 +00:00
Dongwon Kang
65576ddfd9 am d256f606: Merge "Remove AtscTvInput in favor of having another sample input under developers." into lmp-dev
* commit 'd256f606efb1e683a5eab7c35db23347f5344953':
  Remove AtscTvInput in favor of having another sample input under developers.
2014-07-30 16:42:48 +00:00
Alan Viverette
33b9e4b6c6 am 7a6a6e7a: Merge "Add switches to the Controls sample in ApiDemos" into lmp-dev
* commit '7a6a6e7a7efc289826cddb6b0af1e77289492702':
  Add switches to the Controls sample in ApiDemos
2014-07-30 16:40:39 +00:00
Brigid Smith
f4bf5577d8 am f893e743: Stack tool 32/64 bit compatibility fixes.
* commit 'f893e743b6e462bf0d68b51693158423c558ec98':
  Stack tool 32/64 bit compatibility fixes.
2014-07-30 16:38:22 +00:00
Andrew Hsieh
b4ddea108f Refresh 64-bit headers/libs (WW31)
Change-Id: If08781ae4ca14710a95d6bd0bd61477e0a472293
2014-07-30 14:18:12 +08:00
Brigid Smith
f893e743b6 Stack tool 32/64 bit compatibility fixes.
Left the default symbol.ARCH value intact and changed stack_core instead
so that it will assume the ABI is arm until it sees an ABI line.  This
allows compatibility for people who are used to pasting portions of a
tombstone instead of the whole thing (assuming said tombstone is arm)
while additionally supporting other architectures if a whole tombstone
  is pasted in.

(cherry picked from commit 15142f793a)

Change-Id: Ide73171fc4e513b39bee74e2270252c3b32e23cd
2014-07-29 16:13:18 -07:00
Alan Viverette
7a6a6e7a7e Merge "Add switches to the Controls sample in ApiDemos" into lmp-dev 2014-07-29 21:36:00 +00:00
Alan Viverette
b6235f6e52 Add switches to the Controls sample in ApiDemos
Change-Id: I754458204adc6a66a327e85d4e5beb8de7f5c27c
2014-07-29 16:30:12 -07:00
Craig Stout
41dbec8596 am 196dc75f: am a38b253e: Merge "Add playback progress." into lmp-dev
* commit '196dc75f73fb9cd7cfcc136efa97f7c8af9a08c0':
  Add playback progress.
2014-07-29 17:11:35 +00:00
Craig Stout
196dc75f73 am a38b253e: Merge "Add playback progress." into lmp-dev
* commit 'a38b253ebbce0305f7fc65218941a9c248e54c5a':
  Add playback progress.
2014-07-29 17:03:36 +00:00
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
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