From a9125d4d59bb3293dd1c92189bec3d0ab9e71d52 Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Mon, 3 Oct 2011 11:54:16 -0700 Subject: [PATCH] Introduce half-brightness icon in Power Control widget. Bug: 5358696 Change-Id: Iae484e786f4dd7a5e88078b69053f01425b79aef --- AndroidManifest.xml | 2 + ...ppwidget_settings_brightness_half_holo.png | Bin 0 -> 2171 bytes ...ppwidget_settings_brightness_half_holo.png | Bin 0 -> 1341 bytes ...ppwidget_settings_brightness_half_holo.png | Bin 0 -> 3073 bytes .../widget/SettingsAppWidgetProvider.java | 63 ++++++++++++------ 5 files changed, 43 insertions(+), 22 deletions(-) create mode 100644 res/drawable-hdpi/ic_appwidget_settings_brightness_half_holo.png create mode 100644 res/drawable-mdpi/ic_appwidget_settings_brightness_half_holo.png create mode 100644 res/drawable-xhdpi/ic_appwidget_settings_brightness_half_holo.png diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 71a2d7f1219..4bbb54acdd4 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1210,6 +1210,8 @@ android:enabled="@bool/has_powercontrol_widget"> + + diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_half_holo.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_half_holo.png new file mode 100644 index 0000000000000000000000000000000000000000..3a5a043a7393b5cd46d9c1b3712d4b50809099a6 GIT binary patch literal 2171 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 literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_appwidget_settings_brightness_half_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_brightness_half_holo.png new file mode 100644 index 0000000000000000000000000000000000000000..b6d238b348b74049e6c0e46e624d9bc3ccb36531 GIT binary patch literal 3073 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 FULL_BRIGHTNESS_THRESHOLD) { + views.setImageViewResource(R.id.img_brightness, + R.drawable.ic_appwidget_settings_brightness_full_holo); + } else if (brightness > HALF_BRIGHTNESS_THRESHOLD) { + views.setImageViewResource(R.id.img_brightness, + R.drawable.ic_appwidget_settings_brightness_half_holo); + } else { + views.setImageViewResource(R.id.img_brightness, + R.drawable.ic_appwidget_settings_brightness_off_holo); + } + // Set the ON state + if (brightness > HALF_BRIGHTNESS_THRESHOLD) { + views.setImageViewResource(R.id.ind_brightness, + R.drawable.appwidget_settings_ind_on_r_holo); + } else { + views.setImageViewResource(R.id.ind_brightness, + R.drawable.appwidget_settings_ind_off_r_holo); + } } } @@ -747,24 +767,23 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider { } /** - * Gets state of brightness. + * Gets brightness level. * * @param context - * @return true if more than moderately bright. + * @return brightness level between 0 and 255. */ - private static boolean getBrightness(Context context) { + private static int getBrightness(Context context) { try { IPowerManager power = IPowerManager.Stub.asInterface( ServiceManager.getService("power")); if (power != null) { int brightness = Settings.System.getInt(context.getContentResolver(), Settings.System.SCREEN_BRIGHTNESS); - return brightness > 100; + return brightness; } } catch (Exception e) { - Log.d(TAG, "getBrightness: " + e); } - return false; + return 0; } /**