Merge "Update BatterySettingsFeatureProvider signature." into sc-dev (6a8ca406) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,6 @@ public interface BatterySettingsFeatureProvider {
		/**
		* Get replacement activity for a given activity or fragment path.
		*/
		String getReplacingActivityName(String activity);
		String getReplacingActivityName(String originalActivity);

		}

+9 −1

Original line number	Diff line number	Diff line
		@@ -16,13 +16,21 @@

		package com.android.settings.fuelgauge;

		import android.content.Context;

		/**
		* Feature provider implementation for battery settings usage.
		*/
		public class BatterySettingsFeatureProviderImpl implements BatterySettingsFeatureProvider {

		protected Context mContext;

		public BatterySettingsFeatureProviderImpl(Context context) {
		mContext = context.getApplicationContext();
		}

		@Override
		public String getReplacingActivityName(String activity) {
		public String getReplacingActivityName(String originalActivity) {
		return null;
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -138,7 +138,7 @@ public class FeatureFactoryImpl extends FeatureFactory {
		@Override
		public BatterySettingsFeatureProvider getBatterySettingsFeatureProvider(Context context) {
		if (mBatterySettingsFeatureProvider == null) {
		mBatterySettingsFeatureProvider = new BatterySettingsFeatureProviderImpl();
		mBatterySettingsFeatureProvider = new BatterySettingsFeatureProviderImpl(context);
		}
		return mBatterySettingsFeatureProvider;
		}