From 75362101ac12a15c111f249ade5e7d15787d9e81 Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@google.com>
Date: Thu, 2 Dec 2010 16:46:12 -0800
Subject: [PATCH] Tweak the settings panel assets / layout.  Not done yet.

Change-Id: Ib014947f1260cb290818b7af0151fe0c165950c6
---
 .../drawable-mdpi/scrubber_control_holo.png   | Bin 0 -> 4766 bytes
 .../res/drawable/status_bar_toggle_button.xml |  23 +++++++++++
 .../status_bar_settings_view.xml              |  23 +++++++----
 .../res/layout/status_bar_toggle_slider.xml   |  22 ++++++-----
 packages/SystemUI/res/values/attrs.xml        |   3 ++
 packages/SystemUI/res/values/strings.xml      |   6 +++
 .../statusbar/policy/ToggleSlider.java        |  36 +++++++-----------
 7 files changed, 73 insertions(+), 40 deletions(-)
 create mode 100644 packages/SystemUI/res/drawable-mdpi/scrubber_control_holo.png
 create mode 100644 packages/SystemUI/res/drawable/status_bar_toggle_button.xml

diff --git a/packages/SystemUI/res/drawable-mdpi/scrubber_control_holo.png b/packages/SystemUI/res/drawable-mdpi/scrubber_control_holo.png
new file mode 100644
index 0000000000000000000000000000000000000000..621e980e0cbbd3d30f05f14f6f3f02b491288e2d
GIT binary patch
literal 4766
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

literal 0
HcmV?d00001

diff --git a/packages/SystemUI/res/drawable/status_bar_toggle_button.xml b/packages/SystemUI/res/drawable/status_bar_toggle_button.xml
new file mode 100644
index 0000000000000..e17c62f6e943c
--- /dev/null
+++ b/packages/SystemUI/res/drawable/status_bar_toggle_button.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true"
+         android:drawable="@*android:drawable/scrubber_primary_holo" />
+    <item
+         android:drawable="@*android:drawable/scrubber_track_holo_dark" />
+</selector>
+
diff --git a/packages/SystemUI/res/layout-xlarge/status_bar_settings_view.xml b/packages/SystemUI/res/layout-xlarge/status_bar_settings_view.xml
index ed07b9fcf985b..5e867e5d137ba 100644
--- a/packages/SystemUI/res/layout-xlarge/status_bar_settings_view.xml
+++ b/packages/SystemUI/res/layout-xlarge/status_bar_settings_view.xml
@@ -17,11 +17,13 @@
 
 <com.android.systemui.statusbar.tablet.SettingsView
         xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:background="@drawable/status_bar_item_background"
         android:paddingLeft="16dp"
+        android:paddingRight="46dp"
         >
 
     <!-- Airplane mode -->
@@ -39,11 +41,12 @@
                 style="@style/StatusBarPanelSettingsContents"
                 android:text="@string/status_bar_settings_airplane"
                 />
-        <CheckBox
+        <Switch
                 android:id="@+id/airplane_checkbox"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
+                android:layout_marginRight="5dp"
                 />
     </LinearLayout>
     <View style="@style/StatusBarPanelSettingsPanelSeparator" />
@@ -67,7 +70,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="top"
             android:layout_marginTop="16dp"
-            android:layout_marginRight="8dp"
+            android:layout_marginRight="2dp"
             android:src="@drawable/ic_notification_open"
             />
     </LinearLayout>
@@ -88,11 +91,12 @@
                 style="@style/StatusBarPanelSettingsContents"
                 android:text="@string/status_bar_settings_rotation_lock"
                 />
-        <CheckBox
+        <Switch
                 android:id="@+id/rotate_checkbox"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
+                android:layout_marginRight="5dp"
                 />
     </LinearLayout>
     <View style="@style/StatusBarPanelSettingsPanelSeparator" />
@@ -107,8 +111,10 @@
         <com.android.systemui.statusbar.policy.ToggleSlider
                 android:id="@+id/brightness"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="fill_parent"
                 android:layout_weight="1"
+                android:layout_marginRight="2dp"
+                systemui:text="@string/status_bar_settings_auto_brightness_label"
                 />
     </LinearLayout>
     <View style="@style/StatusBarPanelSettingsPanelSeparator" />
@@ -123,8 +129,10 @@
         <com.android.systemui.statusbar.policy.ToggleSlider
                 android:id="@+id/volume"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="fill_parent"
                 android:layout_weight="1"
+                android:layout_marginRight="2dp"
+                systemui:text="@string/status_bar_settings_mute_label"
                 />
     </LinearLayout>
     <View style="@style/StatusBarPanelSettingsPanelSeparator" />
@@ -143,11 +151,12 @@
                 style="@style/StatusBarPanelSettingsContents"
                 android:text="@string/status_bar_settings_notifications"
                 />
-        <CheckBox
+        <Switch
                 android:id="@+id/do_not_disturb_checkbox"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
+                android:layout_marginRight="5dp"
                 />
     </LinearLayout>
     <View style="@style/StatusBarPanelSettingsPanelSeparator" />
@@ -172,7 +181,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="top"
             android:layout_marginTop="16dp"
-            android:layout_marginRight="8dp"
+            android:layout_marginRight="2dp"
             android:src="@drawable/ic_notification_open"
             />
     </LinearLayout>
diff --git a/packages/SystemUI/res/layout/status_bar_toggle_slider.xml b/packages/SystemUI/res/layout/status_bar_toggle_slider.xml
index c5ad047c6e9ac..cdf56c565f077 100644
--- a/packages/SystemUI/res/layout/status_bar_toggle_slider.xml
+++ b/packages/SystemUI/res/layout/status_bar_toggle_slider.xml
@@ -20,33 +20,35 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
     >
-    <ToggleButton
+    <CheckBox
         android:id="@+id/toggle"
         android:layout_width="48dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true"
+        android:button="@drawable/status_bar_toggle_button"
         />
-    <view
-        class="com.android.systemui.statusbar.policy.ToggleSlider$Slider"
+    <SeekBar
         android:id="@+id/slider"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_toRightOf="@id/toggle"
-        android:layout_alignParentTop="true"
+        android:layout_centerVertical="true"
         android:layout_alignParentRight="true"
         android:paddingLeft="20dp"
+        android:paddingRight="20dp"
         />
-        <!--
     <TextView
         android:id="@+id/label"
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:layout_alignLeft="@id/toggle"
         android:layout_alignRight="@id/toggle"
-        android:layout_alignParentBottom="true"
-        android:layout_below="@id/toggle"
+        android:layout_centerVertical="true"
         android:gravity="center"
+        android:paddingTop="26dp"
+        android:textColor="#666666"
+        android:textSize="12sp"
         />
-        -->
 </merge>
diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml
index 23bcf20041412..87395c121efe9 100644
--- a/packages/SystemUI/res/values/attrs.xml
+++ b/packages/SystemUI/res/values/attrs.xml
@@ -18,5 +18,8 @@
     <declare-styleable name="KeyButtonView">
         <attr name="keyCode" format="integer" />
     </declare-styleable>
+    <declare-styleable name="ToggleSlider">
+        <attr name="text" format="string" />
+    </declare-styleable>
 </resources>
 
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index f3ad9ff409cae..644cca060c5ee 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -80,6 +80,12 @@
     <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
     <string name="status_bar_settings_rotation_lock">Lock screen orientation</string>
 
+    <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+    <string name="status_bar_settings_mute_label">MUTE</string>
+
+    <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+    <string name="status_bar_settings_auto_brightness_label">AUTO</string>
+
     <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
     <string name="status_bar_settings_notifications">Notifications</string>
 
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 f4994d51e166d..46207ee8f1562 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ToggleSlider.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ToggleSlider.java
@@ -18,6 +18,7 @@ package com.android.systemui.statusbar.policy;
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.util.Slog;
@@ -26,7 +27,7 @@ import android.widget.CompoundButton;
 import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
-import android.widget.ToggleButton;
+import android.widget.CompoundButton;
 
 import com.android.systemui.R;
 
@@ -38,24 +39,10 @@ public class ToggleSlider extends RelativeLayout
         public void onChanged(ToggleSlider v, boolean tracking, boolean checked, int value);
     }
 
-    public static class Slider extends SeekBar {
-        public Slider(Context context) {
-            this(context, null);
-        }
-
-        public Slider(Context context, AttributeSet attrs) {
-            super(context, attrs);
-        }
-
-        public Slider(Context context, AttributeSet attrs, int defStyle) {
-            super(context, attrs, defStyle);
-        }
-    }
-
     private Listener mListener;
     private boolean mTracking;
 
-    private ToggleButton mToggle;
+    private CompoundButton mToggle;
     private SeekBar mSlider;
     private TextView mLabel;
 
@@ -71,18 +58,21 @@ public class ToggleSlider extends RelativeLayout
         super(context, attrs, defStyle);
         View.inflate(context, R.layout.status_bar_toggle_slider, this);
 
-        mToggle = (ToggleButton)findViewById(R.id.toggle);
+        final Resources res = context.getResources();
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ToggleSlider,
+                defStyle, 0);
+
+        mToggle = (CompoundButton)findViewById(R.id.toggle);
         mToggle.setOnCheckedChangeListener(this);
-        mToggle.setTextOn("hi");
-        mToggle.setTextOff("hi");
+        mToggle.setBackgroundDrawable(res.getDrawable(R.drawable.status_bar_toggle_button));
 
         mSlider = (SeekBar)findViewById(R.id.slider);
         mSlider.setOnSeekBarChangeListener(this);
 
-        /*
         mLabel = (TextView)findViewById(R.id.label);
-        mLabel.setText("yo");
-        */
+        mLabel.setText(a.getString(R.styleable.ToggleSlider_text));
+
+        a.recycle();
     }
 
     public void onCheckedChanged(CompoundButton toggle, boolean checked) {
@@ -91,7 +81,7 @@ public class ToggleSlider extends RelativeLayout
         if (checked) {
             thumb = res.getDrawable(R.drawable.scrubber_control_disabled_holo);
         } else {
-            thumb = res.getDrawable(com.android.internal.R.drawable.scrubber_control_holo);
+            thumb = res.getDrawable(R.drawable.scrubber_control_holo);
         }
         mSlider.setThumb(thumb);