From 271ea12dc29ad30009df785f21f6782ec29844c8 Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@google.com>
Date: Fri, 22 Oct 2010 14:06:10 -0400
Subject: [PATCH] Refinements to the notification icon area.

 - New icon states per revised UX designs.
 - Basic implementation of do-not-disturb mode.
 - Removed unused grippies.

Change-Id: I506dcdc8ceb855902f2401e3145c3c676c0de207
---
 .../res/anim/notification_dnd_off.xml         |  23 +++++++++
 .../SystemUI/res/anim/notification_dnd_on.xml |  23 +++++++++
 .../drawable-mdpi/ic_sysbar_noti_avail.png    | Bin 0 -> 247 bytes
 .../ic_sysbar_noti_avail_open.png             | Bin 0 -> 503 bytes
 .../res/drawable-mdpi/ic_sysbar_noti_dnd.png  | Bin 0 -> 393 bytes
 .../res/drawable-mdpi/ic_sysbar_noti_none.png | Bin 0 -> 185 bytes
 .../ic_sysbar_noti_none_open.png              | Bin 0 -> 393 bytes
 .../SystemUI/res/layout-xlarge/status_bar.xml |  22 +++------
 .../tablet/NotificationIconArea.java          |   2 -
 .../tablet/TabletStatusBarService.java        |  46 +++++++++++++++---
 10 files changed, 93 insertions(+), 23 deletions(-)
 create mode 100644 packages/SystemUI/res/anim/notification_dnd_off.xml
 create mode 100644 packages/SystemUI/res/anim/notification_dnd_on.xml
 create mode 100644 packages/SystemUI/res/drawable-mdpi/ic_sysbar_noti_avail.png
 create mode 100644 packages/SystemUI/res/drawable-mdpi/ic_sysbar_noti_avail_open.png
 create mode 100644 packages/SystemUI/res/drawable-mdpi/ic_sysbar_noti_dnd.png
 create mode 100644 packages/SystemUI/res/drawable-mdpi/ic_sysbar_noti_none.png
 create mode 100644 packages/SystemUI/res/drawable-mdpi/ic_sysbar_noti_none_open.png

diff --git a/packages/SystemUI/res/anim/notification_dnd_off.xml b/packages/SystemUI/res/anim/notification_dnd_off.xml
new file mode 100644
index 0000000000000..4e88855f25890
--- /dev/null
+++ b/packages/SystemUI/res/anim/notification_dnd_off.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.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+    <translate android:fromXDelta="100%p" android:toXDelta="0"
+        android:duration="@android:integer/config_longAnimTime" 
+        android:interpolator="@anim/hydraulic_brake_interpolator"
+        />
+</set>
diff --git a/packages/SystemUI/res/anim/notification_dnd_on.xml b/packages/SystemUI/res/anim/notification_dnd_on.xml
new file mode 100644
index 0000000000000..309943b9e9730
--- /dev/null
+++ b/packages/SystemUI/res/anim/notification_dnd_on.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.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+    <translate android:toXDelta="100%p" android:fromXDelta="0"
+        android:duration="@android:integer/config_longAnimTime" 
+        android:interpolator="@anim/hydraulic_brake_interpolator"
+        />
+</set>
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_noti_avail.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_noti_avail.png
new file mode 100644
index 0000000000000000000000000000000000000000..9123fef48c9688c04afeda751e006f0c4891f79c
GIT binary patch
literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1GGd*1#Ln>~)nQ6$^pdi3<@J2-3+r<^y{hRhp63X;>Bf`W{
zXtq%KVOz82fnyS9&qSVi!U)s_1Pv=U+xdRDS0A;Y_}z2a9jV^VR#%s1w%jUru*zGr
z<;8)iiwi$mOR**daEs2pIMHf>?CVQn3>hN5Obu=qHKbe@M{x8my0|O*X^Fy~TFnQ1
mDMvn?WQUl{z%b>xNCLyJbg@-C-FG;E1U+5-T-G@yGywo85Lyoa

literal 0
HcmV?d00001

diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_noti_avail_open.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_noti_avail_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e56f2a9240783e1a46df25cbe78b6e986330d11
GIT binary patch
literal 503
zcmV<T0SNwyP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUznMp)JRCwC#SxZjCFc6K~godABfjA6{
zo`GX<0ZzdMI0k3nIEY30)5O7y(Hm*h1#!v5Rm6<+WVf>7c^=Pm#&IEpV#+ovCT>Q+
z2p9n)U<8c7q^;~5aDDsps^LJETkbn0KLYRt1kn~ZSMKiw;N%=*BNn1RS0E9c><AuM
zi+;x>h7gzu#}5ccXyflnVH?JkZsGVl;T5eUH#h<%oIWL-p*<$liO=}W;!1xKUI;6~
zBmU>86dDnTE4>fL??=wd3q&K5YBW@cbD+YCk8L&PO3JT)aSlj{^BH{dLPCQ^4sb%X
z*q4`tbHWMXP)SDL2v39u%+dC#&o%@$BhX-y1)Q%265xg5q*afA6DM#SzlTJtA+19r
zP{GkPo?UKp(x+}AsX})n=fF~^kV+D7Mj*%gS#ktSMomUdMomUdMomUjYgSISu}!Lw
zN)mI;`hk*fIdVz4!dxxpR*_LJ3hmf`&QR2Q%?NmLpfw<n<61>60-cCNllx*z;~eO{
tpV^f;`$}m9jDQg^0!F|H?9jdi7yz%du8v`+fSv#V002ovPDHLkV1hdC(trQ}

literal 0
HcmV?d00001

diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_noti_dnd.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_noti_dnd.png
new file mode 100644
index 0000000000000000000000000000000000000000..80cf99c68660a1cdd69c4a3d5a2ac8b238b9793c
GIT binary patch
literal 393
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@jM|<qjv*Dd-pq*RYcddUJ+1vn`{UuOKOXLiX?k5`TPGmj
zVY4Q8kLh2bNn$(?{fg!$br>%{?9<seC8+17lVOoE10#n61Cu}l1B(KXX%O46<7?mH
zpnA3j(|c=}{VP3QuzH^6F5F|yP&28gVEwf-QSNdIC6juCcx~5~er_#b;8=S^+)KNn
zc5X!l&sV>251a5^2X7ag6YZGz#VwP2f0&o`zhnBBtz$J}ry4Ca-e(>vXs5NHysGbr
zzwP&@d{-|7EbZ4!sZu!D_dQoLsr1!)&pFJ?CTdODny)Rex|FH(Eu*ojT*ju_^S*Nw
z!&+~gV-RvI(teQIU>Nm#jYDqlHX#OQnUs547b2!=u-8v5V0lrZ^zSs&zrB74KY_fL
eu;!as0>gv_=}Z%6#z+Fgmci52&t;ucLK6UIa+Fs9

literal 0
HcmV?d00001

diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_noti_none.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_noti_none.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0d018bda2c7c065dfae00f3010a2fde18976042
GIT binary patch
literal 185
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1G(Vi}jAr-gY+}Ox_z<|TmF*!BDEh*Zjxm#sZ&HCjQov+->
z`zOzS`~j#G3FNWb>}C)B`l@H*%!jQEb~-x6NRlAt{w*vL43FHoqSx!0EdU94y85}S
Ib4q9e0C{aRB>(^b

literal 0
HcmV?d00001

diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_noti_none_open.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_noti_none_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..5db8c9cf3d8426900fa6ca368160162a8c940ac1
GIT binary patch
literal 393
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@jM|<qjv*Dd-b{<;I^@9PdOPc5W0U;4WBk`2v&FPZ7uc>l
z&L4R3R(rBro}&G$DKo{i%nMF_ahz<dIP=)C87t0<2{$mXC@?T`I502?fS3pFGv$1L
z|9qoH;J&!yjh_rI2pgSp-+lJEfwQ>BMTYlLy;rIP7!IjLc6z;7crBFoA@hV4N0u*=
z+_Ts3<DKJg{KP%}sO>tGZSkIqXW|#9EiLoAkM-UEkyf_c_@ZlxkZj@pbzUNin97!`
zd;Gaj6u&NjmwW1NmFKsZHOuzoN-Iwbu2&5_ubXM0$~9$c?rDM7&smDzHdcAvxtQ{L
z+Uy@K5v)no%n~d+S2jH7JC-52iD{`+t|h}RixW+u3xcMe*!^$n2i5{B!Jp<{P~X5k
e#`{+F0K?zHvlY{YIwk?bmci52&t;ucLK6V2>72L#

literal 0
HcmV?d00001

diff --git a/packages/SystemUI/res/layout-xlarge/status_bar.xml b/packages/SystemUI/res/layout-xlarge/status_bar.xml
index ed52ad5a19876..cf96e3799c411 100644
--- a/packages/SystemUI/res/layout-xlarge/status_bar.xml
+++ b/packages/SystemUI/res/layout-xlarge/status_bar.xml
@@ -28,19 +28,21 @@
         >
 
         <ImageView
-            android:id="@+id/expand"
+            android:id="@+id/notificationTrigger"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_sysbar_open"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:layout_marginLeft="6dip"
+            android:src="@drawable/ic_sysbar_noti_none"
             android:background="@drawable/ic_sysbar_icon_bg"
-            android:paddingLeft="6dip"
+            android:gravity="center"
             />
 
         <LinearLayout
             android:id="@+id/notificationButtons"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_toRightOf="@+id/expand"
+            android:layout_toLeftOf="@+id/notificationTrigger"
             android:gravity="center_vertical"
             android:orientation="horizontal"
             android:visibility="gone"
@@ -78,7 +80,7 @@
             android:id="@+id/notificationIcons"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_toLeftOf="@+id/expand"
+            android:layout_toLeftOf="@+id/notificationTrigger"
             android:gravity="center_vertical"
             android:orientation="horizontal"
             >
@@ -91,14 +93,6 @@
                 android:background="@drawable/ic_sysbar_icon_bg"
                 android:visibility="invisible"
                 />
-            <view
-                class="com.android.systemui.statusbar.tablet.NotificationIconArea$DraggerView"
-                android:id="@+id/handle"
-                android:layout_width="32dip"
-                android:layout_height="match_parent"
-                android:background="@drawable/sysbar_hidenotification_handle"
-                android:layout_marginLeft="8dip"
-                />
             <view
                 class="com.android.systemui.statusbar.tablet.NotificationIconArea$IconLayout"
                 android:id="@+id/icons"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationIconArea.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationIconArea.java
index 7c7d74c3ce107..2b4f9d260ba87 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationIconArea.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationIconArea.java
@@ -32,13 +32,11 @@ public class NotificationIconArea extends LinearLayout {
     private static final String TAG = "NotificationIconArea";
 
     IconLayout mIconLayout;
-    DraggerView mDraggerView;
 
     public NotificationIconArea(Context context, AttributeSet attrs) {
         super(context, attrs);
 
         mIconLayout = (IconLayout)findViewById(R.id.icons);
-        mDraggerView = (DraggerView) findViewById(R.id.handle);
     }
 
     static class IconLayout extends LinearLayout {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java
index fd65e4d534771..0c004aef2a0e5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java
@@ -77,7 +77,7 @@ public class TabletStatusBarService extends StatusBarService {
     private NotificationData mNotns = new NotificationData();
     
     TabletStatusBarView mStatusBarView;
-    View mNotificationTrigger;
+    ImageView mNotificationTrigger;
     NotificationIconArea mNotificationIconArea;
     View mNotificationButtons;
     View mSystemInfo;
@@ -192,7 +192,7 @@ public class TabletStatusBarService extends StatusBarService {
         mCurtains.setOnLongClickListener(on);
 
         // the button to open the notification area
-        mNotificationTrigger = sb.findViewById(R.id.expand);
+        mNotificationTrigger = (ImageView) sb.findViewById(R.id.notificationTrigger);
         mNotificationTrigger.setOnClickListener(mOnClickListener);
 
         // the more notifications icon
@@ -222,6 +222,7 @@ public class TabletStatusBarService extends StatusBarService {
 
         // set the initial view visibility
         setAreThereNotifications();
+        refreshNotificationTrigger();
 
         // Add the windows
         addPanelWindows();
@@ -253,6 +254,7 @@ public class TabletStatusBarService extends StatusBarService {
                                 R.anim.notification_icons_out);
                         setViewVisibility(mNotificationButtons, View.VISIBLE,
                                 R.anim.notification_buttons_in);
+                        refreshNotificationTrigger();
                     }
                     break;
                 case MSG_CLOSE_NOTIFICATION_PANEL:
@@ -263,6 +265,7 @@ public class TabletStatusBarService extends StatusBarService {
                                 R.anim.notification_icons_in);
                         setViewVisibility(mNotificationButtons, View.GONE,
                                 R.anim.notification_buttons_out);
+                        refreshNotificationTrigger();
                     }
                     break;
                 case MSG_OPEN_SYSTEM_PANEL:
@@ -276,6 +279,20 @@ public class TabletStatusBarService extends StatusBarService {
             }
         }
     }
+
+    public void refreshNotificationTrigger() {
+        int resId;
+        boolean panel = (mNotificationPanel != null 
+                && mNotificationPanel.getVisibility() == View.VISIBLE);
+        if (!mNotificationsOn) {
+            resId = R.drawable.ic_sysbar_noti_dnd;
+        } else if (mNotns.size() > 0) {
+            resId = panel ? R.drawable.ic_sysbar_noti_avail_open : R.drawable.ic_sysbar_noti_avail;
+        } else {
+            resId = panel ? R.drawable.ic_sysbar_noti_none_open : R.drawable.ic_sysbar_noti_none;
+        }
+        mNotificationTrigger.setImageResource(resId);
+    }
     
     public void setBatteryMeter(int level, boolean plugged) {
         if (DEBUG) Slog.d(TAG, "battery=" + level + (plugged ? " - plugged" : " - unplugged"));
@@ -598,21 +615,34 @@ public class TabletStatusBarService extends StatusBarService {
             // system process is dead if we're here.
         }
         animateCollapse();
+        refreshNotificationTrigger();
     }
 
     void onClickDoNotDisturb() {
         mNotificationsOn = !mNotificationsOn;
+        setViewVisibility(mIconLayout,
+                mNotificationsOn ? View.VISIBLE : View.INVISIBLE,
+                mNotificationsOn ? R.anim.notification_dnd_off : R.anim.notification_dnd_on);
         animateCollapse();
+        refreshNotificationTrigger();
     }
 
     public void onClickNotificationTrigger() {
         if (DEBUG) Slog.d(TAG, "clicked notification icons");
         if ((mDisabled & StatusBarManager.DISABLE_EXPAND) == 0) {
-            int msg = (mNotificationPanel.getVisibility() == View.GONE) 
-                ? MSG_OPEN_NOTIFICATION_PANEL
-                : MSG_CLOSE_NOTIFICATION_PANEL;
-            mHandler.removeMessages(msg);
-            mHandler.sendEmptyMessage(msg);
+            if (!mNotificationsOn) {
+                mNotificationsOn = true;
+                setViewVisibility(mIconLayout,
+                        View.VISIBLE,
+                        R.anim.notification_dnd_off);
+                refreshNotificationTrigger();
+            } else {
+                int msg = (mNotificationPanel.getVisibility() == View.GONE) 
+                    ? MSG_OPEN_NOTIFICATION_PANEL
+                    : MSG_CLOSE_NOTIFICATION_PANEL;
+                mHandler.removeMessages(msg);
+                mHandler.sendEmptyMessage(msg);
+            }
         }
     }
 
@@ -757,6 +787,8 @@ public class TabletStatusBarService extends StatusBarService {
         for (int i=0; i<N; i++) {
             mPile.addView(mNotns.get(N-i-1).row);
         }
+
+        refreshNotificationTrigger();
     }
 
     private boolean inflateViews(NotificationData.Entry entry, ViewGroup parent) {