From b97eda4ff5042bb644f0df9eceebcf80af7ce268 Mon Sep 17 00:00:00 2001 From: Sunny Shao Date: Wed, 7 Aug 2019 17:48:32 +0800 Subject: [PATCH] Use FooterPreference in xml explicitly Removed the FooterPreferenceMixin from the FeatureFlagsDashboard page. Fixes: 139046148 Test: manual test Change-Id: I6363f265a9c8b996141b7d7547c450cb70e2a7cd --- res/xml/feature_flags_settings.xml | 6 +++ ...FeatureFlagFooterPreferenceController.java | 50 ------------------- .../featureflags/FeatureFlagsDashboard.java | 26 ---------- 3 files changed, 6 insertions(+), 76 deletions(-) delete mode 100644 src/com/android/settings/development/featureflags/FeatureFlagFooterPreferenceController.java diff --git a/res/xml/feature_flags_settings.xml b/res/xml/feature_flags_settings.xml index 8dc5ab33917..0e509a8c0f3 100644 --- a/res/xml/feature_flags_settings.xml +++ b/res/xml/feature_flags_settings.xml @@ -25,4 +25,10 @@ android:layout="@layout/preference_category_no_label" android:title="@string/summary_placeholder" settings:controller="com.android.settings.development.featureflags.FeatureFlagsPreferenceController" /> + + diff --git a/src/com/android/settings/development/featureflags/FeatureFlagFooterPreferenceController.java b/src/com/android/settings/development/featureflags/FeatureFlagFooterPreferenceController.java deleted file mode 100644 index a0d7036740c..00000000000 --- a/src/com/android/settings/development/featureflags/FeatureFlagFooterPreferenceController.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2018 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.settings.development.featureflags; - -import android.content.Context; - -import com.android.settings.R; -import com.android.settings.core.BasePreferenceController; -import com.android.settingslib.core.lifecycle.LifecycleObserver; -import com.android.settingslib.core.lifecycle.events.OnStart; -import com.android.settingslib.widget.FooterPreferenceMixinCompat; - -public class FeatureFlagFooterPreferenceController extends BasePreferenceController - implements LifecycleObserver, OnStart { - - private FooterPreferenceMixinCompat mFooterMixin; - - public FeatureFlagFooterPreferenceController(Context context) { - super(context, "feature_flag_footer_pref"); - } - - public void setFooterMixin(FooterPreferenceMixinCompat mixin) { - mFooterMixin = mixin; - } - - @Override - public int getAvailabilityStatus() { - return AVAILABLE; - } - - @Override - public void onStart() { - mFooterMixin.createFooterPreference() - .setTitle(R.string.experimental_category_title); - } -} diff --git a/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java b/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java index 613fb17e391..f0d7f1cb3c5 100644 --- a/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java +++ b/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java @@ -24,8 +24,6 @@ import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; -import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.development.DevelopmentSettingsEnabler; import com.android.settingslib.search.SearchIndexable; @@ -55,7 +53,6 @@ public class FeatureFlagsDashboard extends DashboardFragment { @Override public void onAttach(Context context) { super.onAttach(context); - use(FeatureFlagFooterPreferenceController.class).setFooterMixin(mFooterPreferenceMixin); } @Override @@ -63,23 +60,6 @@ public class FeatureFlagsDashboard extends DashboardFragment { return 0; } - @Override - protected List createPreferenceControllers(Context context) { - return buildPrefControllers(context, getSettingsLifecycle()); - } - - private static List buildPrefControllers(Context context, - Lifecycle lifecycle) { - final List controllers = new ArrayList<>(); - final FeatureFlagFooterPreferenceController footerController = - new FeatureFlagFooterPreferenceController(context); - if (lifecycle != null) { - lifecycle.addObserver(footerController); - } - controllers.add(footerController); - return controllers; - } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override @@ -97,11 +77,5 @@ public class FeatureFlagsDashboard extends DashboardFragment { protected boolean isPageSearchEnabled(Context context) { return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context); } - - @Override - public List createPreferenceControllers( - Context context) { - return buildPrefControllers(context, null /* lifecycle */); - } }; }