diff options
Diffstat (limited to 'Settings/src/com/android/tv/settings/MainFragment.java')
| -rw-r--r-- | Settings/src/com/android/tv/settings/MainFragment.java | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/Settings/src/com/android/tv/settings/MainFragment.java b/Settings/src/com/android/tv/settings/MainFragment.java index 393da6a8a..fdd3a7f55 100644 --- a/Settings/src/com/android/tv/settings/MainFragment.java +++ b/Settings/src/com/android/tv/settings/MainFragment.java @@ -21,10 +21,10 @@ import static com.android.tv.settings.accounts.AccountsUtil.ACCOUNTS_FRAGMENT_DE import static com.android.tv.settings.accounts.AccountsUtil.ACCOUNTS_FRAGMENT_RESTRICTED; import static com.android.tv.settings.accounts.AccountsUtil.ACCOUNTS_SLICE_FRAGMENT; import static com.android.tv.settings.accounts.AccountsUtil.ACCOUNTS_SYSTEM_INTENT; -import static com.android.tv.settings.library.overlay.FlavorUtils.FLAVOR_CLASSIC; -import static com.android.tv.settings.library.overlay.FlavorUtils.FLAVOR_TWO_PANEL; -import static com.android.tv.settings.library.overlay.FlavorUtils.FLAVOR_VENDOR; -import static com.android.tv.settings.library.overlay.FlavorUtils.FLAVOR_X; +import static com.android.tv.settings.overlay.FlavorUtils.FLAVOR_CLASSIC; +import static com.android.tv.settings.overlay.FlavorUtils.FLAVOR_TWO_PANEL; +import static com.android.tv.settings.overlay.FlavorUtils.FLAVOR_VENDOR; +import static com.android.tv.settings.overlay.FlavorUtils.FLAVOR_X; import static com.android.tv.settings.util.InstrumentationUtils.logEntrySelected; import static com.android.tv.settings.util.InstrumentationUtils.logPageFocused; @@ -67,10 +67,13 @@ import com.android.tv.settings.accounts.AccountsUtil; import com.android.tv.settings.connectivity.ActiveNetworkProvider; import com.android.tv.settings.connectivity.ConnectivityListener; import com.android.tv.settings.connectivity.ConnectivityListenerLite; -import com.android.tv.settings.library.overlay.FlavorUtils; -import com.android.tv.settings.library.util.SliceUtils; +import com.android.tv.settings.customization.CustomizationConstants; +import com.android.tv.settings.customization.Partner; +import com.android.tv.settings.customization.PartnerPreferencesMerger; +import com.android.tv.settings.overlay.FlavorUtils; import com.android.tv.settings.suggestions.SuggestionPreference; import com.android.tv.settings.system.SecurityFragment; +import com.android.tv.settings.util.SliceUtils; import com.android.tv.twopanelsettings.TwoPanelSettingsFragment; import com.android.tv.twopanelsettings.slices.SlicePreference; @@ -234,6 +237,13 @@ public class MainFragment extends PreferenceControllerFragment implements @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { setPreferencesFromResource(getPreferenceScreenResId(), null); + if (Partner.getInstance(getContext()).isCustomizationPackageProvided()) { + PartnerPreferencesMerger.mergePreferences( + getContext(), + getPreferenceScreen(), + CustomizationConstants.MAIN_SCREEN + ); + } if (isRestricted()) { Preference appPref = findPreference(KEY_APPLICATIONS); if (appPref != null) { |