aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Chalko <nchalko@google.com>2019-07-10 11:23:11 -0700
committerCopybara-Service <copybara-worker@google.com>2019-07-23 16:28:58 -0700
commit0df30f7f9f522ac1934110cea09d2ec9f66ae281 (patch)
tree53b4feb628aaefe6ce25ba513dfeaff3c1df8801
parent58e01af74f2aea51724824001612bef3be5726e8 (diff)
downloadTV-0df30f7f9f522ac1934110cea09d2ec9f66ae281.tar.gz
Inject fragements in onAttach(Activity)
PiperOrigin-RevId: 257444942 Change-Id: I1a5ebd1c1ca53e7bfacdcb5f735f25248bbb8107
-rw-r--r--src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java11
-rw-r--r--src/com/android/tv/ui/sidepanel/parentalcontrols/RatingsFragment.java12
2 files changed, 17 insertions, 6 deletions
diff --git a/src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java b/src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java
index 81ff1fc5..e43568c9 100644
--- a/src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java
+++ b/src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java
@@ -16,17 +16,22 @@
package com.android.tv.ui.sidepanel;
-import android.content.Context;
+import android.app.Activity;
+
import com.android.tv.MainActivity;
import com.android.tv.R;
import com.android.tv.common.BuildConfig;
import com.android.tv.common.CommonPreferences;
import com.android.tv.common.feature.CommonFeatures;
import com.android.tv.perf.PerformanceMonitor;
+
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
+
import dagger.android.AndroidInjection;
+
import com.android.tv.common.flags.LegacyFlags;
+
import javax.inject.Inject;
/** Options for developers only */
@@ -38,9 +43,9 @@ public class DeveloperOptionFragment extends SideFragment {
@Inject LegacyFlags mLegacyFlags;
@Override
- public void onAttach(Context context) {
+ public void onAttach(Activity activity) {
AndroidInjection.inject(this);
- super.onAttach(context);
+ super.onAttach(activity);
}
@Override
diff --git a/src/com/android/tv/ui/sidepanel/parentalcontrols/RatingsFragment.java b/src/com/android/tv/ui/sidepanel/parentalcontrols/RatingsFragment.java
index 064f86f1..60f8425f 100644
--- a/src/com/android/tv/ui/sidepanel/parentalcontrols/RatingsFragment.java
+++ b/src/com/android/tv/ui/sidepanel/parentalcontrols/RatingsFragment.java
@@ -16,7 +16,7 @@
package com.android.tv.ui.sidepanel.parentalcontrols;
-import android.content.Context;
+import android.app.Activity;
import android.graphics.drawable.Drawable;
import android.media.tv.TvContentRating;
import android.os.Bundle;
@@ -25,6 +25,7 @@ import android.util.SparseIntArray;
import android.view.View;
import android.widget.CompoundButton;
import android.widget.ImageView;
+
import com.android.tv.MainActivity;
import com.android.tv.R;
import com.android.tv.dialog.WebDialogFragment;
@@ -39,13 +40,18 @@ import com.android.tv.ui.sidepanel.RadioButtonItem;
import com.android.tv.ui.sidepanel.SideFragment;
import com.android.tv.util.TvSettings;
import com.android.tv.util.TvSettings.ContentRatingLevel;
+
import com.google.common.collect.ImmutableList;
+
import dagger.android.AndroidInjection;
+
import com.android.tv.common.flags.LegacyFlags;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+
import javax.inject.Inject;
public class RatingsFragment extends SideFragment {
@@ -165,9 +171,9 @@ public class RatingsFragment extends SideFragment {
}
@Override
- public void onAttach(Context context) {
+ public void onAttach(Activity activity) {
AndroidInjection.inject(this);
- super.onAttach(context);
+ super.onAttach(activity);
if (mLegacyFlags.enableUnratedContentSettings()) {
mBlockUnratedItem =
new CheckBoxItem(