10 files changed, 26 insertions, 268 deletions
diff --git a/common/src/com/android/tv/common/flags/impl/DefaultBackendKnobsFlags.java b/common/src/com/android/tv/common/flags/impl/DefaultBackendKnobsFlags.java
index 5302842b..a189e473 100644
--- a/common/src/com/android/tv/common/flags/impl/DefaultBackendKnobsFlags.java
+++ b/common/src/com/android/tv/common/flags/impl/DefaultBackendKnobsFlags.java
@@ -25,8 +25,8 @@ public final class DefaultBackendKnobsFlags
     }
 
     @Override
-    public long epgFetcherChannelsPerProgramFetch() {
-        return 50;
+    public boolean enablePartialProgramFetch() {
+        return false;
     }
 
     @Override
@@ -35,8 +35,13 @@ public final class DefaultBackendKnobsFlags
     }
 
     @Override
+    public boolean fetchProgramsAsNeeded() {
+        return false;
+    }
+
+    @Override
     public long programGuideInitialFetchHours() {
-        return 4;
+        return 8;
     }
 
     @Override
diff --git a/common/src/com/android/tv/common/flags/impl/DefaultDvrFlags.java b/common/src/com/android/tv/common/flags/impl/DefaultConcurrentDvrPlaybackFlags.java
index 09f7b4f3..8d8c584a 100644
--- a/common/src/com/android/tv/common/flags/impl/DefaultDvrFlags.java
+++ b/common/src/com/android/tv/common/flags/impl/DefaultConcurrentDvrPlaybackFlags.java
@@ -15,9 +15,10 @@
  */
 package com.android.tv.common.flags.impl;
 
-/** Flags for tuning non ui behavior. */
-public final class DefaultDvrFlags
-        implements com.android.tv.common.flags.DvrFlags {
+import com.android.tv.common.flags.ConcurrentDvrPlaybackFlags;
+
+/** Default flags for Concurrent DVR Playback */
+public final class DefaultConcurrentDvrPlaybackFlags implements ConcurrentDvrPlaybackFlags {
 
     @Override
     public boolean compiled() {
@@ -25,12 +26,12 @@ public final class DefaultDvrFlags
     }
 
     @Override
-    public boolean startEarlyEndLateEnabled() {
+    public boolean enabled() {
         return false;
     }
 
     @Override
-    public boolean storeVideoAspectRatio() {
+    public boolean onTuneUsesRecording() {
         return false;
     }
 }
diff --git a/common/src/com/android/tv/common/flags/impl/DefaultFlagsModule.java b/common/src/com/android/tv/common/flags/impl/DefaultFlagsModule.java
index 10be34b5..49352364 100644
--- a/common/src/com/android/tv/common/flags/impl/DefaultFlagsModule.java
+++ b/common/src/com/android/tv/common/flags/impl/DefaultFlagsModule.java
@@ -18,12 +18,9 @@ package com.android.tv.common.flags.impl;
 import dagger.Module;
 import dagger.Provides;
 import dagger.Reusable;
-
 import com.android.tv.common.flags.BackendKnobsFlags;
 import com.android.tv.common.flags.CloudEpgFlags;
-import com.android.tv.common.flags.DvrFlags;
-import com.android.tv.common.flags.LegacyFlags;
-import com.android.tv.common.flags.StartupFlags;
+import com.android.tv.common.flags.ConcurrentDvrPlaybackFlags;
 import com.android.tv.common.flags.TunerFlags;
 import com.android.tv.common.flags.UiFlags;
 
@@ -45,20 +42,8 @@ public class DefaultFlagsModule {
 
     @Provides
     @Reusable
-    DvrFlags provideDvrFlags() {
-        return new DefaultDvrFlags();
-    }
-
-    @Provides
-    @Reusable
-    LegacyFlags provideLegacyFlags() {
-        return DefaultLegacyFlags.DEFAULT;
-    }
-
-    @Provides
-    @Reusable
-    StartupFlags provideStartupFlags() {
-        return new DefaultStartupFlags();
+    ConcurrentDvrPlaybackFlags provideConcurrentDvrPlaybackFlags() {
+        return new DefaultConcurrentDvrPlaybackFlags();
     }
 
     @Provides
diff --git a/common/src/com/android/tv/common/flags/impl/DefaultLegacyFlags.java b/common/src/com/android/tv/common/flags/impl/DefaultLegacyFlags.java
deleted file mode 100644
index 52142416..00000000
--- a/common/src/com/android/tv/common/flags/impl/DefaultLegacyFlags.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.tv.common.flags.impl;
-
-import com.google.auto.value.AutoValue;
-import com.android.tv.common.flags.LegacyFlags;
-
-/** Default {@link LegacyFlags}. */
-@AutoValue
-public abstract class DefaultLegacyFlags implements LegacyFlags {
-    public static final DefaultLegacyFlags DEFAULT = DefaultLegacyFlags.builder().build();
-
-    public static Builder builder() {
-        return new AutoValue_DefaultLegacyFlags.Builder()
-                .compiled(true)
-                .enableDeveloperFeatures(false)
-                .enableQaFeatures(false)
-                .enableUnratedContentSettings(false);
-    }
-
-    /** Builder for {@link LegacyFlags} */
-    @AutoValue.Builder
-    public abstract static class Builder {
-        public abstract Builder compiled(boolean value);
-
-        public abstract Builder enableDeveloperFeatures(boolean value);
-
-        public abstract Builder enableQaFeatures(boolean value);
-
-        public abstract Builder enableUnratedContentSettings(boolean value);
-
-        public abstract DefaultLegacyFlags build();
-    }
-}
diff --git a/common/src/com/android/tv/common/flags/impl/DefaultMessagesFlags.java b/common/src/com/android/tv/common/flags/impl/DefaultMessagesFlags.java
deleted file mode 100644
index f2130a33..00000000
--- a/common/src/com/android/tv/common/flags/impl/DefaultMessagesFlags.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.tv.common.flags.impl;
-
-/**
- * Default flag values for {@link
- * com.android.tv.common.flags.MessagesFlags}.
- */
-public final class DefaultMessagesFlags
-        implements com.android.tv.common.flags.MessagesFlags {
-
-    @Override
-    public boolean compiled() {
-        return true;
-    }
-
-}
diff --git a/common/src/com/android/tv/common/flags/impl/DefaultSetupFlags.java b/common/src/com/android/tv/common/flags/impl/DefaultSetupFlags.java
deleted file mode 100644
index 3abe6627..00000000
--- a/common/src/com/android/tv/common/flags/impl/DefaultSetupFlags.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.tv.common.flags.impl;
-
-import com.android.tv.common.flags.proto.TypedFeatures.StringListParam;
-
-import com.android.tv.common.flags.SetupFlags;
-
-/** Default {@link SetupFlags} */
-public class DefaultSetupFlags implements SetupFlags {
-    @Override
-    public boolean compiled() {
-        return true;
-    }
-
-    @Override
-    public StringListParam setupPassThroughPackageWhitelist() {
-        return StringListParam.getDefaultInstance();
-    }
-
-    @Override
-    public boolean useWhitelistForSetupPassThrough() {
-        return false;
-    }
-}
diff --git a/common/src/com/android/tv/common/flags/impl/DefaultStartupFlags.java b/common/src/com/android/tv/common/flags/impl/DefaultStartupFlags.java
deleted file mode 100644
index 3eb6edc6..00000000
--- a/common/src/com/android/tv/common/flags/impl/DefaultStartupFlags.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.tv.common.flags.impl;
-
-import com.android.tv.common.flags.proto.TypedFeatures.StringListParam;
-import com.android.tv.common.flags.StartupFlags;
-
-/** Default {@link StartupFlags} */
-public class DefaultStartupFlags implements StartupFlags {
-    @Override
-    public boolean compiled() {
-        return true;
-    }
-
-    @Override
-    public StringListParam warmupInputidBlacklist() {
-        return StringListParam.getDefaultInstance();
-    }
-}
diff --git a/common/src/com/android/tv/common/flags/impl/DefaultTunerFlags.java b/common/src/com/android/tv/common/flags/impl/DefaultTunerFlags.java
index 2d12e368..195953bc 100644
--- a/common/src/com/android/tv/common/flags/impl/DefaultTunerFlags.java
+++ b/common/src/com/android/tv/common/flags/impl/DefaultTunerFlags.java
@@ -26,6 +26,11 @@ public class DefaultTunerFlags implements TunerFlags {
     }
 
     @Override
+    public boolean tuneUsingRecording() {
+        return false;
+    }
+
+    @Override
     public boolean useExoplayerV2() {
         return false;
     }
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 43f0dea0..fce45853 100644
--- a/common/src/com/android/tv/common/flags/impl/DefaultUiFlags.java
+++ b/common/src/com/android/tv/common/flags/impl/DefaultUiFlags.java
@@ -17,7 +17,7 @@ package com.android.tv.common.flags.impl;
 
 import com.android.tv.common.flags.UiFlags;
 
-/** Default Flags for TV app UI */
+/** Default Flags for Live TV UI */
 public class DefaultUiFlags implements UiFlags {
 
     @Override
@@ -26,17 +26,17 @@ public class DefaultUiFlags implements UiFlags {
     }
 
     @Override
-    public boolean enableCriticRatings() {
+    public boolean uhideLauncher() {
         return false;
     }
 
     @Override
-    public boolean unhideLauncher() {
+    public boolean useLeanbackPinPicker() {
         return false;
     }
 
     @Override
     public long maxHistoryDays() {
-        return 0;
+        return 7;
     }
 }
diff --git a/common/src/com/android/tv/common/flags/impl/SettableFlagsModule.java b/common/src/com/android/tv/common/flags/impl/SettableFlagsModule.java
deleted file mode 100644
index ab4ebd34..00000000
--- a/common/src/com/android/tv/common/flags/impl/SettableFlagsModule.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.tv.common.flags.impl;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-import com.android.tv.common.flags.BackendKnobsFlags;
-import com.android.tv.common.flags.CloudEpgFlags;
-import com.android.tv.common.flags.DvrFlags;
-import com.android.tv.common.flags.LegacyFlags;
-import com.android.tv.common.flags.SetupFlags;
-import com.android.tv.common.flags.StartupFlags;
-import com.android.tv.common.flags.TunerFlags;
-import com.android.tv.common.flags.UiFlags;
-
-/** Provides public fields for each flag so they can be changed before injection. */
-@Module
-public class SettableFlagsModule {
-
-    public DefaultBackendKnobsFlags backendKnobsFlags = new DefaultBackendKnobsFlags();
-    public DefaultCloudEpgFlags cloudEpgFlags = new DefaultCloudEpgFlags();
-    public DefaultDvrFlags dvrFlags = new DefaultDvrFlags();
-    public DefaultLegacyFlags legacyFlags = DefaultLegacyFlags.DEFAULT;
-    public DefaultSetupFlags setupFlags = new DefaultSetupFlags();
-    public DefaultStartupFlags startupFlags = new DefaultStartupFlags();
-    public DefaultTunerFlags tunerFlags = new DefaultTunerFlags();
-    public DefaultUiFlags uiFlags = new DefaultUiFlags();
-
-    @Provides
-    @Reusable
-    BackendKnobsFlags provideBackendKnobsFlags() {
-        return backendKnobsFlags;
-    }
-
-    @Provides
-    @Reusable
-    CloudEpgFlags provideCloudEpgFlags() {
-        return cloudEpgFlags;
-    }
-
-    @Provides
-    @Reusable
-    DvrFlags provideDvrFlags() {
-        return dvrFlags;
-    }
-
-    @Provides
-    @Reusable
-    LegacyFlags provideLegacyFlags() {
-        return legacyFlags;
-    }
-
-    @Provides
-    @Reusable
-    SetupFlags provideSetupFlags() {
-        return setupFlags;
-    }
-
-    @Provides
-    @Reusable
-    StartupFlags provideStartupFlags() {
-        return startupFlags;
-    }
-
-    @Provides
-    @Reusable
-    TunerFlags provideTunerFlags() {
-        return tunerFlags;
-    }
-
-    @Provides
-    @Reusable
-    UiFlags provideUiFlags() {
-        return uiFlags;
-    }
-}