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

Commit f9acbaf4 authored by Tiffany Nguyen's avatar Tiffany Nguyen Committed by Android (Google) Code Review
Browse files

Merge "Revert "Update BatterySettingsFeatureProvider to an activity-friendly... 

Merge "Revert "Update BatterySettingsFeatureProvider to an activity-friendly interface."" into sc-dev
parents ceb78586 b33d03b7

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

+1 −3
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.settings.fuelgauge;



import android.content.ComponentName;



/**

 * Feature provider for battery settings usage.

 */
@@ -26,6 +24,6 @@ public interface BatterySettingsFeatureProvider { 
    /**

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

     */

    ComponentName getReplacingActivity(ComponentName originalActivity);

    String getReplacingActivityName(String originalActivity);



}

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

+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.settings.fuelgauge;



import android.content.ComponentName;

import android.content.Context;



/**
@@ -31,7 +30,7 @@ public class BatterySettingsFeatureProviderImpl implements BatterySettingsFeatur 
    }



    @Override

    public ComponentName getReplacingActivity(ComponentName originalActivity) {

    public String getReplacingActivityName(String originalActivity) {

        return null;

    }

}