Craig Stout
15fe225286
am e8759461: am f92a171d: Merge "Use 2-param constructor for HeaderItem." into lmp-mr1-dev
...
* commit 'e8759461ef6189a1ee35aed214b17c7c6160cec3':
Use 2-param constructor for HeaderItem.
2014-11-18 19:12:47 +00:00
Craig Stout
f92a171d99
Merge "Use 2-param constructor for HeaderItem." into lmp-mr1-dev
2014-11-18 19:00:39 +00:00
Craig Stout
4b8dd637c8
am b372b82d: am 4e79fdca: Fix NPE if user finishes activity quickly.
...
* commit 'b372b82d4bdb477b3dfd9911caa729e4626bd00b':
Fix NPE if user finishes activity quickly.
2014-11-18 18:58:18 +00:00
Craig Stout
e32b8d0a7b
Use 2-param constructor for HeaderItem.
...
Change-Id: I5b48e3f37e7941a1bba8518efcbdcd180f20b8f5
2014-11-18 10:40:30 -08:00
Craig Stout
4e79fdca33
Fix NPE if user finishes activity quickly.
...
b/17646987
Change-Id: I6c3aa94f8b557449af410b323a6bbdfaa389015e
2014-11-18 10:35:09 -08:00
Renato Mangini
7beff53929
am 174f7e76: am ef8be5a7: am 2a7f9a5b: am f30a1f46: am bbbffffd: Fix copyright header
...
* commit '174f7e763db9f97e880f46c04585936c609ba576':
Fix copyright header
2014-11-18 02:55:17 +00:00
Renato Mangini
26ec370ee6
am 20fbdda7: am 9ea10d65: am 445d4319: am 17590765: am d2ecef7d: Fix missing import statement on PackageValidator.
...
* commit '20fbdda707c43808a68e7993fd861e1b7e32c32f':
Fix missing import statement on PackageValidator.
2014-11-18 02:54:40 +00:00
Renato Mangini
ef8be5a7ca
am 2a7f9a5b: am f30a1f46: am bbbffffd: Fix copyright header
...
* commit '2a7f9a5b943ea812bb4158038ceb8c790925cac3':
Fix copyright header
2014-11-18 02:47:03 +00:00
Renato Mangini
9ea10d657c
am 445d4319: am 17590765: am d2ecef7d: Fix missing import statement on PackageValidator.
...
* commit '445d431994f03790d55e77d74cb20c0a678e37bb':
Fix missing import statement on PackageValidator.
2014-11-18 02:47:02 +00:00
Renato Mangini
f30a1f46ad
am bbbffffd: Fix copyright header
...
* commit 'bbbffffd88d627e0ac11292941384fa7fc1d7566':
Fix copyright header
2014-11-18 02:37:23 +00:00
Renato Mangini
1759076561
am d2ecef7d: Fix missing import statement on PackageValidator.
...
* commit 'd2ecef7d0ecc0cc5b238a7198efce03db56e8eea':
Fix missing import statement on PackageValidator.
2014-11-18 02:37:12 +00:00
Lei Zhang
7dab1c0b47
am a8f646a0: am 083b701b: am aa1b05f3: am b327085d: am a7090355: Verify calling package signature before returning browse root Uri.
...
* commit 'a8f646a0d495a4e53bd1d425805809e9046cba48':
Verify calling package signature before returning browse root Uri.
2014-11-18 02:04:53 +00:00
Renato Mangini
bbbffffd88
Fix copyright header
...
Change-Id: Idbe984a8f16dc7a6ec116a8b004b76675bf1f020
2014-11-17 17:25:33 -08:00
Renato Mangini
d2ecef7d0e
Fix missing import statement on PackageValidator.
...
Change-Id: Ic4bb036a15e86b46b1f24410fcd1dc5ef389b732
2014-11-17 17:02:50 -08:00
Lei Zhang
083b701b2d
am aa1b05f3: am b327085d: am a7090355: Verify calling package signature before returning browse root Uri.
...
* commit 'aa1b05f3e5a969c5bf3f705e49a58a8685adb03e':
Verify calling package signature before returning browse root Uri.
2014-11-17 22:00:09 +00:00
Lei Zhang
b327085d25
am a7090355: Verify calling package signature before returning browse root Uri.
...
* commit 'a7090355e2a7d2b229dce42ca592616465e1aae0':
Verify calling package signature before returning browse root Uri.
2014-11-17 21:15:43 +00:00
Lei Zhang
a7090355e2
Verify calling package signature before returning browse root Uri.
...
Change-Id: I076ff3b0b00c2e6bf200dd3e8b6bc7f1b32c41d8
2014-11-17 20:40:52 +00:00
Dake Gu
b1668409ec
am a6f3ac5f: am a238b22c: Merge "SupportLeanbackDemo: add test case of Browse/Details enter return transition" into lmp-mr1-dev
...
* commit 'a6f3ac5fdd709ccfc9cd641b83dab6fe572f76c8':
SupportLeanbackDemo: add test case of Browse/Details enter return transition
2014-11-14 00:56:06 +00:00
Dake Gu
a238b22cb5
Merge "SupportLeanbackDemo: add test case of Browse/Details enter return transition" into lmp-mr1-dev
2014-11-14 00:47:00 +00:00
Trevor Johns
7f1698141a
DO NOT MERGE: Sync prebuilts for lmp-docs
...
Synced to lmp-docs commit 73d1988336124ae81421efc4c649960a159bc74d.
Includes ported wear samples from klp-modular-docs commit
72bab108d430916ee901fa21b3b7bc18cfa04a2e. Ported samples include:
- AgendaData
- DataLayer
- DelayedConfirmation
- ElizaChat
- EmbeddedApp
- FindMyPhone
- Flashlight
- Geofencing
- GridViewPager
- JumpingJack
- Notifications
- Quiz
- RecipeAssistant
- SkeletonWearableApp
- SpeedTracker
- SynchronizedNotifications
- Timer
- WatchViewStub
Change-Id: Ie50bde8b5eb801f4249d5beb24896d77e8444aff
2014-11-13 14:02:16 -08:00
Trevor Johns
f19dcd1fcd
am 6efacc28: am 84bf28b2: am 27a5bbcb: am 5cdf8488: am 3081f16c: Sync browseable samples for lmp-docs
...
* commit '6efacc284c822c66b2594ad607e97e359e573994':
Sync browseable samples for lmp-docs
2014-11-13 21:14:49 +00:00
Trevor Johns
84bf28b21d
am 27a5bbcb: am 5cdf8488: am 3081f16c: Sync browseable samples for lmp-docs
...
* commit '27a5bbcb567a0b14783a111abd374849ced53a57':
Sync browseable samples for lmp-docs
2014-11-13 20:57:37 +00:00
Trevor Johns
1206ee41dc
DO NOT MERGE: Sync browseable samples for wear
...
Synced to commit 8d594385273af9656bf145a4f85e1d73c4ed8c69 in
klp-modular-docs.
Includes samples:
- AgendaData
- DataLayer
- DelayedConfirmation
- ElizaChat
- EmbeddedApp
- FindMyPhone
- Flashlight
- Geofencing
- GridViewPager
- JumpingJack
- Notifications
- Quiz
- RecipeAssistant
- SkeletonWearableApp
- SpeedTracker
- SynchronizedNotifications
- Timer
- WatchViewStub
Change-Id: I984fab316202749844e791f0c7a1c98bb6a5e524
2014-11-12 19:13:09 -08:00
Trevor Johns
3081f16cd6
Sync browseable samples for lmp-docs
...
Syncing to commit 0afa2a3366307b12a213a199be1eb8baac1c5f1c.
Change-Id: I6ab153008951bb7e06001c0f27f44df4e4f6cb83
2014-11-12 18:23:05 -08:00
Dake Gu
865df70367
SupportLeanbackDemo: add test case of Browse/Details enter return transition
...
b/17628884
Change-Id: Ia896d295dce1000313651426f077d88a1ae05ebd
2014-11-12 17:41:55 -08:00
Trevor Johns
da6cf75ea5
am f2ae7629: am 245f029a: am d009e0b3: am 0c094f0c: am d8c7b24e: Merge "Update browseable samples for lmp-docs" into lmp-docs
...
* commit 'f2ae762950e1a6a668c216f50345433ba82dfc2c':
Update browseable samples for lmp-docs
2014-11-12 23:50:02 +00:00
Trevor Johns
400208abf8
am 716f9ff5: am 0161ae54: am 705cf850: am 13ce376e: am dff4d5d4: Merge "Add two new samples." into lmp-docs
...
* commit '716f9ff5a9b69b85ec9a92f63e10d8177acb7185':
Add two new samples.
2014-11-12 23:49:56 +00:00
Trevor Johns
245f029a55
am d009e0b3: am 0c094f0c: am d8c7b24e: Merge "Update browseable samples for lmp-docs" into lmp-docs
...
* commit 'd009e0b3848cff2b725f1909bab79574d67bb3e0':
Update browseable samples for lmp-docs
2014-11-12 19:53:00 +00:00
Trevor Johns
d8c7b24e69
Merge "Update browseable samples for lmp-docs" into lmp-docs
2014-11-12 19:40:55 +00:00
Trevor Johns
527a4f30a6
Update browseable samples for lmp-docs
...
Synced to commit df5e5013422b81b4fd05c0ac9fd964b13624847a. Includes
new samples for Android Auto.
Change-Id: I3fec46e2a6b3f196682a92f1afd91eb682dc2dc1
2014-11-12 11:39:30 -08:00
Trevor Johns
0161ae549a
am 705cf850: am 13ce376e: am dff4d5d4: Merge "Add two new samples." into lmp-docs
...
* commit '705cf8509d651773275e293c941bf7046074ec87':
Add two new samples.
2014-11-12 19:39:28 +00:00
Renato Mangini
876d208329
Add two new samples.
...
Added MessagingServices and MediaBrowserService to sdk build.
Bug: 18323953
Change-Id: I6b2d4caae38a42ec2a6673a5b6c02c7f5a21b868
2014-11-12 11:21:30 -08:00
Jim Miller
b7651e12c4
am 1064b49c: am eb7edd58: Merge "Update TrustAgentService API after review" into lmp-mr1-dev
...
* commit '1064b49cedcf80bcfaf8bd6824fc8cabae256e99':
Update TrustAgentService API after review
2014-11-06 03:01:41 +00:00
Jim Miller
d4adb57e07
Update TrustAgentService API after review
...
Add test for DPM.setTrustAgentConfiguration()
Also fixes bug where DPM flags were set in onPreferenceChanged()
which happened before being set on the checkbox preference.
Fixes bug 17008504
Change-Id: I165cd73d11c0a68ee6667cb1fd88892a39267903
2014-11-03 18:48:45 -08:00
Tim Kilbourn
bd76973c0c
am b029e4d4: am 2f6ded27: Add secondary text to cards.
...
* commit 'b029e4d451730720d1b3ee56f782f8cc1fb652d4':
Add secondary text to cards.
2014-10-31 00:14:52 +00:00
Dake Gu
57e93e8c1b
am 82435b27: am f66eadb5: SupportLeanbackDemo: Add test case for updating overview row
...
* commit '82435b27f7dd8d5297989bd4d49591cd26ade3cb':
SupportLeanbackDemo: Add test case for updating overview row
2014-10-31 00:12:56 +00:00
Dake Gu
dc5cecd852
am 99cf1af3: am 455a4c3f: Merge "SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace()" into lmp-mr1-dev
...
* commit '99cf1af3c1589d9e36a07868dc1eb0fed25b4395':
SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace()
2014-10-30 11:03:21 +00:00
Tim Kilbourn
2f6ded27f6
Add secondary text to cards.
...
Add some content to PhotoItems so that the ImageCardViews use two lines
of text.
Bug: 18008019
Change-Id: I9bd72f585f76f84df70644b43539210664fbaa0e
2014-10-29 17:19:04 -07:00
Dake Gu
f66eadb5d4
SupportLeanbackDemo: Add test case for updating overview row
...
fixes b/17918639: no back activity transition when overview row updated.
Also hook up the playback actvity.
Change-Id: I52fe3808a1dc614df7d1f33f36de47ce9144e974
2014-10-29 14:44:50 -07:00
Dake Gu
b43b47c6d3
SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace()
...
b/17893479
Change-Id: Iaf91ba1ebca1237fc0d2d5629e0c2e83e15d54a0
2014-10-28 15:25:40 -07:00
Dake Gu
1554fa4339
am 1eaf20c6: am d18c4a82: Merge "SupportLeanbackDemo: show case of different image scale type" into lmp-mr1-dev
...
* commit '1eaf20c653e3223be91774687f5249229693bffd':
SupportLeanbackDemo: show case of different image scale type
2014-10-28 20:29:43 +00:00
Dake Gu
d18c4a82e0
Merge "SupportLeanbackDemo: show case of different image scale type" into lmp-mr1-dev
2014-10-27 20:36:00 +00:00
Trevor Johns
8afef9e7f9
am 72f065ea: am 7876b306: am baf6829e: am f420ff0d: Add browseable samples for Clockwork Beryl
...
* commit '72f065ea165f8a39801e8ab4af8e7ec6b32109d5':
Add browseable samples for Clockwork Beryl
2014-10-23 15:58:59 +00:00
Trevor Johns
7876b306a2
am baf6829e: am f420ff0d: Add browseable samples for Clockwork Beryl
...
* commit 'baf6829eecf4889f38fb9d75d1c61392d13b3bd0':
Add browseable samples for Clockwork Beryl
2014-10-23 07:58:27 +00:00
Trevor Johns
f420ff0d80
Add browseable samples for Clockwork Beryl
...
Bug: 17473824
Change-Id: Id4c637733c491ac71bb6e269f55939c082fb0994
2014-10-23 03:36:38 +00:00
Joe Fernandez
d9475320a4
am 939f4bfd: am 3cbcd20f: am f43722b7: am 4a5ce9ae: Merge "DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)" into lmp-dev
...
* commit '939f4bfd9e48ca6df77652c5cb02374e4e8c6a8d':
DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)
2014-10-22 21:51:53 +00:00
Joe Fernandez
cd7097298d
am 35828e85: am db9b560e: am d74a44da: am de3f94a0: Merge "Deletes the wear samples that have been commited in the wrong place. Updates the location of wear samples in sdk.atree Adds SpeedTracker wear sample ( https://googleplex-android-review.git.corp.google.com/56460
...
* commit '35828e85bbb1a58d4dde4caef35d506b8ecde1b1':
Deletes the wear samples that have been commited in the wrong place. Updates the location of wear samples in sdk.atree Adds SpeedTracker wear sample (https://googleplex-android-review.git.corp.google.com/564608 )
2014-10-22 21:47:10 +00:00
Joe Fernandez
3cbcd20f33
am f43722b7: am 4a5ce9ae: Merge "DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)" into lmp-dev
...
* commit 'f43722b7733243e79149b19a0635af572c79b3e3':
DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)
2014-10-22 21:44:55 +00:00
Joe Fernandez
db9b560e19
am d74a44da: am de3f94a0: Merge "Deletes the wear samples that have been commited in the wrong place. Updates the location of wear samples in sdk.atree Adds SpeedTracker wear sample ( https://googleplex-android-review.git.corp.google.com/564608 )" into lmp-dev
...
* commit 'd74a44da81602b1f36123a37d3b721288afde384':
Deletes the wear samples that have been commited in the wrong place. Updates the location of wear samples in sdk.atree Adds SpeedTracker wear sample (https://googleplex-android-review.git.corp.google.com/564608 )
2014-10-22 21:34:28 +00:00
Trevor Johns
08e81c8099
DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)
...
Change-Id: Ice64270da1cb79985615623a03a7783a580211ce
2014-10-22 20:28:48 +00:00