summaryrefslogtreecommitdiff
path: root/Settings/src/com/android/tv/settings/vendor/ChannelsAndInputFragment.java
diff options
context:
space:
mode:
Diffstat (limited to 'Settings/src/com/android/tv/settings/vendor/ChannelsAndInputFragment.java')
-rw-r--r--Settings/src/com/android/tv/settings/vendor/ChannelsAndInputFragment.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/Settings/src/com/android/tv/settings/vendor/ChannelsAndInputFragment.java b/Settings/src/com/android/tv/settings/vendor/ChannelsAndInputFragment.java
index 1e0765407..772a2cc12 100644
--- a/Settings/src/com/android/tv/settings/vendor/ChannelsAndInputFragment.java
+++ b/Settings/src/com/android/tv/settings/vendor/ChannelsAndInputFragment.java
@@ -22,6 +22,9 @@ import androidx.annotation.Keep;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
+import com.android.tv.settings.customization.CustomizationConstants;
+import com.android.tv.settings.customization.Partner;
+import com.android.tv.settings.customization.PartnerPreferencesMerger;
/** A vendor sample of Channels And Inputs settings. */
@Keep
@@ -29,5 +32,12 @@ public class ChannelsAndInputFragment extends SettingsPreferenceFragment {
@Override
public void onCreatePreferences(Bundle bundle, String s) {
setPreferencesFromResource(R.xml.channels_and_inputs_vendor, null);
+ if (Partner.getInstance(getContext()).isCustomizationPackageProvided()) {
+ PartnerPreferencesMerger.mergePreferences(
+ getContext(),
+ getPreferenceScreen(),
+ CustomizationConstants.CHANNELS_AND_INPUTS_SCREEN
+ );
+ }
}
}