commit | 090d31eaa3d1ff645739cc4c531a31317403bd5f | [log] [tgz] |
---|---|---|
author | Peter Ng <petergng@google.com> | Tue Sep 06 16:42:54 2011 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Sep 06 16:42:54 2011 -0700 |
tree | e3adb47393d16b54c7ed3c2606ffe15641f7c927 | |
parent | 1d124d5037644ed66a78c181c4eff13a7da04443 [diff] | |
parent | f6bb1622ba3d4c01d2543875f12c4ce07483b224 [diff] |
Merge "Blue notify quicksettings icon implemented"
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_notify_clear_normal.png b/packages/SystemUI/res/drawable-hdpi/ic_notify_clear_normal.png index d17aae6..babddb1 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_notify_clear_normal.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_notify_clear_normal.png Binary files differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_notify_clear_pressed.png b/packages/SystemUI/res/drawable-hdpi/ic_notify_clear_pressed.png index 5a89d76..56cd6f9 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_notify_clear_pressed.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_notify_clear_pressed.png Binary files differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_notify_quicksettings_normal.png b/packages/SystemUI/res/drawable-hdpi/ic_notify_quicksettings_normal.png new file mode 100644 index 0000000..23ce001 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/ic_notify_quicksettings_normal.png Binary files differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_notify_quicksettings_pressed.png b/packages/SystemUI/res/drawable-hdpi/ic_notify_quicksettings_pressed.png new file mode 100644 index 0000000..d0754a39 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/ic_notify_quicksettings_pressed.png Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_notify_clear_normal.png b/packages/SystemUI/res/drawable-mdpi/ic_notify_clear_normal.png index 9490833..bf1bad5 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_notify_clear_normal.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_notify_clear_normal.png Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_notify_clear_pressed.png b/packages/SystemUI/res/drawable-mdpi/ic_notify_clear_pressed.png index 0ff3efd..320d92d 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_notify_clear_pressed.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_notify_clear_pressed.png Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_notify_quicksettings_normal.png b/packages/SystemUI/res/drawable-mdpi/ic_notify_quicksettings_normal.png new file mode 100644 index 0000000..b58e4dc --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_notify_quicksettings_normal.png Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_notify_quicksettings_pressed.png b/packages/SystemUI/res/drawable-mdpi/ic_notify_quicksettings_pressed.png new file mode 100644 index 0000000..604eb75 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_notify_quicksettings_pressed.png Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_notify_clear_normal.png b/packages/SystemUI/res/drawable-xhdpi/ic_notify_clear_normal.png index 6455423..cf9bd8e 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_notify_clear_normal.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_notify_clear_normal.png Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_notify_clear_pressed.png b/packages/SystemUI/res/drawable-xhdpi/ic_notify_clear_pressed.png index bfa8bb4..8eee4d9 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_notify_clear_pressed.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_notify_clear_pressed.png Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_notify_quicksettings_normal.png b/packages/SystemUI/res/drawable-xhdpi/ic_notify_quicksettings_normal.png new file mode 100644 index 0000000..5e67545 --- /dev/null +++ b/packages/SystemUI/res/drawable-xhdpi/ic_notify_quicksettings_normal.png Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_notify_quicksettings_pressed.png b/packages/SystemUI/res/drawable-xhdpi/ic_notify_quicksettings_pressed.png new file mode 100644 index 0000000..e56aeda --- /dev/null +++ b/packages/SystemUI/res/drawable-xhdpi/ic_notify_quicksettings_pressed.png Binary files differ
diff --git a/packages/SystemUI/res/drawable/ic_notify_quicksettings.xml b/packages/SystemUI/res/drawable/ic_notify_quicksettings.xml new file mode 100644 index 0000000..b37dc39 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_notify_quicksettings.xml
@@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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_pressed="true" + android:drawable="@drawable/ic_notify_quicksettings_pressed" /> + <item android:drawable="@drawable/ic_notify_quicksettings_normal" /> +</selector>
diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index b5274a3..6f47ed0 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml
@@ -58,22 +58,24 @@ android:textColor="?android:attr/textColorSecondary" /> --> + <ImageView android:id="@+id/settings_button" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_toRightOf="@id/date" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:src="@drawable/ic_sysbar_quicksettings" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:src="@drawable/ic_notify_quicksettings" /> + <ImageView android:id="@+id/clear_all_button" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentRight="true" - android:paddingLeft="16dp" - android:paddingRight="16dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" android:src="@drawable/ic_notify_clear" - /> + /> </RelativeLayout> <View