From a2e4f8ff9aa0e433fbe7296c7945a4d4066b1fcb Mon Sep 17 00:00:00 2001
From: Rodolfo Hurtado <rodolfo.hurtado@gmail.com>
Date: Thu, 1 Mar 2012 12:47:53 -0300
Subject: [PATCH 1/2] Option to show Brightness Icon

Option to show Brightness Icon

Change-Id: I34be4f7b03c5df2793de176122b81e36b334dd28
---
 core/java/android/provider/Settings.java              |  6 ++++++
 .../SystemUI/res/layout/status_bar_toggle_slider.xml  |  7 +++++++
 .../systemui/statusbar/policy/ToggleSlider.java       | 11 +++++++++++
 .../statusbar/policy/toggles/BrightnessSlider.java    |  6 +++++-
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index c27ad923e0b..83c0292adae 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2374,6 +2374,12 @@ public static void setShowGTalkServiceStatus(ContentResolver cr, boolean flag) {
          * @hide
          */
         public static final String STATUSBAR_TOGGLES_BRIGHTNESS_LOC = "statusbar_toggles_brightness_loc";
+        
+        /**
+         * Show Icon next to brightness slider
+         * @hide
+         */
+        public static String STATUSBAR_TOGGLES_BRIGHTNESS_SHOW_ICON = "statusbar_toggles_brightness_show_icon";
 
         /**
          * @hide
diff --git a/packages/SystemUI/res/layout/status_bar_toggle_slider.xml b/packages/SystemUI/res/layout/status_bar_toggle_slider.xml
index 3105dabf767..29437bcb32b 100644
--- a/packages/SystemUI/res/layout/status_bar_toggle_slider.xml
+++ b/packages/SystemUI/res/layout/status_bar_toggle_slider.xml
@@ -20,6 +20,13 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
     >
+    <ImageView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentLeft="true"
+			android:paddingLeft="5dp"
+			android:paddingRight="5dp"
+			android:id="@+id/icon" />
     <CheckBox
         android:id="@+id/toggle"
         android:layout_width="48dp"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ToggleSlider.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ToggleSlider.java
index 520475fd61c..c088ece24f6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ToggleSlider.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ToggleSlider.java
@@ -28,6 +28,7 @@
 import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
+import android.widget.ImageView;
 
 import com.android.systemui.R;
 
@@ -45,6 +46,7 @@ public interface Listener {
     private CompoundButton mToggle;
     private SeekBar mSlider;
     private TextView mLabel;
+	private ImageView mIcon;
 
     public ToggleSlider(Context context) {
         this(context, null);
@@ -71,9 +73,18 @@ public ToggleSlider(Context context, AttributeSet attrs, int defStyle) {
 
         mLabel = (TextView)findViewById(R.id.label);
         mLabel.setText(a.getString(R.styleable.ToggleSlider_text));
+        
+        mIcon = (ImageView)findViewById(R.id.icon);
+        mIcon.setVisibility(GONE);
 
         a.recycle();
     }
+    
+    public void setIcon(int res) {
+        if (mIcon != null) {
+            mIcon.setImageResource(res);
+        }
+    }
 
     public void onCheckedChanged(CompoundButton toggle, boolean checked) {
         Drawable thumb;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/toggles/BrightnessSlider.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/toggles/BrightnessSlider.java
index 7c8eb0f8246..2642a9b3eea 100755
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/toggles/BrightnessSlider.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/toggles/BrightnessSlider.java
@@ -56,7 +56,11 @@ public BrightnessSlider(Context context) {
         mView = View.inflate(mContext, R.layout.brightness_slider, null);
 
         mControl = (ToggleSlider) mView.findViewById(R.id.brightness);
-
+        
+        if(Settings.Secure.getInt(mContext.getContentResolver(),
+				Settings.System.STATUSBAR_TOGGLES_BRIGHTNESS_SHOW_ICON, 0) == 1)
+        	mControl.setIcon(R.drawable.ic_sysbar_brightness);
+        
         mScreenBrightnessDim = mContext.getResources().getInteger(
                 com.android.internal.R.integer.config_screenBrightnessDim);
 

From f3aa821a79ad1a4d56e88f9a3ea4c146e6f551fc Mon Sep 17 00:00:00 2001
From: Rodolfo Hurtado <rodolfo.hurtado@gmail.com>
Date: Fri, 2 Mar 2012 01:26:49 -0300
Subject: [PATCH 2/2] Option to show Brightness Icon

Option to show Brightness Icon

Change-Id: Iad754c71bb4080d50f5793e6b02832ef62e2a43a
---
 .../res/layout/status_bar_toggle_slider.xml        | 14 +++++++-------
 .../systemui/statusbar/policy/ToggleSlider.java    |  5 ++++-
 .../statusbar/policy/toggles/BrightnessSlider.java |  8 ++++----
 .../statusbar/policy/toggles/TogglesView.java      |  3 +++
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/packages/SystemUI/res/layout/status_bar_toggle_slider.xml b/packages/SystemUI/res/layout/status_bar_toggle_slider.xml
index 29437bcb32b..5291d127043 100644
--- a/packages/SystemUI/res/layout/status_bar_toggle_slider.xml
+++ b/packages/SystemUI/res/layout/status_bar_toggle_slider.xml
@@ -21,17 +21,17 @@
     xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
     >
     <ImageView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentLeft="true"
-			android:paddingLeft="5dp"
-			android:paddingRight="5dp"
-			android:id="@+id/icon" />
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_alignParentLeft="true"
+		android:paddingLeft="5dp"
+		android:paddingRight="5dp"
+		android:id="@+id/icon" />
     <CheckBox
         android:id="@+id/toggle"
         android:layout_width="48dp"
         android:layout_height="0dp"
-        android:layout_alignParentLeft="true"
+        android:layout_toRightOf="@id/icon"
         android:layout_alignParentTop="true"
         android:layout_alignParentBottom="true"
         android:button="@null"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ToggleSlider.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ToggleSlider.java
index c088ece24f6..4cf05f873fe 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ToggleSlider.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ToggleSlider.java
@@ -75,7 +75,6 @@ public ToggleSlider(Context context, AttributeSet attrs, int defStyle) {
         mLabel.setText(a.getString(R.styleable.ToggleSlider_text));
         
         mIcon = (ImageView)findViewById(R.id.icon);
-        mIcon.setVisibility(GONE);
 
         a.recycle();
     }
@@ -85,6 +84,10 @@ public void setIcon(int res) {
             mIcon.setImageResource(res);
         }
     }
+    
+    public void setupInfo(boolean showIcon) {
+        mIcon.setVisibility(showIcon ? View.VISIBLE : View.GONE);
+    }
 
     public void onCheckedChanged(CompoundButton toggle, boolean checked) {
         Drawable thumb;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/toggles/BrightnessSlider.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/toggles/BrightnessSlider.java
index 2642a9b3eea..e8dd9ab4cc5 100755
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/toggles/BrightnessSlider.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/toggles/BrightnessSlider.java
@@ -56,10 +56,9 @@ public BrightnessSlider(Context context) {
         mView = View.inflate(mContext, R.layout.brightness_slider, null);
 
         mControl = (ToggleSlider) mView.findViewById(R.id.brightness);
-        
-        if(Settings.Secure.getInt(mContext.getContentResolver(),
-				Settings.System.STATUSBAR_TOGGLES_BRIGHTNESS_SHOW_ICON, 0) == 1)
-        	mControl.setIcon(R.drawable.ic_sysbar_brightness);
+        mControl.setIcon(R.drawable.ic_sysbar_brightness);
+        mControl.setupInfo(Settings.System.getInt(mContext.getContentResolver(),
+				Settings.System.STATUSBAR_TOGGLES_BRIGHTNESS_SHOW_ICON, 0) == 1);
         
         mScreenBrightnessDim = mContext.getResources().getInteger(
                 com.android.internal.R.integer.config_screenBrightnessDim);
@@ -97,6 +96,7 @@ public BrightnessSlider(Context context) {
 
         SettingsObserver so = new SettingsObserver(new Handler());
         so.observe();
+
     }
 
     public View getView() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/toggles/TogglesView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/toggles/TogglesView.java
index 868395ff50a..bc2ebbf950b 100755
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/toggles/TogglesView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/toggles/TogglesView.java
@@ -233,6 +233,9 @@ void observe() {
             resolver.registerContentObserver(
                     Settings.System.getUriFor(Settings.System.STATUSBAR_TOGGLES_BRIGHTNESS_LOC),
                     false, this);
+            resolver.registerContentObserver(
+                    Settings.System.getUriFor(Settings.System.STATUSBAR_TOGGLES_BRIGHTNESS_SHOW_ICON),
+                    false, this);
             resolver.registerContentObserver(
                     Settings.System.getUriFor(Settings.System.STATUSBAR_TOGGLES_NUMBER_PER_ROW),
                     false, this);