diff options
Diffstat (limited to 'common/src/com/android/tv/common')
6 files changed, 11 insertions, 42 deletions
diff --git a/common/src/com/android/tv/common/SharedPreferencesUtils.java b/common/src/com/android/tv/common/SharedPreferencesUtils.java index 1b929d3b..fb3d9b56 100644 --- a/common/src/com/android/tv/common/SharedPreferencesUtils.java +++ b/common/src/com/android/tv/common/SharedPreferencesUtils.java @@ -35,7 +35,6 @@ public final class SharedPreferencesUtils { public static final String SHARED_PREF_RECURRING_RUNNER = "sharedPreferencesRecurringRunner"; public static final String SHARED_PREF_EPG = "epg_preferences"; public static final String SHARED_PREF_SERIES_RECORDINGS = "seriesRecordings"; - public static final String SHARED_PREF_CHANNEL_LOGO_URIS = "channelLogoUris"; private static boolean sInitializeCalled; diff --git a/common/src/com/android/tv/common/TvCommonUtils.java b/common/src/com/android/tv/common/TvCommonUtils.java index c391ad24..a88dd3a8 100644 --- a/common/src/com/android/tv/common/TvCommonUtils.java +++ b/common/src/com/android/tv/common/TvCommonUtils.java @@ -23,8 +23,6 @@ import android.media.tv.TvInputInfo; * Util class for common use in TV app and inputs. */ public final class TvCommonUtils { - private static Boolean sRunningInTest; - private TvCommonUtils() { } /** @@ -60,15 +58,12 @@ public final class TvCommonUtils { * the usual devices even the application is running in tests. We need to figure it out by * checking whether the class in tv-tests-common module can be loaded or not. */ - public static synchronized boolean isRunningInTest() { - if (sRunningInTest == null) { - try { - Class.forName("com.android.tv.testing.Utils"); - sRunningInTest = true; - } catch (ClassNotFoundException e) { - sRunningInTest = false; - } + public static boolean isRunningInTest() { + try { + Class.forName("com.android.tv.testing.Utils"); + return true; + } catch (ClassNotFoundException e) { + return false; } - return sRunningInTest; } } diff --git a/common/src/com/android/tv/common/TvContentRatingCache.java b/common/src/com/android/tv/common/TvContentRatingCache.java index 8b3c06f1..5694cda7 100644 --- a/common/src/com/android/tv/common/TvContentRatingCache.java +++ b/common/src/com/android/tv/common/TvContentRatingCache.java @@ -43,7 +43,6 @@ public final class TvContentRatingCache implements MemoryManageable { return INSTANCE; } - // @GuardedBy("TvContentRatingCache.this") private final Map<String, TvContentRating[]> mRatingsMultiMap = new ArrayMap<>(); /** @@ -52,7 +51,7 @@ public final class TvContentRatingCache implements MemoryManageable { * Returns {@code null} if the string is empty or contains no valid ratings. */ @Nullable - public synchronized TvContentRating[] getRatings(String commaSeparatedRatings) { + public TvContentRating[] getRatings(String commaSeparatedRatings) { if (TextUtils.isEmpty(commaSeparatedRatings)) { return null; } @@ -137,7 +136,7 @@ public final class TvContentRatingCache implements MemoryManageable { } @Override - public synchronized void performTrimMemory(int level) { + public void performTrimMemory(int level) { mRatingsMultiMap.clear(); } diff --git a/common/src/com/android/tv/common/feature/SharedPreferencesFeature.java b/common/src/com/android/tv/common/feature/SharedPreferencesFeature.java index 881f53d6..a4a79b38 100644 --- a/common/src/com/android/tv/common/feature/SharedPreferencesFeature.java +++ b/common/src/com/android/tv/common/feature/SharedPreferencesFeature.java @@ -19,6 +19,7 @@ package com.android.tv.common.feature; import android.content.Context; import android.content.SharedPreferences; import android.util.Log; + import com.android.tv.common.SharedPreferencesUtils; /** diff --git a/common/src/com/android/tv/common/feature/TestableFeature.java b/common/src/com/android/tv/common/feature/TestableFeature.java index d7e707a1..a02877ec 100644 --- a/common/src/com/android/tv/common/feature/TestableFeature.java +++ b/common/src/com/android/tv/common/feature/TestableFeature.java @@ -36,29 +36,14 @@ public class TestableFeature implements Feature { private final Feature mDelegate; private Boolean mTestValue = null; - /** - * Creates testable feature. - */ public static TestableFeature createTestableFeature(Feature delegate) { return new TestableFeature(delegate); } - /** - * Creates testable feature with initial value. - */ - public static TestableFeature createTestableFeature(Feature delegate, Boolean initialValue) { - return new TestableFeature(delegate, initialValue); - } - private TestableFeature(Feature delegate) { mDelegate = delegate; } - private TestableFeature(Feature delegate, Boolean initialValue) { - mDelegate = delegate; - mTestValue = initialValue; - } - @VisibleForTesting public void enableForTest() { if (!TvCommonUtils.isRunningInTest()) { diff --git a/common/src/com/android/tv/common/ui/setup/SetupMultiPaneFragment.java b/common/src/com/android/tv/common/ui/setup/SetupMultiPaneFragment.java index b9ad4657..63247481 100644 --- a/common/src/com/android/tv/common/ui/setup/SetupMultiPaneFragment.java +++ b/common/src/com/android/tv/common/ui/setup/SetupMultiPaneFragment.java @@ -34,7 +34,6 @@ public abstract class SetupMultiPaneFragment extends SetupFragment { private static final boolean DEBUG = false; public static final int ACTION_DONE = Integer.MAX_VALUE; - public static final int ACTION_SKIP = ACTION_DONE - 1; private static final String CONTENT_FRAGMENT_TAG = "content_fragment"; @@ -54,12 +53,7 @@ public abstract class SetupMultiPaneFragment extends SetupFragment { } if (needsDoneButton()) { setOnClickAction(view.findViewById(R.id.button_done), getActionCategory(), ACTION_DONE); - } - if (needsSkipButton()) { - view.findViewById(R.id.button_skip).setVisibility(View.VISIBLE); - setOnClickAction(view.findViewById(R.id.button_skip), getActionCategory(), ACTION_SKIP); - } - if (!needsDoneButton() && !needsSkipButton()) { + } else { View doneButtonContainer = view.findViewById(R.id.done_button_container); // Use content view to check layout direction while view is being created. if (getResources().getConfiguration().getLayoutDirection() @@ -96,10 +90,6 @@ public abstract class SetupMultiPaneFragment extends SetupFragment { return true; } - protected boolean needsSkipButton() { - return false; - } - @Override protected int[] getParentIdsForDelay() { return new int[] {R.id.content_fragment, R.id.guidedactions_list}; @@ -109,4 +99,4 @@ public abstract class SetupMultiPaneFragment extends SetupFragment { public int[] getSharedElementIds() { return new int[] {R.id.action_fragment_background, R.id.done_button_container}; } -}
\ No newline at end of file +} |