Hide the get more channels actions. am: a2abdb2ca2 am: f5349e3537

Change-Id: Ia1cf8afa2b496cbb876164652f42ddd8c846e99c

6 files changed, 18 insertions, 25 deletions

diff --git a/common/src/com/android/tv/common/flags/UiFlags.java b/common/src/com/android/tv/common/flags/UiFlags.java
index 2778d272..3babc347 100755
--- a/common/src/com/android/tv/common/flags/UiFlags.java
+++ b/common/src/com/android/tv/common/flags/UiFlags.java
@@ -37,7 +37,11 @@ public interface UiFlags {
      */
     long maxHistoryDays();
 
-    /** The URL in playstore to send the user to when they select <emp>get more channels</emp>. */
+    /**
+     * The URL in playstore to send the user to when they select <emp>get more channels</emp>.
+     *
+     * <p>If the value is empty then the <emp>get more channels</emp> action is not shown.
+     */
     String moreChannelsUrl();
 
     /** Unhide the launcher all the time */
diff --git a/common/src/com/android/tv/common/flags/impl/DefaultUiFlags.java b/common/src/com/android/tv/common/flags/impl/DefaultUiFlags.java
index eaf82456..fd4ab2de 100644
--- a/common/src/com/android/tv/common/flags/impl/DefaultUiFlags.java
+++ b/common/src/com/android/tv/common/flags/impl/DefaultUiFlags.java
@@ -37,7 +37,7 @@ public class DefaultUiFlags implements UiFlags {
 
     @Override
     public String moreChannelsUrl() {
-        return "https://play.google.com/store/apps/collection/promotion_3001bf9_ATV_livechannels";
+        return "";
     }
 
     @Override
diff --git a/tests/robotests/src/com/android/tv/dvr/provider/DvrDbSyncTest.java b/tests/robotests/src/com/android/tv/dvr/provider/DvrDbSyncTest.java
index c7ae5240..0ee6b38d 100644
--- a/tests/robotests/src/com/android/tv/dvr/provider/DvrDbSyncTest.java
+++ b/tests/robotests/src/com/android/tv/dvr/provider/DvrDbSyncTest.java
@@ -20,13 +20,12 @@ import static com.google.common.truth.Truth.assertThat;
 import static java.lang.Math.abs;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.refEq;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.refEq;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.android.tv.common.flags.DvrFlags;
 import com.android.tv.common.flags.impl.DefaultDvrFlags;
 import com.android.tv.data.ChannelDataManager;
 import com.android.tv.data.ProgramImpl;
@@ -38,7 +37,8 @@ import com.android.tv.dvr.data.SeriesRecording;
 import com.android.tv.dvr.recorder.SeriesRecordingScheduler;
 import com.android.tv.testing.TestSingletonApp;
 import com.android.tv.testing.constants.ConfigConstants;
-
+import com.android.tv.common.flags.DvrFlags;
+import java.util.concurrent.TimeUnit;
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
@@ -51,8 +51,6 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.android.util.concurrent.RoboExecutorService;
 import org.robolectric.annotation.Config;
 
-import java.util.concurrent.TimeUnit;
-
 /** Tests for {@link com.android.tv.dvr.DvrScheduleManager} */
 @RunWith(RobolectricTestRunner.class)
 @Config(sdk = ConfigConstants.SDK, application = TestSingletonApp.class)
diff --git a/tests/robotests/src/com/android/tv/dvr/recorder/InputTaskSchedulerTest.java b/tests/robotests/src/com/android/tv/dvr/recorder/InputTaskSchedulerTest.java
index 40069f62..8ab8a317 100644
--- a/tests/robotests/src/com/android/tv/dvr/recorder/InputTaskSchedulerTest.java
+++ b/tests/robotests/src/com/android/tv/dvr/recorder/InputTaskSchedulerTest.java
@@ -19,7 +19,7 @@ package com.android.tv.dvr.recorder;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.timeout;
@@ -31,7 +31,6 @@ import android.media.tv.TvInputInfo;
 import android.os.Build;
 import android.os.Looper;
 import android.os.SystemClock;
-
 import com.android.tv.InputSessionManager;
 import com.android.tv.common.util.Clock;
 import com.android.tv.data.ChannelDataManager;
@@ -44,7 +43,9 @@ import com.android.tv.testing.TestSingletonApp;
 import com.android.tv.testing.dvr.RecordingTestUtils;
 import com.android.tv.testing.fakes.FakeClock;
 import com.android.tv.testing.utils.TestUtils;
-
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -54,10 +55,6 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
 /** Tests for {@link InputTaskScheduler}. */
 @RunWith(RobolectricTestRunner.class)
 @Config(sdk = Build.VERSION_CODES.N, application = TestSingletonApp.class)
diff --git a/tests/robotests/src/com/android/tv/dvr/recorder/RecordingTaskTest.java b/tests/robotests/src/com/android/tv/dvr/recorder/RecordingTaskTest.java
index 55ee270c..501087ff 100644
--- a/tests/robotests/src/com/android/tv/dvr/recorder/RecordingTaskTest.java
+++ b/tests/robotests/src/com/android/tv/dvr/recorder/RecordingTaskTest.java
@@ -22,7 +22,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
@@ -31,7 +31,6 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-
 import com.android.tv.InputSessionManager;
 import com.android.tv.InputSessionManager.RecordingSession;
 import com.android.tv.common.feature.CommonFeatures;
@@ -45,7 +44,7 @@ import com.android.tv.testing.TestSingletonApp;
 import com.android.tv.testing.dvr.DvrDataManagerInMemoryImpl;
 import com.android.tv.testing.dvr.RecordingTestUtils;
 import com.android.tv.testing.fakes.FakeClock;
-
+import java.util.concurrent.TimeUnit;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -56,8 +55,6 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import java.util.concurrent.TimeUnit;
-
 /** Tests for {@link RecordingTask}. */
 @RunWith(RobolectricTestRunner.class)
 @Config(sdk = Build.VERSION_CODES.N, application = TestSingletonApp.class)
diff --git a/tests/robotests/src/com/android/tv/dvr/recorder/SchedulerTest.java b/tests/robotests/src/com/android/tv/dvr/recorder/SchedulerTest.java
index d2bd2ff1..062947bc 100644
--- a/tests/robotests/src/com/android/tv/dvr/recorder/SchedulerTest.java
+++ b/tests/robotests/src/com/android/tv/dvr/recorder/SchedulerTest.java
@@ -19,7 +19,7 @@ package com.android.tv.dvr.recorder;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
 
@@ -27,7 +27,6 @@ import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.os.Build;
 import android.os.Looper;
-
 import com.android.tv.InputSessionManager;
 import com.android.tv.common.feature.CommonFeatures;
 import com.android.tv.common.feature.TestableFeature;
@@ -39,7 +38,7 @@ import com.android.tv.testing.dvr.DvrDataManagerInMemoryImpl;
 import com.android.tv.testing.dvr.RecordingTestUtils;
 import com.android.tv.testing.fakes.FakeClock;
 import com.android.tv.util.TvInputManagerHelper;
-
+import java.util.concurrent.TimeUnit;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -51,8 +50,6 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import java.util.concurrent.TimeUnit;
-
 /** Tests for {@link RecordingScheduler}. */
 @RunWith(RobolectricTestRunner.class)
 @Config(sdk = Build.VERSION_CODES.N, application = TestSingletonApp.class)