Merge "Move ConditionListener to a top level class." (8bcd81e7) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/dashboard/DashboardSummary.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ import com.android.settings.core.SettingsBaseActivity.CategoryListener;
		import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
		import com.android.settings.homepage.conditional.Condition;
		import com.android.settings.homepage.conditional.ConditionManager;
		import com.android.settings.homepage.conditional.ConditionManager.ConditionListener;
		import com.android.settings.homepage.conditional.ConditionListener;
		import com.android.settings.homepage.conditional.FocusRecyclerView;
		import com.android.settings.homepage.conditional.FocusRecyclerView.FocusListener;
		import com.android.settings.overlay.FeatureFactory;

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		/*
		* 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.homepage.conditional;

		public interface ConditionListener {
		void onConditionsChanged();
		}

+0 −15

Original line number	Diff line number	Diff line
		@@ -217,17 +217,6 @@ public class ConditionManager implements LifecycleObserver, OnResume, OnPause {
		return mConditions;
		}

		public List<Condition> getVisibleConditions() {
		List<Condition> conditions = new ArrayList<>();
		final int N = mConditions.size();
		for (int i = 0; i < N; i++) {
		if (mConditions.get(i).shouldShow()) {
		conditions.add(mConditions.get(i));
		}
		}
		return conditions;
		}

		public void notifyChanged(Condition condition) {
		saveToXml();
		Collections.sort(mConditions, CONDITION_COMPARATOR);
		@@ -293,10 +282,6 @@ public class ConditionManager implements LifecycleObserver, OnResume, OnPause {
		return sInstance;
		}

		public interface ConditionListener {
		void onConditionsChanged();
		}

		private static final Comparator<Condition> CONDITION_COMPARATOR = new Comparator<Condition>() {
		@Override
		public int compare(Condition lhs, Condition rhs) {