summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2009-09-30 15:54:26 -0700
committerAmith Yamasani <yamasani@google.com>2009-09-30 18:42:29 -0700
commit395273662c1c05db59d5dced716ba84374c97411 (patch)
treeb3ac6ced9ed411555539ed9a5ea803971bf905d7
parente6531e253bf646324d3a68de0e9cc612c5e1c8ac (diff)
downloadpackages_apps_Settings-395273662c1c05db59d5dced716ba84374c97411.zip
packages_apps_Settings-395273662c1c05db59d5dced716ba84374c97411.tar.gz
packages_apps_Settings-395273662c1c05db59d5dced716ba84374c97411.tar.bz2
Use a custom system icon for native processes.
New icons for system components in Battery Use screen.
-rw-r--r--res/drawable-hdpi/ic_settings_bluetooth.pngbin0 -> 6356 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_cell_standby.pngbin0 -> 5821 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_display.pngbin0 -> 6462 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_phone_idle.pngbin0 -> 6170 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_voice_calls.pngbin0 -> 6037 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_wifi.pngbin0 -> 6204 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_bluetooth.pngbin0 -> 3815 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_cell_standby.pngbin0 -> 3554 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_display.pngbin0 -> 3907 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_phone_idle.pngbin0 -> 3748 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_voice_calls.pngbin0 -> 3630 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_wifi.pngbin0 -> 3720 bytes
-rwxr-xr-xres/drawable/ic_power_system.pngbin0 -> 6870 bytes
-rw-r--r--src/com/android/settings/fuelgauge/PowerUsageSummary.java14
14 files changed, 8 insertions, 6 deletions
diff --git a/res/drawable-hdpi/ic_settings_bluetooth.png b/res/drawable-hdpi/ic_settings_bluetooth.png
new file mode 100644
index 0000000..3d9015f
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_bluetooth.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_cell_standby.png b/res/drawable-hdpi/ic_settings_cell_standby.png
new file mode 100644
index 0000000..262a860
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_cell_standby.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_display.png b/res/drawable-hdpi/ic_settings_display.png
new file mode 100644
index 0000000..20568d2
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_display.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_phone_idle.png b/res/drawable-hdpi/ic_settings_phone_idle.png
new file mode 100644
index 0000000..fd66f84
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_phone_idle.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_voice_calls.png b/res/drawable-hdpi/ic_settings_voice_calls.png
new file mode 100644
index 0000000..3cb7e49
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_voice_calls.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_wifi.png b/res/drawable-hdpi/ic_settings_wifi.png
new file mode 100644
index 0000000..b8c3eaa
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_wifi.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_bluetooth.png b/res/drawable-mdpi/ic_settings_bluetooth.png
new file mode 100644
index 0000000..8cf80c0
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_bluetooth.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_cell_standby.png b/res/drawable-mdpi/ic_settings_cell_standby.png
new file mode 100644
index 0000000..0ac7b5d
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_cell_standby.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_display.png b/res/drawable-mdpi/ic_settings_display.png
new file mode 100644
index 0000000..b676b85
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_display.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_phone_idle.png b/res/drawable-mdpi/ic_settings_phone_idle.png
new file mode 100644
index 0000000..7734b09
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_phone_idle.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_voice_calls.png b/res/drawable-mdpi/ic_settings_voice_calls.png
new file mode 100644
index 0000000..89d04d7
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_voice_calls.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_wifi.png b/res/drawable-mdpi/ic_settings_wifi.png
new file mode 100644
index 0000000..e8f3129
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_wifi.png
Binary files differ
diff --git a/res/drawable/ic_power_system.png b/res/drawable/ic_power_system.png
new file mode 100755
index 0000000..cce5187
--- /dev/null
+++ b/res/drawable/ic_power_system.png
Binary files differ
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index a41cbf4..fecd1438 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -411,7 +411,7 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
double phoneOnPower = mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ACTIVE)
* phoneOnTimeMs / 1000;
addEntry(getString(R.string.power_phone), DrainType.PHONE, phoneOnTimeMs,
- android.R.drawable.ic_menu_call, phoneOnPower);
+ R.drawable.ic_settings_voice_calls, phoneOnPower);
}
private void addScreenUsage(long uSecNow) {
@@ -432,7 +432,7 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
}
power /= 1000; // To seconds
addEntry(getString(R.string.power_screen), DrainType.SCREEN, screenOnTimeMs,
- android.R.drawable.ic_menu_view, power);
+ R.drawable.ic_settings_display, power);
}
private void addRadioUsage(long uSecNow) {
@@ -447,7 +447,7 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
}
BatterySipper bs =
addEntry(getString(R.string.power_cell), DrainType.CELL, signalTimeMs,
- android.R.drawable.ic_menu_sort_by_size, power);
+ R.drawable.ic_settings_cell_standby, power);
if (signalTimeMs != 0) {
bs.noCoveragePercent = mStats.getPhoneSignalStrengthTime(0, uSecNow, mStatsType)
/ 1000 * 100.0 / signalTimeMs;
@@ -461,7 +461,7 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
* mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)
+ runningTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)) / 1000;
addEntry(getString(R.string.power_wifi), DrainType.WIFI, runningTimeMs,
- R.drawable.ic_wifi_signal_4, wifiPower);
+ R.drawable.ic_settings_wifi, wifiPower);
}
private void addIdleUsage(long uSecNow) {
@@ -469,7 +469,7 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
double idlePower = (idleTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_IDLE))
/ 1000;
addEntry(getString(R.string.power_idle), DrainType.IDLE, idleTimeMs,
- android.R.drawable.ic_lock_power_off, idlePower);
+ R.drawable.ic_settings_phone_idle, idlePower);
}
private void addBluetoothUsage(long uSecNow) {
@@ -481,7 +481,7 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
* mPowerProfile.getAveragePower(PowerProfile.POWER_BLUETOOTH_AT_CMD)) / 1000;
addEntry(getString(R.string.power_bluetooth), DrainType.BLUETOOTH, btOnTimeMs,
- com.android.internal.R.drawable.ic_volume_bluetooth_in_call, btPower);
+ R.drawable.ic_settings_bluetooth, btPower);
}
private double getAverageDataCost() {
@@ -619,6 +619,8 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
} else if ("mediaserver".equals(name)) {
name = getResources().getString(R.string.process_mediaserver_label);
}
+ iconId = R.drawable.ic_power_system;
+ icon = getResources().getDrawable(iconId);
return;
} else {
//name = packages[0];