summaryrefslogtreecommitdiffstats
path: root/packages/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
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')
-rw-r--r--packages/SystemUI/res/drawable/navbar_search_outerring.xml4
-rw-r--r--packages/SystemUI/res/values-land/arrays.xml2
-rw-r--r--packages/SystemUI/res/values-port/arrays.xml2
-rw-r--r--packages/SystemUI/res/values-sw600dp/arrays.xml2
-rw-r--r--packages/SystemUI/src/com/android/systemui/SearchPanelView.java4
5 files changed, 7 insertions, 7 deletions
diff --git a/packages/SystemUI/res/drawable/navbar_search_outerring.xml b/packages/SystemUI/res/drawable/navbar_search_outerring.xml
index 0dd081d..8a8785f 100644
--- a/packages/SystemUI/res/drawable/navbar_search_outerring.xml
+++ b/packages/SystemUI/res/drawable/navbar_search_outerring.xml
@@ -19,5 +19,5 @@
<size android:height="@dimen/navbar_search_outerring_diameter"
android:width="@dimen/navbar_search_outerring_diameter" />
<solid android:color="#00000000" />
- <stroke android:color="#40ffffff" android:width="2dp" />
-</shape> \ No newline at end of file
+ <stroke android:color="#00000000" android:width="2dp" />
+</shape>
diff --git a/packages/SystemUI/res/values-land/arrays.xml b/packages/SystemUI/res/values-land/arrays.xml
index 53f374d..74a6c81 100644
--- a/packages/SystemUI/res/values-land/arrays.xml
+++ b/packages/SystemUI/res/values-land/arrays.xml
@@ -22,7 +22,7 @@
<array name="navbar_search_targets">
<item>@null</item>
<item>@null</item>
- <item>@*android:drawable/ic_lockscreen_search</item>
+ <item>@*android:drawable/ic_action_assist_generic</item>
<item>@null</item>
</array>
diff --git a/packages/SystemUI/res/values-port/arrays.xml b/packages/SystemUI/res/values-port/arrays.xml
index f8b1620..cd6aaf6 100644
--- a/packages/SystemUI/res/values-port/arrays.xml
+++ b/packages/SystemUI/res/values-port/arrays.xml
@@ -21,7 +21,7 @@
<array name="navbar_search_targets">
<item>@null</item>
- <item>@*android:drawable/ic_lockscreen_search</item>
+ <item>@*android:drawable/ic_action_assist_generic</item>
<item>@null</item>
<item>@null</item>
</array>
diff --git a/packages/SystemUI/res/values-sw600dp/arrays.xml b/packages/SystemUI/res/values-sw600dp/arrays.xml
index 8b5b17d..f3a1771 100644
--- a/packages/SystemUI/res/values-sw600dp/arrays.xml
+++ b/packages/SystemUI/res/values-sw600dp/arrays.xml
@@ -21,7 +21,7 @@
<array name="navbar_search_targets">
<item>@null</item>
- <item>@*android:drawable/ic_lockscreen_search</item>
+ <item>@*android:drawable/ic_action_assist_generic</item>
<item>@null</item>
<item>@null</item>
</array>
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 {