aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-08-06Merge Android Pie into masterandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseXin Li
Bug: 112104996 Change-Id: Iec32f622f0bb1bc1583aefcbf6d115ad05baa693
2018-06-15Fix ManifestMerger issuestemp_p_mergeColin Cross
am: 5fdc24aa6c Change-Id: I0f4caaf968fdca40124e08184b29a9662c349bc0
2018-06-15Fix ManifestMerger issuesColin Cross
Set LOCAL_MIN_SDK_VERSION in tv libraries so that the build system doesn't raise the minSdkVersion value specified in the manifest, which causes ManifestMerger to error when trying to merge it into a package that specifies a lower minSdkVersion. Bug: 78447299 Test: m java Change-Id: I492916ffd17c3e454e4c8b19697153c7abb5763c
2018-06-14Fix ManifestMerger issuesandroid-p-preview-5android-p-preview-4android-o-mr1-iot-release-1.0.2android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayColin Cross
Set LOCAL_MIN_SDK_VERSION in tv-common so that the build system doesn't raise the minSdkVersion value specified in the manifest, which causes ManifestMerger to error when trying to merge it into a package that specifies a lower minSdkVersion. Bug: 78447299 Test: m java Change-Id: Id49101542185ee5e0dc8c06928126e2f36c26f5c
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
Bug: 79597307 Change-Id: I2aed66909831766ab308bfe4dd32f310d533c05a
2018-05-07[automerger skipped] convert LiveTv to aapt2 am: 17850fe0bfDake Gu
am: d195718c2e -s ours Change-Id: I71cc534b85071b587344d10f4b4f8f1e2dc8eb01
2018-05-07[automerger skipped] Stop using custom prebuilt support-tv-provider am: ↵Dan Willemsen
67b0265c8b am: 0ff776a045 -s ours Change-Id: I230cf22562c9e60ed1a8c1359a7631e5c7debd72
2018-05-07convert LiveTv to aapt2Dake Gu
am: 17850fe0bf Change-Id: I9f5d1d04a51ec13b0b00ff04deeb4df3408500cd
2018-05-07Stop using custom prebuilt support-tv-providerDan Willemsen
am: 67b0265c8b Change-Id: I7f94b79c64b4a8d2d93d717bf2b1f3c358ded554
2018-05-02convert LiveTv to aapt2android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.1android-n-iot-release-polk-at1Dake Gu
To avoid hardcode resource directories. Bug: NA Test: make Change-Id: If8778b8c293eb10818baa1dead38d8ac3ee30cb3 Merged-In: If8778b8c293eb10818baa1dead38d8ac3ee30cb3 (cherry picked from commit d0b4dee914668ad32185d82146947cacade657e2)
2018-05-02Stop using custom prebuilt support-tv-providerDan Willemsen
That file is going away with the latest support drop. Use `android-support-tv-provider`, which will use the correct version of the library that matches all the other android-support-* libraries. Bug: 64723465 Test: mmma packages/apps/TV Test: tapas TV; m Change-Id: Ic250b40982a161cf3858f5c792bb3f3c37b2271e Merged-In: Ic250b40982a161cf3858f5c792bb3f3c37b2271e (cherry picked from commit cc8c60afeddd75ecb1e8eb6de74a16f22e9256e0)
2018-05-02apps/TV: Update path to android.jar. am: 57a51eb0d7Anton Hansson
am: 9e518ce7cb Change-Id: I1261968a872337ed4ce87bf07c97f1e506093793
2018-05-02apps/TV: Update path to android.jar.Anton Hansson
am: 57a51eb0d7 Change-Id: I5df4e90cf2d64051574763d9739637e117e4bf79
2018-05-01apps/TV: Update path to android.jar.android-wear-p-preview-2android-o-mr1-iot-release-1.0.0Anton Hansson
This file is being moved. Update the path here so that the old file can be deleted. Bug: 77525052 Test: No Change-Id: Ieff6f28c2093b180d02f7e098d39b0985b9a4bb5
2018-03-02Merge "Disable Support Library dependency resolution"android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devAlan Viverette
2018-02-27Disable Support Library dependency resolutionAlan Viverette
Bug: 73250914 Test: make checkbuild cts Change-Id: I524f096c7eab8ed1d64ace580ca43bf4f4404c56
2018-02-26CLEANUP: fix vararg errors by inlining vargarg methodnchalko
PiperOrigin-RevId: 187036672 Change-Id: Ia1550285ca0d4c2d5b0c4ce8ed5638c3e9fe9c7e
2018-02-26Write DVR failed reasons to DBshubang
PiperOrigin-RevId: 186845549 Change-Id: I327129322ade4ef3ef0110bb51ec8f172c7a99ec
2018-02-26Cleanup change generated by Refaster (go/refaster) to directories ↵nchalko
//third_party/java_src/android_app/live_channels/tests/unit/src/...:all with template java/com/google/devtools/javatools/refactory/refaster/cleanups:TruthMigration Also added some javadoc and stopped using MoreAsserts PiperOrigin-RevId: 186830589 Change-Id: I277cf771e3eb7b2f1656810655fe68ac30811cca
2018-02-26FIX: dpad up and down should change channels even when talk back is on.nchalko
PiperOrigin-RevId: 186830435 Change-Id: I93d4d047654df6b3a6e98d29c79181cdd1668611
2018-02-26Add failed reason to ScheduledRecording tableshubang
To show error message / falied reason, this field should be stored in DB. PiperOrigin-RevId: 186818079 Change-Id: I9de775fbe9ca0cdcff0a20c68b39a4acf6208899
2018-02-26CLEANUP: Ignore testCustomizeChannelList_timeoutnchalko
PiperOrigin-RevId: 186675628 Change-Id: I45b403a1aae269d0660992509207ded14bc4b521
2018-02-26FIX: Leave controls displayed when accessibility is turned on.nchalko
PiperOrigin-RevId: 186633960 Change-Id: If81f40a26e7636663da32f46d8b69c33e662e3d0
2018-02-26Add tests for DvrBrowseFragmentshubang
PiperOrigin-RevId: 186565879 Change-Id: Ie379b73760cef7a16670353280cf119c1e484a9b
2018-02-26Show failed recordings in DVR recent rowshubang
PiperOrigin-RevId: 186556969 Change-Id: I3410d9ea1db451d2e4711631ccd530f9179b428d
2018-02-26Handle click and row updated/added/removed in DVR historyshubang
PiperOrigin-RevId: 186532869 Change-Id: Ida96e009a631ce737b02cf4bf52fe2c8065a2d65
2018-02-23Merge changes I9d3158cd,I85304d06,I7facfa4d,I689eff2aNick Chalko
* changes: CLEANUP: Migrate SampleSourceExtractorTest to robotest CLEANUP: Move VerySlowSampleChunk to a shared testing package CLEANUP: Convert TvActivityTest to robolectric CLEANUP: Add build target for recomendation tests
2018-02-22Use HAS_BUILD_NUMBER to check engineering build am: 9d03eaf85c am: 83c538af11Nan Zhang
am: 6d35e804a6 Change-Id: I55998a189e2e95a5d3b928c3cc7d9849082a3937
2018-02-22Use HAS_BUILD_NUMBER to check engineering build am: 9d03eaf85cNan Zhang
am: 83c538af11 Change-Id: I52817fed0cd463c032edf19646c6aecf51d0ef73
2018-02-22Use HAS_BUILD_NUMBER to check engineering buildNan Zhang
am: 9d03eaf85c Change-Id: I739920bcae682c950a135f51f499d5ee6bd28567
2018-02-21CLEANUP: Migrate SampleSourceExtractorTest to robotestnchalko
PiperOrigin-RevId: 186372628 Change-Id: I9d3158cd6752e2181c74c52d91f13e19e618bd07
2018-02-21CLEANUP: Move VerySlowSampleChunk to a shared testing packagenchalko
PiperOrigin-RevId: 186341141 Change-Id: I85304d064910b32b293a7c2dc3b610e3f0f109ac
2018-02-21CLEANUP: Convert TvActivityTest to robolectricnchalko
PiperOrigin-RevId: 186340446 Change-Id: I7facfa4d124b53ebccc4575c5d82dc35d93ede0c
2018-02-21CLEANUP: Add build target for recomendation testsnchalko
PiperOrigin-RevId: 186339593 Change-Id: I689eff2af0cb682415c23f5afdb9ba33bfc02d23
2018-02-21Add a test for DvrHistoryRowAdaptershubang
PiperOrigin-RevId: 186338292 Change-Id: Ide49e58a67e0f0331f65ce3601a7619a0894cd62
2018-02-21Add missing license headernchalko
PiperOrigin-RevId: 186335607 Change-Id: Ief132e8b824834d78c77aca96816e65d49aa63f3
2018-02-21CLEANUP: add build target for menu testsnchalko
PiperOrigin-RevId: 186334761 Change-Id: Id9332fff1e79d79d0264d4eab1154d8923f94133
2018-02-21FIX: Don't use the term DVR when possiblenchalko
PiperOrigin-RevId: 186331756 Change-Id: If44cfb2db6804fee343769ef945090a5ad0a3e4a
2018-02-21CLEANUP: Share test stream assets with both robo and unit testsnchalko
PiperOrigin-RevId: 186326385 Change-Id: Iebf617012c39697be10cf008501f4c4274082cdb
2018-02-21Move DvrDataManagerInMemoryImpl to a testing packageshubang
This makes using it in TestSingletonApp easier PiperOrigin-RevId: 186323632 Change-Id: If898f7dfb1b666f406a24ea1c7c7673df6859e45
2018-02-21CLEANUP: Add build test target for jank testsnchalko
PiperOrigin-RevId: 186320496 Change-Id: Iea6e17868e6076eff2944001b8d34767739cbe2f
2018-02-21CLEANUP: Move BaseMainActivtyTestCase to testing.activites pacakgenchalko
PiperOrigin-RevId: 186066041 Change-Id: If9a422a50e84fe34dcddb2e9716d856ae0097f32
2018-02-21CLEANUP: Write a log statement CommonUtils#isRunningInTest is truenchalko
PiperOrigin-RevId: 186059781 Change-Id: If3811a66d5fe10cb6a9e5aab312ade5ba928deef
2018-02-21Use HAS_BUILD_NUMBER to check engineering buildandroid-p-preview-1android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Nan Zhang
And use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER to reduce build reruns. Test: m -j32 Bug: b/70351683 Change-Id: If5eb8891920ddd0486e263dd996f21efd36677c0
2018-02-16Add missing license headernchalko
PiperOrigin-RevId: 186019980 Change-Id: Iadf89e8aa775482f0a3bd66669166cfab0e5d9dd
2018-02-16Changes imported from Live ChannelsLive Channels Team
- 186014614 Sync more make files with master by nchalko <nchalko@google.com> - 186013553 FIX: safely parse URI from intents. by nchalko <nchalko@google.com> - 186010488 Add missing license header by nchalko <nchalko@google.com> - 186009400 Sync all make files with master by nchalko <nchalko@google.com> - 185891159 Extract a Channel interface by nchalko <nchalko@google.com> - 185885678 Make recording history available by shubang <shubang@google.com> - 185725900 Extract an interface for TunableTvView by nchalko <nchalko@google.com> - 185724604 CLEANUP: Move ImageLoader to a separate package by nchalko <nchalko@google.com> - 185722979 CLEANUP: Fix amiguous method reference by renaming static... by nchalko <nchalko@google.com> - 185721563 CLEANUP: create a seperate top level target for resources by nchalko <nchalko@google.com> - 185720102 CLEANUP: fix comparison using reference equality instead ... by nchalko <nchalko@google.com> - 185717674 CLEANUP: Move MemoryManageable to a separate package by nchalko <nchalko@google.com> - 185609615 FIX: Improve Program Guide description for talkback by nchalko <nchalko@google.com> - 185607602 PARTIAL: Speak the channel number for each item in the pr... by nchalko <nchalko@google.com> - 185552957 CLEANUP: Move TestUtils to tests/common by nchalko <nchalko@google.com> - 185549529 PARTIAL: Add program description to the content discripti... by nchalko <nchalko@google.com> - 185521822 Use robolectric 3.6.1 in android.mk by nchalko <nchalko@google.com> - 185521733 Add recording info to ProgramItemView content description by nchalko <nchalko@google.com> - 185459218 Add time to ProgramItemView content description by nchalko <nchalko@google.com> - 185449505 Add clock to the Utils.getDurationString by nchalko <nchalko@google.com> - 185435931 Inject the clock in ProgramItemView for testing by nchalko <nchalko@google.com> - 185435648 Fix link-type warnings by nchalko <nchalko@google.com> - 185435488 Migrate to AAPT2 by nchalko <nchalko@google.com> - 185434148 Add uptimeMillis to the Clock interface by nchalko <nchalko@google.com> PiperOrigin-RevId: 186014614 Change-Id: I583af9ac3e56161736504024b62d1fd62e31c15a Test: tested in google3
2018-02-16Merge "Add uptimeMillis to the Clock interface"TreeHugger Robot
2018-02-15Remove unnecessary TimeUnit conversion (converting from one unit to the same ↵Live Channels Team
unit). This change is a no-op, but please make sure that this did not expose a hidden bug! Are you sure the original code intended for this statement to be a no op?? If you wish to further improve this code (in a follow up CL), consider using a java.time.Duration instead of a bare primitive. See http://go/java-practices/time#avoid-primitives Tested: TAP --sample for global presubmit queue http://test/OCL:185213730:BASE:185210942:1518228182204:44ec5277 PiperOrigin-RevId: 185369428 Change-Id: Ifaf7d9e8f75a5f1631ecb650654414ffe556c739
2018-02-15Add uptimeMillis to the Clock interfacenchalko
PiperOrigin-RevId: 185434148 Change-Id: I4033341070991a9e883d2f4874913d70045058b2
2018-02-15Merge changes Icd87d0d6,If2348387,I484eb107,I069034b3TreeHugger Robot
* changes: Add getEpisodeContentDescription to BaseProgram. Test and handle null series numbers on Program.getEpisodeDisplayTitle Move GenreItemTest from unit test to robolectric test Convert ProgramTest to Robolectric
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 19:29:15 +0000