diff options
21 files changed, 37 insertions, 30 deletions
diff --git a/core/java/com/android/internal/widget/multiwaveview/PointCloud.java b/core/java/com/android/internal/widget/multiwaveview/PointCloud.java index 2ef8c787c884..1beac1693e92 100644 --- a/core/java/com/android/internal/widget/multiwaveview/PointCloud.java +++ b/core/java/com/android/internal/widget/multiwaveview/PointCloud.java @@ -180,8 +180,8 @@ public class PointCloud { float glowDistance = hypot(glowManager.x - point.x, glowManager.y - point.y); float glowAlpha = 0.0f; if (glowDistance < glowManager.radius) { - float cosf = FloatMath.cos(PI * 0.5f * glowDistance / glowManager.radius); - glowAlpha = glowManager.alpha * max(0.0f, (float) Math.pow(cosf, 0.5f)); + float cosf = FloatMath.cos(PI * 0.25f * glowDistance / glowManager.radius); + glowAlpha = glowManager.alpha * max(0.0f, (float) Math.pow(cosf, 10.0f)); } // Compute contribution from Wave @@ -190,7 +190,7 @@ public class PointCloud { float waveAlpha = 0.0f; if (distanceToWaveRing < waveManager.width * 0.5f) { float cosf = FloatMath.cos(PI * 0.5f * distanceToWaveRing / waveManager.width); - waveAlpha = waveManager.alpha * max(0.0f, (float) Math.pow(cosf, 15.0f)); + waveAlpha = waveManager.alpha * max(0.0f, (float) Math.pow(cosf, 20.0f)); } return (int) (max(glowAlpha, waveAlpha) * 255); diff --git a/core/res/res/drawable-hdpi/ic_action_assist_focused.png b/core/res/res/drawable-hdpi/ic_action_assist_focused.png Binary files differnew file mode 100644 index 000000000000..d98557d5e692 --- /dev/null +++ b/core/res/res/drawable-hdpi/ic_action_assist_focused.png diff --git a/core/res/res/drawable-hdpi/ic_action_assist_generic_activated.png b/core/res/res/drawable-hdpi/ic_action_assist_generic_activated.png Binary files differnew file mode 100644 index 000000000000..c0e20984b674 --- /dev/null +++ b/core/res/res/drawable-hdpi/ic_action_assist_generic_activated.png diff --git a/core/res/res/drawable-hdpi/ic_action_assist_generic_normal.png b/core/res/res/drawable-hdpi/ic_action_assist_generic_normal.png Binary files differnew file mode 100644 index 000000000000..a852e2cc99bb --- /dev/null +++ b/core/res/res/drawable-hdpi/ic_action_assist_generic_normal.png diff --git a/core/res/res/drawable-mdpi/ic_action_assist_focused.png b/core/res/res/drawable-mdpi/ic_action_assist_focused.png Binary files differnew file mode 100644 index 000000000000..3f96d0379d3d --- /dev/null +++ b/core/res/res/drawable-mdpi/ic_action_assist_focused.png diff --git a/core/res/res/drawable-mdpi/ic_action_assist_generic_activated.png b/core/res/res/drawable-mdpi/ic_action_assist_generic_activated.png Binary files differnew file mode 100644 index 000000000000..f88f7e13f3ba --- /dev/null +++ b/core/res/res/drawable-mdpi/ic_action_assist_generic_activated.png diff --git a/core/res/res/drawable-mdpi/ic_action_assist_generic_normal.png b/core/res/res/drawable-mdpi/ic_action_assist_generic_normal.png Binary files differnew file mode 100644 index 000000000000..7426994a59e3 --- /dev/null +++ b/core/res/res/drawable-mdpi/ic_action_assist_generic_normal.png diff --git a/core/res/res/drawable-xhdpi/ic_action_assist_generic_activated.png b/core/res/res/drawable-xhdpi/ic_action_assist_generic_activated.png Binary files differnew file mode 100644 index 000000000000..500b15755b88 --- /dev/null +++ b/core/res/res/drawable-xhdpi/ic_action_assist_generic_activated.png diff --git a/core/res/res/drawable-xhdpi/ic_action_assist_generic_normal.png b/core/res/res/drawable-xhdpi/ic_action_assist_generic_normal.png Binary files differnew file mode 100644 index 000000000000..d0e4cf3f839a --- /dev/null +++ b/core/res/res/drawable-xhdpi/ic_action_assist_generic_normal.png diff --git a/core/res/res/drawable/ic_lockscreen_search.xml b/core/res/res/drawable/ic_action_assist_generic.xml index d7a5b00b0a42..60f5d5df11dc 100644 --- a/core/res/res/drawable/ic_lockscreen_search.xml +++ b/core/res/res/drawable/ic_action_assist_generic.xml @@ -19,18 +19,18 @@ android:state_enabled="true" android:state_active="false" android:state_focused="false" - android:drawable="@drawable/ic_lockscreen_google_normal" /> + android:drawable="@drawable/ic_action_assist_generic_normal" /> <item android:state_enabled="true" android:state_active="true" android:state_focused="false" - android:drawable="@drawable/ic_lockscreen_google_activated" /> + android:drawable="@drawable/ic_action_assist_generic_activated" /> <item android:state_enabled="true" android:state_active="false" android:state_focused="true" - android:drawable="@drawable/ic_lockscreen_google_focused" /> + android:drawable="@drawable/ic_action_assist_generic_activated" /> </selector> diff --git a/core/res/res/drawable/ic_lockscreen_outerring.xml b/core/res/res/drawable/ic_lockscreen_outerring.xml index 78984b3e0fb9..3886bb40d4aa 100644 --- a/core/res/res/drawable/ic_lockscreen_outerring.xml +++ b/core/res/res/drawable/ic_lockscreen_outerring.xml @@ -20,5 +20,5 @@ <size android:height="@dimen/keyguard_lockscreen_outerring_diameter" android:width="@dimen/keyguard_lockscreen_outerring_diameter" /> <solid android:color="#00000000" /> - <stroke android:color="#1affffff" android:width="2dp" /> -</shape>
\ No newline at end of file + <stroke android:color="#00000000" android:width="2dp" /> +</shape> diff --git a/core/res/res/values-land/arrays.xml b/core/res/res/values-land/arrays.xml index f2df3fae343c..6db3a50815d1 100644 --- a/core/res/res/values-land/arrays.xml +++ b/core/res/res/values-land/arrays.xml @@ -23,7 +23,7 @@ <array name="lockscreen_targets_when_silent"> <item>@null</item>" <item>@drawable/ic_lockscreen_unlock</item> - <item>@drawable/ic_lockscreen_search</item> + <item>@drawable/ic_action_assist_generic</item> <item>@drawable/ic_lockscreen_soundon</item> </array> @@ -44,7 +44,7 @@ <array name="lockscreen_targets_when_soundon"> <item>@null</item> <item>@drawable/ic_lockscreen_unlock</item> - <item>@drawable/ic_lockscreen_search</item> + <item>@drawable/ic_action_assist_generic</item> <item>@drawable/ic_lockscreen_silent</item> </array> @@ -58,7 +58,7 @@ <array name="lockscreen_targets_with_camera"> <item>@null</item> <item>@drawable/ic_lockscreen_unlock</item> - <item>@drawable/ic_lockscreen_search</item> + <item>@drawable/ic_action_assist_generic</item> <item>@drawable/ic_lockscreen_camera</item> </array> diff --git a/core/res/res/values-sw600dp-land/arrays.xml b/core/res/res/values-sw600dp-land/arrays.xml index 2b5fd99ead6e..55502164a751 100644 --- a/core/res/res/values-sw600dp-land/arrays.xml +++ b/core/res/res/values-sw600dp-land/arrays.xml @@ -57,7 +57,7 @@ <array name="lockscreen_targets_with_camera"> <item>@drawable/ic_lockscreen_unlock</item> - <item>@drawable/ic_lockscreen_search</item> + <item>@drawable/ic_action_assist_generic</item> <item>@drawable/ic_lockscreen_camera</item> <item>@null</item> </array> diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml index aeb6b4fac695..b425ad757820 100644 --- a/core/res/res/values/arrays.xml +++ b/core/res/res/values/arrays.xml @@ -353,7 +353,7 @@ <!-- Resources for GlowPadView in LockScreen --> <array name="lockscreen_targets_when_silent"> <item>@drawable/ic_lockscreen_unlock</item> - <item>@drawable/ic_lockscreen_search</item> + <item>@drawable/ic_action_assist_generic</item> <item>@drawable/ic_lockscreen_soundon</item> <item>@null</item> </array> @@ -374,7 +374,7 @@ <array name="lockscreen_targets_when_soundon"> <item>@drawable/ic_lockscreen_unlock</item> - <item>@drawable/ic_lockscreen_search</item> + <item>@drawable/ic_action_assist_generic</item> <item>@drawable/ic_lockscreen_silent</item> <item>@null</item> </array> @@ -388,7 +388,7 @@ <array name="lockscreen_targets_with_camera"> <item>@drawable/ic_lockscreen_unlock</item> - <item>@drawable/ic_lockscreen_search</item> + <item>@drawable/ic_action_assist_generic</item> <item>@drawable/ic_lockscreen_camera</item> <item>@null</item> </array> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index a6f2f49c66ae..8ba0ccb289d1 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1018,7 +1018,7 @@ <java-symbol type="drawable" name="ic_lockscreen_camera" /> <java-symbol type="drawable" name="ic_lockscreen_silent" /> <java-symbol type="drawable" name="ic_lockscreen_unlock" /> - <java-symbol type="drawable" name="ic_lockscreen_search" /> + <java-symbol type="drawable" name="ic_action_assist_generic" /> <java-symbol type="drawable" name="notification_bg" /> <java-symbol type="drawable" name="notification_bg_low" /> <java-symbol type="drawable" name="notification_template_icon_bg" /> diff --git a/packages/SystemUI/res/drawable/navbar_search_outerring.xml b/packages/SystemUI/res/drawable/navbar_search_outerring.xml index 0dd081d68917..8a8785f66dd0 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 53f374da5272..74a6c8151693 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 f8b1620556da..cd6aaf604a24 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 8b5b17d75197..f3a1771c1019 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 c082c9753c6b..acab41ea3c6c 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 { diff --git a/policy/src/com/android/internal/policy/impl/LockScreen.java b/policy/src/com/android/internal/policy/impl/LockScreen.java index 4af66ce3c0b7..33dda0998632 100644 --- a/policy/src/com/android/internal/policy/impl/LockScreen.java +++ b/policy/src/com/android/internal/policy/impl/LockScreen.java @@ -301,10 +301,17 @@ class LockScreen extends LinearLayout implements KeyguardScreen { if (searchManager != null) { ComponentName component = searchManager.getGlobalSearchActivity(); if (component != null) { - if (!mGlowPadView.replaceTargetDrawablesIfPresent(component, - ASSIST_ICON_METADATA_NAME, - com.android.internal.R.drawable.ic_lockscreen_search)) { - Slog.w(TAG, "Couldn't grab icon from package " + component); + // XXX Hack. We need to substitute the icon here but haven't formalized + // the public API. The "_google" metadata will be going away, so + // DON'T USE IT! + boolean replaced = mGlowPadView.replaceTargetDrawablesIfPresent(component, + ASSIST_ICON_METADATA_NAME + "_google", + com.android.internal.R.drawable.ic_action_assist_generic); + + if (!replaced && !mGlowPadView.replaceTargetDrawablesIfPresent(component, + ASSIST_ICON_METADATA_NAME, + com.android.internal.R.drawable.ic_action_assist_generic)) { + Slog.w(TAG, "Couldn't grab icon from package " + component); } } else { Slog.w(TAG, "No search icon specified in package " + component); @@ -315,7 +322,7 @@ class LockScreen extends LinearLayout implements KeyguardScreen { } setEnabled(com.android.internal.R.drawable.ic_lockscreen_camera, !mCameraDisabled); - setEnabled(com.android.internal.R.drawable.ic_lockscreen_search, !mSearchDisabled); + setEnabled(com.android.internal.R.drawable.ic_action_assist_generic, !mSearchDisabled); } public void onGrabbed(View v, int handle) { @@ -329,7 +336,7 @@ class LockScreen extends LinearLayout implements KeyguardScreen { public void onTrigger(View v, 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: Intent assistIntent = getAssistIntent(); if (assistIntent != null) { launchActivity(assistIntent); @@ -535,7 +542,7 @@ class LockScreen extends LinearLayout implements KeyguardScreen { : false; boolean searchTargetPresent = (mUnlockWidgetMethods instanceof GlowPadViewMethods) ? ((GlowPadViewMethods) mUnlockWidgetMethods) - .isTargetPresent(com.android.internal.R.drawable.ic_lockscreen_search) + .isTargetPresent(com.android.internal.R.drawable.ic_action_assist_generic) : false; if (disabledByAdmin) { |
