Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c117100 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove the legacy getReplacingActivity() method from feature provider"... 

Merge "Remove the legacy getReplacingActivity() method from feature provider" into tm-dev am: 708c2d2f am: d9db15cd

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799704



Change-Id: I0306a9b7d37caaba971c167500b731180ce0316f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 45603532 d9db15cd

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

+1 −8
Original line number Diff line number Diff line
@@ -18,14 +18,7 @@ package com.android.settings.fuelgauge; 


import android.content.ComponentName;



/**

 * Feature provider for battery settings usage.

 */

/** Feature provider for battery settings usage. */

public interface BatterySettingsFeatureProvider {



    /**

     * Get replacement activity for a given activity or fragment path.

     */

    ComponentName getReplacingActivity(ComponentName originalActivity);



}

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

+1 −9
Original line number Diff line number Diff line
@@ -16,12 +16,9 @@ 


package com.android.settings.fuelgauge;



import android.content.ComponentName;

import android.content.Context;



/**

 * Feature provider implementation for battery settings usage.

 */

/** Feature provider implementation for battery settings usage. */

public class BatterySettingsFeatureProviderImpl implements BatterySettingsFeatureProvider {



    protected Context mContext;
@@ -29,9 +26,4 @@ public class BatterySettingsFeatureProviderImpl implements BatterySettingsFeatur 
    public BatterySettingsFeatureProviderImpl(Context context) {

        mContext = context.getApplicationContext();

    }



    @Override

    public ComponentName getReplacingActivity(ComponentName originalActivity) {

        return originalActivity;

    }

}