aboutsummaryrefslogtreecommitdiff
path: root/partner_support
diff options
context:
space:
mode:
authornchalko <nchalko@google.com>2018-03-23 14:44:26 -0700
committerNick Chalko <nchalko@google.com>2018-03-30 10:57:12 -0700
commit14e4d7842857fac30a94ce90676cdf482754dbc1 (patch)
tree69d70baa6673590e8489df3d09db3524148be187 /partner_support
parentbade70fb733da027e94f91dbecd3c329212626d1 (diff)
downloadTV-14e4d7842857fac30a94ce90676cdf482754dbc1.tar.gz
FIX: Allow partners to turn off embedded tuner
PiperOrigin-RevId: 190277502 Change-Id: Ibf9b0751dbb585b8fb0aa20948f94733c4e05be7 Test: m LiveTv
Diffstat (limited to 'partner_support')
-rw-r--r--partner_support/g3doc/TurnOffEmbeddedTuner.md15
-rw-r--r--partner_support/sample_customization/res/values/bools.xml1
-rw-r--r--partner_support/src/com/google/android/tv/partner/support/BaseCustomization.java9
-rw-r--r--partner_support/src/com/google/android/tv/partner/support/PartnerCustomizations.java10
4 files changed, 32 insertions, 3 deletions
diff --git a/partner_support/g3doc/TurnOffEmbeddedTuner.md b/partner_support/g3doc/TurnOffEmbeddedTuner.md
new file mode 100644
index 00000000..0ba7cff2
--- /dev/null
+++ b/partner_support/g3doc/TurnOffEmbeddedTuner.md
@@ -0,0 +1,15 @@
+# 3rd party instructions turning off the embedded tuner in Live Channels
+
+Partners that have a built in tuner should provide a TV Input like
+SampleDvbTuner. When partners provide their own tuner they MUST turn of the
+embedded tuner in Live Channels.
+
+### Customisation
+
+Indicate Live Channels should not use it's embedded tuner implementation.
+
+```
+<bool name="turn_off_embedded_tuner">true</bool>
+```
+
+See https://source.android.com/devices/tv/customize-tv-app
diff --git a/partner_support/sample_customization/res/values/bools.xml b/partner_support/sample_customization/res/values/bools.xml
index 48a179ff..259548b4 100644
--- a/partner_support/sample_customization/res/values/bools.xml
+++ b/partner_support/sample_customization/res/values/bools.xml
@@ -18,4 +18,5 @@
<resources>
<bool name="tvprovider_allows_system_inserts_to_program_table">true</bool>
<bool name="tvprovider_allows_column_creation">true</bool>
+ <bool name="turn_off_embedded_tuner">true</bool>
</resources> \ No newline at end of file
diff --git a/partner_support/src/com/google/android/tv/partner/support/BaseCustomization.java b/partner_support/src/com/google/android/tv/partner/support/BaseCustomization.java
index e40d90d7..1f7198eb 100644
--- a/partner_support/src/com/google/android/tv/partner/support/BaseCustomization.java
+++ b/partner_support/src/com/google/android/tv/partner/support/BaseCustomization.java
@@ -83,7 +83,14 @@ public class BaseCustomization {
? 0
: res.getIdentifier(resourceName, RES_TYPE_BOOLEAN, packageName);
if (DEBUG) {
- Log.d(TAG, "Boolean resource " + resourceName + " has " + resId);
+ Log.d(
+ TAG,
+ "Boolean resource "
+ + resourceName
+ + " has "
+ + resId
+ + " with value "
+ + (resId == 0 ? "missing" : res.getBoolean(resId)));
}
return resId == 0 ? Optional.empty() : Optional.of(res.getBoolean(resId));
} catch (PackageManager.NameNotFoundException e) {
diff --git a/partner_support/src/com/google/android/tv/partner/support/PartnerCustomizations.java b/partner_support/src/com/google/android/tv/partner/support/PartnerCustomizations.java
index 6ef8e65f..11331076 100644
--- a/partner_support/src/com/google/android/tv/partner/support/PartnerCustomizations.java
+++ b/partner_support/src/com/google/android/tv/partner/support/PartnerCustomizations.java
@@ -32,8 +32,10 @@ public final class PartnerCustomizations extends BaseCustomization {
public static final String TVPROVIDER_ALLOWS_SYSTEM_INSERTS_TO_PROGRAM_TABLE =
"tvprovider_allows_system_inserts_to_program_table";
- public static final String TVPROVIDER_ALLOWS_COLUMN_CREATION
- = "tvprovider_allows_column_creation";
+ public static final String TVPROVIDER_ALLOWS_COLUMN_CREATION =
+ "tvprovider_allows_column_creation";
+
+ public static final String TURN_OFF_EMBEDDED_TUNER = "turn_off_embedded_tuner";
public PartnerCustomizations(Context context) {
super(context, CUSTOMIZE_PERMISSIONS);
@@ -47,4 +49,8 @@ public final class PartnerCustomizations extends BaseCustomization {
public boolean doesTvProviderAllowColumnCreation(Context context) {
return getBooleanResource(context, TVPROVIDER_ALLOWS_COLUMN_CREATION).orElse(false);
}
+
+ public boolean turnOffEmbeddedTuner(Context context) {
+ return getBooleanResource(context, TURN_OFF_EMBEDDED_TUNER).orElse(false);
+ }
}