New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate to AndroidX #56

Open

dwhea wants to merge 1 commit into googlesamples:master from DolbyLaboratories:androidx-migrate

dwhea commented Dec 10, 2020

Also fix following issues:

ERR_CLEARTEXT_NOT_PERMITTED when launching http URL
AdMob not defined causing launch issues, so follow
https://developers.google.com/admob/android/quick-start#update_your_androidmanifestxml
instructions
Update compile SDK version to 28 to fix "android:attr/fontVariationSettings not found"

Test: launch on yukawa AOSP master


          Migrate to AndroidX

e97c48f

Also fix following issues:
* ERR_CLEARTEXT_NOT_PERMITTED when launching http URL
* AdMob not defined causing launch issues, so follow
  https://developers.google.com/admob/android/quick-start#update_your_androidmanifestxml
  instructions
* Update compile SDK version to 28 to fix "android:attr/fontVariationSettings not found"

Test: launch on yukawa AOSP master

filmagrace commented Dec 11, 2020 via email

Pada Kha, 10 Dis 2020, 9:36 PG dwhea <[email protected]> menulis:

Also fix following issues: - ERR_CLEARTEXT_NOT_PERMITTED when launching http URL - AdMob not defined causing launch issues, so follow https://developers.google.com/admob/android/quick-start#update_your_androidmanifestxml instructions - Update compile SDK version to 28 to fix "android:attr/fontVariationSettings not found" Test: launch on yukawa AOSP master ------------------------------ You can view, comment on, or merge this pull request online at: #56 Commit Summary - Migrate to AndroidX File Changes - *M* app/build.gradle <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-51a0b488f963eb0be6c6599bf5df497313877cf5bdff3950807373912ac1cdc9> (6) - *M* app/src/main/AndroidManifest.xml <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-7fa6aef292187a049f7a4d6060d8df3ba212d838789c78940bd363344b1c38cd> (5) - *M* app/src/main/java/com/example/android/sampletvinput/MainFragment.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-c79b9ffaadf030044e170a78f24aaafc38ebc21ba0ae65e0ef66eb3695e69fd1> (2) - *M* app/src/main/java/com/example/android/sampletvinput/player/DemoPlayer.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-5eb195db34fff87c2e7bab1727a8fdecb311f0de5187329c41aac7faebd3df10> (2) - *M* app/src/main/java/com/example/android/sampletvinput/player/FakeTrickplayRunnable.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-8daed22e963d9060e8956964036588e7b210101ffd7e0fa2d3a98163c358f848> (2) - *M* app/src/main/java/com/example/android/sampletvinput/rich/FirstStepFragment.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-e0fe2ef65c6ee0ead8a41245e86abb04292010cb75036bf8e21b10c858deda33> (8) - *M* app/src/main/java/com/example/android/sampletvinput/rich/RichAppLinkDetailsFragment.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-67bafafb2ecc7a7d8351c477f9a24f6ad07a523151f584d362435e8dbd9daa07> (22) - *M* app/src/main/java/com/example/android/sampletvinput/rich/RichAppLinkSidePanelActivity.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-d5c62620226a8bfb0aba5b8379ae3a0dc985607ad795633e1096a93ba7497f26> (4) - *M* app/src/main/java/com/example/android/sampletvinput/rich/RichSetupFragment.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-d5440918743008f411c1cfe8dcccbb3769da22f56d6c5f9350754f1aeb2522d5> (4) - *M* app/src/main/java/com/example/android/sampletvinput/rich/RichTvInputService.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-a6960c8b97262a36373c1b8beaea6a3504e8a899ffc98cf130ab45ebd3688a12> (4) - *M* app/src/main/java/com/example/android/sampletvinput/rich/RichTvInputSetupActivity.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-70f818aba4108658bcf972e83273f4b1b454ab7476980e04fa2b6d3eff27478d> (2) - *M* build.gradle <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-49a96e7eea8a94af862798a45174e6ac43eb4f8b4bd40759b5da63ba31ec3ef7> (2) - *A* gradle.properties <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-3d103fc7c312a3e136f88e81cef592424b8af2464c468116545c4d22d6edcf19> (2) - *M* gradle/wrapper/gradle-wrapper.properties <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-40640fe1078ece83d7ea8fb67daacd77923a86d13447baf9769660b3b46f2ece> (4) - *M* library/build.gradle <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-1cfc99164a9e87fb25dc437e1caa400c8144dcec3cf57c8766f7498e5957028d> (13) - *M* library/src/main/java/com/google/android/media/tv/companionlibrary/AdController.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-8e6cf31a6351e71314bdd34aee4ce04516c4c8660a58b6d549810af4847a7d5d> (2) - *M* library/src/main/java/com/google/android/media/tv/companionlibrary/BaseTvInputService.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-d6f8fbff5f5a85e381689d6f519173d9460475347c8e06fb0da82bd35800b50f> (2) - *M* library/src/main/java/com/google/android/media/tv/companionlibrary/ads/EpgSyncWithAdsJobService.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-dad356324cf9b1503d99ebaabf6ecd2b499053747de0c4c1d14507c9a933bd2e> (2) - *M* library/src/main/java/com/google/android/media/tv/companionlibrary/model/Advertisement.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-e501e68af5d45402893ff09b1adf99f9536b75179aecf5c9cdb44729ec7e8054> (2) - *M* library/src/main/java/com/google/android/media/tv/companionlibrary/model/InternalProviderData.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-3abd88f0991400b74422ea74ddfd56b25173429e457dcf71868ea7d07cadec5a> (2) - *M* library/src/main/java/com/google/android/media/tv/companionlibrary/model/ModelUtils.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-8f46437e17a8126be5d6049e9313c663a3c8d19c7c854a3288abaef33e74cd76> (2) - *M* library/src/main/java/com/google/android/media/tv/companionlibrary/model/Program.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-d0fed3e98a3687a0379e2933b1190a66dbc27f05695e1fb61adfe08406497827> (2) - *M* library/src/main/java/com/google/android/media/tv/companionlibrary/setup/ChannelSetupFragment.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-f8fa570140f8aea1ffeaf53b33f067ce01e439eade4a1ece4c7b3b7b6cb6237d> (4) - *M* library/src/main/java/com/google/android/media/tv/companionlibrary/setup/ChannelSetupStepFragment.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-5d7e9e89289c399bd32e53e57eec1d273b141e8f7cce82a7834e8022f01eaa0f> (8) - *M* library/src/main/java/com/google/android/media/tv/companionlibrary/setup/ChannelSetupStepSupportFragment.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-4e50afd30d87d5817568d3564a3f76b05f0672e0019f50eddfaac8adac6645f8> (8) - *M* library/src/main/java/com/google/android/media/tv/companionlibrary/setup/ChannelSetupStylist.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-6356e1812cc80b5d5994e52f0214dd4c46f4248479bbf3c2fc96a24fddce4fff> (2) - *M* library/src/main/java/com/google/android/media/tv/companionlibrary/sync/EpgSyncJobService.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-cc134f8a368ba907f4dabb279e4f52b979b311a29e961f66d9de604087bbebf1> (6) - *M* library/src/main/java/com/google/android/media/tv/companionlibrary/xmltv/XmlTvParser.java <https://github.com/googlesamples/androidtv-sample-inputs/pull/56/files#diff-181edc1ad2cf18935227303b02c8f38b20fdd361a2316ecf4e731203049e0b57> (2) Patch Links: - https://github.com/googlesamples/androidtv-sample-inputs/pull/56.patch - https://github.com/googlesamples/androidtv-sample-inputs/pull/56.diff — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#56>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AJOT5CJIM4TN6SPTQMLGDJLSUAQYHANCNFSM4UUKB5BQ> .

benbaxter reviewed

View reviewed changes

app/src/main/AndroidManifest.xml

@@ @@ -124,5 +124,10 @@ @@
                       <meta-data
                           android:name="com.google.android.gms.version"
                           android:value="@integer/google_play_services_version" />
+                      <!-- Sample AdMob app ID: ca-app-pub-3940256099942544~3347511713 -->

benbaxter Dec 11, 2020

Instead of adding a real (or real looking) AdMob ID, it would be better to add a comment explaining that this is required and update the READMe with instructions on how to obtain the ID.

Alternatively, this might be able to be supplied through gradle's properties and then each developer who downloads the sample can update their properties with their ID.

techker commented Feb 22, 2023

can this be merged?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet