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

Commit b6d7c9c6 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Multi-user battery settings." into jb-mr1-dev

parents 4a095381 52e56a24

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -3235,6 +3235,9 @@ 
    <!-- Suggestion for getting apps to consume less power -->

    <string name="battery_sugg_apps_settings">The app may offer settings to reduce battery use</string>



    <!-- [CHAR LIMIT=50] Description for power consumed by users -->

    <string name="battery_desc_users">Battery used by user</string>



    <!-- Menu label for viewing battery usage since unplugged -->

    <string name="menu_stats_unplugged"><xliff:g id="unplugged">%1$s</xliff:g> since unplugged</string>

    <!-- Menu label for viewing battery usage since unplugged -->

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ public class Settings extends PreferenceActivity 
            R.id.display_settings,

            R.id.storage_settings,

            R.id.application_settings,

            R.id.battery_settings,

            R.id.personal_section,

            R.id.security_settings,

            R.id.user_settings,

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

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ class BatterySipper implements Comparable<BatterySipper> { 
            return;

        }

        PackageManager pm = mContext.getPackageManager();

        final Drawable defaultActivityIcon = pm.getDefaultActivityIcon();

        String[] packages = pm.getPackagesForUid(uid);

        icon = pm.getDefaultActivityIcon();

        if (packages == null) {

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

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.fuelgauge;



import android.content.Context;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.preference.Preference;

import android.view.View;
@@ -37,7 +38,7 @@ public class PowerGaugePreference extends Preference { 
    public PowerGaugePreference(Context context, Drawable icon, BatterySipper info) {

        super(context);

        setLayoutResource(R.layout.app_percentage_item);

        setIcon(icon);

        setIcon(icon != null ? icon : new ColorDrawable(0));

        mInfo = info;

    }

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

+4 −2
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener 
        WIFI,

        BLUETOOTH,

        SCREEN,

        APP

        APP,

        USER

    }



    // Note: Must match the sequence of the DrainType
@@ -73,7 +74,8 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener 
        R.string.battery_desc_wifi,

        R.string.battery_desc_bluetooth,

        R.string.battery_desc_display,

        R.string.battery_desc_apps

        R.string.battery_desc_apps,

        R.string.battery_desc_users,

    };



    public static final int ACTION_DISPLAY_SETTINGS = 1;