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

Commit 20dcdfe2 authored by Lei Yu's avatar Lei Yu Committed by android-build-merger
Browse files

Merge "Remove PowerUsageDetail.java" into oc-dev 

am: bde7097f

Change-Id: If609c5e9814bd2a18f3a8981937b407b2e94de61
parents 6f17c0da bde7097f

src/com/android/settings/applications/InstalledAppDetails.java

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ import com.android.settings.datausage.DataUsageList; 
import com.android.settings.datausage.DataUsageSummary;

import com.android.settings.fuelgauge.AdvancedPowerUsageDetail;

import com.android.settings.fuelgauge.BatteryEntry;

import com.android.settings.fuelgauge.PowerUsageDetail;

import com.android.settings.notification.AppNotificationSettings;

import com.android.settings.notification.NotificationBackend;

import com.android.settings.notification.NotificationBackend.AppRow;

src/com/android/settings/core/gateway/SettingsGateway.java

+2 −2
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ import com.android.settings.deviceinfo.StorageDashboardFragment; 
import com.android.settings.deviceinfo.StorageSettings;

import com.android.settings.display.NightDisplaySettings;

import com.android.settings.enterprise.EnterprisePrivacySettings;

import com.android.settings.fuelgauge.AdvancedPowerUsageDetail;

import com.android.settings.fuelgauge.BatterySaverSettings;

import com.android.settings.fuelgauge.PowerUsageDetail;

import com.android.settings.fuelgauge.PowerUsageSummary;

import com.android.settings.gestures.AssistGestureSettings;

import com.android.settings.gestures.DoubleTapPowerSettings;
@@ -210,7 +210,7 @@ public class SettingsGateway { 
            ZenModeEventRuleSettings.class.getName(),

            ZenModeVisualInterruptionSettings.class.getName(),

            ProcessStatsUi.class.getName(),

            PowerUsageDetail.class.getName(),

            AdvancedPowerUsageDetail.class.getName(),

            ProcessStatsSummary.class.getName(),

            DrawOverlayDetails.class.getName(),

            WriteSettingsDetails.class.getName(),

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

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ import java.util.List; 
 * 1. Detail battery usage information for app(i.e. usage time, usage amount)

 * 2. Battery related controls for app(i.e uninstall, force stop)

 *

 * This fragment will replace {@link PowerUsageDetail}

 */

public class AdvancedPowerUsageDetail extends PowerUsageBase implements

        ButtonActionDialogFragment.AppButtonsDialogListener {

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

deleted100644 → 0
+0 −826

File deleted.

Preview size limit exceeded, changes collapsed.

src/com/android/settings/search/SearchIndexableResources.java

+0 −2
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import com.android.settings.display.ScreenZoomSettings; 
import com.android.settings.enterprise.EnterprisePrivacySettings;

import com.android.settings.fuelgauge.BatterySaverSettings;

import com.android.settings.fuelgauge.PowerUsageAdvanced;

import com.android.settings.fuelgauge.PowerUsageDetail;

import com.android.settings.fuelgauge.PowerUsageSummary;

import com.android.settings.gestures.AssistGestureSettings;

import com.android.settings.gestures.DoubleTapPowerSettings;
@@ -126,7 +125,6 @@ public final class SearchIndexableResources { 
        addIndex(StorageSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_storage);

        addIndex(PowerUsageSummary.class,

                R.xml.power_usage_summary, R.drawable.ic_settings_battery);

        addIndex(PowerUsageDetail.class, NO_DATA_RES_ID, R.drawable.ic_settings_battery);

        addIndex(PowerUsageAdvanced.class, NO_DATA_RES_ID, R.drawable.ic_settings_battery);

        addIndex(BatterySaverSettings.class,

                R.xml.battery_saver_settings, R.drawable.ic_settings_battery);