From 5c9f9ce263b1ce24831d3bb2cc924ea40de1ec7a Mon Sep 17 00:00:00 2001
From: Erik <roboerik@android.com>
Date: Thu, 4 Mar 2010 13:59:34 -0800
Subject: [PATCH] b/2278841 Added state for auto-brightness on the power
 widget.

Added icons and a transition step to the brightness setting on the power
widget so auto-brightness can be toggled and the widget will remain in
sync with changes made through settings.
---
 .../ic_appwidget_settings_brightness_auto.png      | Bin 0 -> 1167 bytes
 .../ic_appwidget_settings_brightness_auto.png      | Bin 0 -> 792 bytes
 .../settings/widget/SettingsAppWidgetProvider.java |  54 +++++++++++++++++----
 3 files changed, 45 insertions(+), 9 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_appwidget_settings_brightness_auto.png
 create mode 100644 res/drawable-mdpi/ic_appwidget_settings_brightness_auto.png

diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_auto.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_auto.png
new file mode 100644
index 0000000000000000000000000000000000000000..14c3e040a71fd3165176ba6897fe3555a01ea36e
GIT binary patch
literal 1167
zcmV;A1aSL_P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$F-b&0RCwC#SzAj~Q52rZltR;#qOc2z
zrX@;Ibk(j@PPd0%A}B-X@*4Eq52#-d1@#gXL=YK7AVo<98m1<UC1aVQO&L?x$e5Gb
zTJRlMEcTfh=Qwi|X2Hjtv(M}~YpuO5-`?Y$nws*=Wtr!h<B~BTW56soU<sihl`oi|
z!r$IZI8K-#+#&SMwH2tsXBMGiHm*PoVK3nm;XXVqB`eN*@(HI9Vvh(t>0W_7glu?s
zM-uao5sC@9gq?1L(15t!4UbBh6xX`luO^g>`>$>o&?J=1K{!eIEUtUiJCBI_2%*`H
z90(HH2wQMpqMpAb1fXC@jC0H{7x&Nc9apLlzkC?i9fs$FN_m!_gparmzzIo<Hvu+U
zizMw=3QOS-8b{?>PpBj;Mk9+7MzCUjC@tq`S%YvaB0R;Mqz&K|x*}GJW4;C9F{ZxD
zN*^Q?#&O6X6dO?EJns-3V95~Srjrn2g}<op^J<(mB<0BjlxJB%XdrA=J>k4k-h)+l
zoCEhzC8A=C>-R!j`;;<?NEVFVg!`rF2eL9f#!5M^LgR>iPPYAoG9+vSbit%Nd+xTl
z=Z1G#7;VW>gbDMcZo(=;mraN!oy4)cc*)SfSRN8O)mWWP$L<B$OM4luv{61HDu?vA
zUAZhJEOWzva+~oEkuUp%5kFLSma;Y#owyR5-csN%!lFY|6O*(F=Tx9vc8O;thB?I|
zSGJ)Vc`?R4<Q2+q!UhzfENbDG|3cC&GCc2tr&(5lHdF}%I8jGc#bL=4o1g;*<2cN&
zDuNg@g#H=$y(Lz4n26zhtJAiDI(WpKcAI|ViNT4+Ov=Yvf!~B%glZ^az1$B<z!D}b
z5OYRV+YboZAmttCiIhM1>_XWtQ@`7uOb!eIcG3^7Ba?R`fxHW$be0-A?j*vjI~{cT
zgXp9>d@hQ_wB$PBoA|CYpeLPWG)II;P&A{EC;-KVdDY7Jun3zG_1iN_rzOqxVKd^#
zMxMQR8p?!4^D4AS#E`0VEH{w64ft(#%oD>tB54EiKm)4P_%*z^1~huQ!ts6=3bP~X
zRkdmb2a7rlp?ZVz0a5Z^!()@vP<~7(Z|xC=70+Vcba*C`xJdDwCX_-ct*9hEgjy`=
zgl9*TLA-I<1;w)k&2}6@6$lgVvTqDDHy0h(D!EL|*5T!r@!wH_{7^g_&xZ{mQh;L`
z-jY6xQ_3CDX=`=P!3bWJ#sueG0GA44-!Sghsf17Pnli(FVS`~jPY^+_I@_Hn;KTrZ
zy7pc@XHs^8aE7o^jEB`hSFO#yBIO3uDZbKd*t~1Hoam`uS`3iY=|!A4_S&54$;3_j
z(PAUY9v{2BO=5l%x^_OwYT6Bm#~P#RWW#jY@xWmbN$FoqE$9gmkNMnmM#P)>r#@pq
h#(<0guF8J_1^{B|4RJbrkl6qL002ovPDHLkV1n>|6`TM7

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_auto.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_auto.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e2237a90b1597f9e6f60c95fdc05f7881193185
GIT binary patch
literal 792
zcmV+z1LypSP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!x=BPqRCwC#m)lEJQ51*AF|C*`WCWs9
zbRjXxZWbs+MD^4Kf_e&iiR`uLzvw0Ct=H&Hh#rD26opX{cqudOVnh^$p&5o!DAV*?
z@EureW}Gv5NTL>e%x0f`_Fj9fy?*;lMLwTT&84MNb8LUT168w~BR$K-Pm5E3!hw2m
zNGx@IHDZyd6$@N{9b=az>A*J8B94?8S1FD%wmC@$`uJTXHq!nka$-VE(br03tp9nO
ziRZ<1;JxT)S6L?iF3z*qPsU~WeJIA_Ok7b!h%Ap=MUNPEhi;P?5Q{~VSi-Zf;+f4S
z*3gceT8-oP#dur?4vQ_cd&LbgjT3uBTY+~h5}o1!i)X|^v4Q9JcpmEvn71F@0c_-?
zpDeO?bO6n{<Fs4c;%|s%>=Z<1p<9Xf`-78xn_Qb65Ifv6i$a&!C0^jbZ&iUEyzAt;
zISBVtc52ogyw^r$T$^d}Vh&Vs2#sp`)(2w-#Ux?2Tz?iHf^@8-opJM}OO>H5eukIK
zeuxXywznvsrU`k%-9x$}TaJRBaFMc#x>za#Q$af&j2jj2Xj>XaXb+$be(qc_U#?UH
zrrB|5Bd+c9-5b2yhZ;uj*pAO7p@f$6z3iZm-JRt!ipusbX=r8FuVyR7m6TQ%A?ijC
z_KEp!@f4z!acS%1=G=`V{pCt=JvU!;_&UUpIEK`gD&4DMC&H9M)H(`DaWNfeakrX@
z%1d&5N!+3xnpMmdFe!fQ&WLSjb2$;na2XA{TWuks9>9S*CeE?LPYBjp@x(b<izajh
z6%k8{y;=Ah*x60`Rxs&!Fvg;GC&>?z1~7Z;B4Xcz?QWhSC&e{MI?%}PYe*69DypH{
zDdaE})Rg2G(IfGNJkDfx_%4g>oP)$17zJ-*d<jiZ0g+7>`tT@M2mb#x`*$4pCBOjS
W;<RNRDk-i20000<MNUMnLSTY((`%{#

literal 0
HcmV?d00001

diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
index 0f6bb2595a..4ec5b822bb 100644
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
@@ -156,7 +156,10 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
                 views.setImageViewResource(R.id.ind_wifi, R.drawable.appwidget_settings_ind_mid_l);
                 break;
         }
-        if (getBrightness(context)) {
+        if (getBrightnessMode(context)) {
+            views.setImageViewResource(R.id.img_brightness, R.drawable.ic_appwidget_settings_brightness_auto);
+            views.setImageViewResource(R.id.ind_brightness, R.drawable.appwidget_settings_ind_on_r);
+        } else if (getBrightness(context)) {
             views.setImageViewResource(R.id.img_brightness, R.drawable.ic_appwidget_settings_brightness_on);
             views.setImageViewResource(R.id.ind_brightness, R.drawable.appwidget_settings_ind_on_r);
         } else {
@@ -380,6 +383,27 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
     }
 
     /**
+     * Gets state of brightness mode.
+     *
+     * @param context
+     * @return true if auto brightness is on.
+     */
+    private static boolean getBrightnessMode(Context context) {
+        try {
+            IPowerManager power = IPowerManager.Stub.asInterface(
+                    ServiceManager.getService("power"));
+            if (power != null) {
+                int brightnessMode = Settings.System.getInt(context.getContentResolver(),
+                        Settings.System.SCREEN_BRIGHTNESS_MODE);
+                return brightnessMode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
+            }
+        } catch (Exception e) {
+            Log.d(TAG, "getBrightnessMode: " + e);
+        }
+        return false;
+    }
+
+    /**
      * Increases or decreases the brightness.
      *
      * @param context
@@ -392,25 +416,37 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
                 ContentResolver cr = context.getContentResolver();
                 int brightness = Settings.System.getInt(cr,
                         Settings.System.SCREEN_BRIGHTNESS);
-                // Rotate MINIMUM -> DEFAULT -> MAXIMUM
+                int brightnessMode = Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
+                //Only get brightness setting if available
+                if (context.getResources().getBoolean(
+                        com.android.internal.R.bool.config_automatic_brightness_available)) {
+                    brightnessMode = Settings.System.getInt(cr,
+                            Settings.System.SCREEN_BRIGHTNESS_MODE);
+                }
+
+                // Rotate AUTO -> MINIMUM -> DEFAULT -> MAXIMUM
                 // Technically, not a toggle...
-                if (brightness < DEFAULT_BACKLIGHT) {
+                if (brightnessMode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
+                    brightness = MINIMUM_BACKLIGHT;
+                    brightnessMode = Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
+                } else if (brightness < DEFAULT_BACKLIGHT) {
                     brightness = DEFAULT_BACKLIGHT;
                 } else if (brightness < MAXIMUM_BACKLIGHT) {
                     brightness = MAXIMUM_BACKLIGHT;
                 } else {
-                    brightness = MINIMUM_BACKLIGHT;
+                    brightnessMode = Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
                 }
-                power.setBacklightBrightness(brightness);
-                Settings.System.putInt(cr, Settings.System.SCREEN_BRIGHTNESS, brightness);
+
                 if (context.getResources().getBoolean(
                         com.android.internal.R.bool.config_automatic_brightness_available)) {
-                    // Disable automatic brightness
+                    // Set screen brightness mode (automatic or manual)
                     Settings.System.putInt(context.getContentResolver(),
                             Settings.System.SCREEN_BRIGHTNESS_MODE,
-                            Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL);
-                    // Set it again in case auto brightness was on
+                            brightnessMode);
+                }
+                if (brightnessMode == Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL) {
                     power.setBacklightBrightness(brightness);
+                    Settings.System.putInt(cr, Settings.System.SCREEN_BRIGHTNESS, brightness);
                 }
             }
         } catch (RemoteException e) {
-- 
2.11.0