summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2012-06-18 13:29:49 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-18 13:29:49 -0700
commit12da2c5eeeadd6c23da5d3003d0da3b6b73d5052 (patch)
treec154532a2dcb1490f9cc93ab61454d6bda0b1119 /packages/SystemUI/src/com/android/systemui
parentc4947277e821153fc01256a425e4cbbe34a06eda (diff)
parent20039ad17b94873ee40fdd61c3d1d1aa590010df (diff)
downloadframeworks_base-12da2c5eeeadd6c23da5d3003d0da3b6b73d5052.zip
frameworks_base-12da2c5eeeadd6c23da5d3003d0da3b6b73d5052.tar.gz
frameworks_base-12da2c5eeeadd6c23da5d3003d0da3b6b73d5052.tar.bz2
Merge "Fix 6665117: ACTION_ASSIST visual improvements" into jb-dev
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui')
-rw-r--r--packages/SystemUI/src/com/android/systemui/SearchPanelView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/SearchPanelView.java b/packages/SystemUI/src/com/android/systemui/SearchPanelView.java
index c082c97..acab41e 100644
--- a/packages/SystemUI/src/com/android/systemui/SearchPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/SearchPanelView.java
@@ -118,7 +118,7 @@ public class SearchPanelView extends FrameLayout implements
public void onTrigger(View v, final int target) {
final int resId = mGlowPadView.getResourceIdForTarget(target);
switch (resId) {
- case com.android.internal.R.drawable.ic_lockscreen_search:
+ case com.android.internal.R.drawable.ic_action_assist_generic:
mWaitingForLaunch = true;
startAssistActivity();
vibrate();
@@ -155,7 +155,7 @@ public class SearchPanelView extends FrameLayout implements
if (component != null) {
if (!mGlowPadView.replaceTargetDrawablesIfPresent(component,
ASSIST_ICON_METADATA_NAME,
- com.android.internal.R.drawable.ic_lockscreen_search)) {
+ com.android.internal.R.drawable.ic_action_assist_generic)) {
Slog.w(TAG, "Couldn't grab icon from component " + component);
}
} else {