summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2011-01-30 17:56:25 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-30 17:56:25 -0800
commitfba54f620ff155ede6de7d73f1b6a0003839b1c4 (patch)
treeeaaec402ca2950c2ce346f427e7a0ae3769e828a /packages
parent13934c2d71046cdd2e7ca33528b91cb83f82dc13 (diff)
parentde7feddc87e853040e35daeef86a71ba814c48fd (diff)
downloadframeworks_base-fba54f620ff155ede6de7d73f1b6a0003839b1c4.zip
frameworks_base-fba54f620ff155ede6de7d73f1b6a0003839b1c4.tar.gz
frameworks_base-fba54f620ff155ede6de7d73f1b6a0003839b1c4.tar.bz2
Merge "I declare settings panel icon VICTORY!" into honeycomb
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/res/layout-xlarge/status_bar_notification_panel_title.xml2
-rw-r--r--packages/SystemUI/res/layout-xlarge/status_bar_settings_view.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/res/layout-xlarge/status_bar_notification_panel_title.xml b/packages/SystemUI/res/layout-xlarge/status_bar_notification_panel_title.xml
index 40f2247..3e785c6 100644
--- a/packages/SystemUI/res/layout-xlarge/status_bar_notification_panel_title.xml
+++ b/packages/SystemUI/res/layout-xlarge/status_bar_notification_panel_title.xml
@@ -86,7 +86,7 @@
android:layout_alignBaseline="@id/battery"
android:layout_alignParentRight="true"
android:paddingRight="16dp"
- android:src="@drawable/ic_notification_open"
+ android:src="@drawable/ic_sysbar_quicksettings"
android:baseline="21dp"
/>
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 d0afbb2..75bbb3a 100644
--- a/packages/SystemUI/res/layout-xlarge/status_bar_settings_view.xml
+++ b/packages/SystemUI/res/layout-xlarge/status_bar_settings_view.xml
@@ -118,7 +118,7 @@
<ImageView
android:id="@+id/do_not_disturb_icon"
style="@style/StatusBarPanelSettingsIcon"
- android:src="@drawable/ic_sysbar_gps_on"
+ android:src="@drawable/ic_notification_open"
/>
<TextView
style="@style/StatusBarPanelSettingsContents"