diff options
22 files changed, 3 insertions, 111 deletions
diff --git a/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java b/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java index 4e60b75..421e247 100644 --- a/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java +++ b/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java @@ -214,8 +214,8 @@ public class GlowPadView extends View { mVibrationDuration); mFeedbackCount = a.getInt(R.styleable.GlowPadView_feedbackCount, mFeedbackCount); - mHandleDrawable = new TargetDrawable(res, - a.peekValue(R.styleable.GlowPadView_handleDrawable).resourceId); + TypedValue handle = a.peekValue(R.styleable.GlowPadView_handleDrawable); + mHandleDrawable = new TargetDrawable(res, handle != null ? handle.resourceId : 0); mHandleDrawable.setState(TargetDrawable.STATE_INACTIVE); mOuterRing = new TargetDrawable(res, getResourceId(a, R.styleable.GlowPadView_outerRingDrawable)); @@ -717,7 +717,7 @@ public class GlowPadView extends View { startBackgroundAnimation(0, 0.0f); stopAndHideWaveAnimation(); hideTargets(animate, false); - hideGlow(0, 0, 1.0f, null); + hideGlow(0, 0, 0.0f, null); Tweener.reset(); } diff --git a/core/res/res/drawable-hdpi/ic_lockscreen_chevron_down.png b/core/res/res/drawable-hdpi/ic_lockscreen_chevron_down.png Binary files differdeleted file mode 100644 index bc718b5..0000000 --- a/core/res/res/drawable-hdpi/ic_lockscreen_chevron_down.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/ic_lockscreen_chevron_left.png b/core/res/res/drawable-hdpi/ic_lockscreen_chevron_left.png Binary files differdeleted file mode 100644 index 0892c31..0000000 --- a/core/res/res/drawable-hdpi/ic_lockscreen_chevron_left.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/ic_lockscreen_chevron_right.png b/core/res/res/drawable-hdpi/ic_lockscreen_chevron_right.png Binary files differdeleted file mode 100644 index 04cc0a2..0000000 --- a/core/res/res/drawable-hdpi/ic_lockscreen_chevron_right.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/ic_lockscreen_chevron_up.png b/core/res/res/drawable-hdpi/ic_lockscreen_chevron_up.png Binary files differdeleted file mode 100644 index bb553b1..0000000 --- a/core/res/res/drawable-hdpi/ic_lockscreen_chevron_up.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/ic_lockscreen_chevron_down.png b/core/res/res/drawable-mdpi/ic_lockscreen_chevron_down.png Binary files differdeleted file mode 100644 index 308fe8a..0000000 --- a/core/res/res/drawable-mdpi/ic_lockscreen_chevron_down.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/ic_lockscreen_chevron_left.png b/core/res/res/drawable-mdpi/ic_lockscreen_chevron_left.png Binary files differdeleted file mode 100644 index 9a25634..0000000 --- a/core/res/res/drawable-mdpi/ic_lockscreen_chevron_left.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/ic_lockscreen_chevron_right.png b/core/res/res/drawable-mdpi/ic_lockscreen_chevron_right.png Binary files differdeleted file mode 100644 index 77240d0..0000000 --- a/core/res/res/drawable-mdpi/ic_lockscreen_chevron_right.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/ic_lockscreen_chevron_up.png b/core/res/res/drawable-mdpi/ic_lockscreen_chevron_up.png Binary files differdeleted file mode 100644 index e0b0134..0000000 --- a/core/res/res/drawable-mdpi/ic_lockscreen_chevron_up.png +++ /dev/null diff --git a/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_down.png b/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_down.png Binary files differdeleted file mode 100644 index b8e5733..0000000 --- a/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_down.png +++ /dev/null diff --git a/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_left.png b/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_left.png Binary files differdeleted file mode 100644 index ce5da43..0000000 --- a/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_left.png +++ /dev/null diff --git a/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_right.png b/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_right.png Binary files differdeleted file mode 100644 index c16f143..0000000 --- a/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_right.png +++ /dev/null diff --git a/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_up.png b/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_up.png Binary files differdeleted file mode 100644 index 9bed39a..0000000 --- a/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_up.png +++ /dev/null diff --git a/core/res/res/values-land/arrays.xml b/core/res/res/values-land/arrays.xml index 6db3a50..1cd9e74 100644 --- a/core/res/res/values-land/arrays.xml +++ b/core/res/res/values-land/arrays.xml @@ -69,11 +69,4 @@ <item>@string/description_target_camera</item> </array> - <array name="lockscreen_chevron_drawables"> - <item>@null</item> - <item>@drawable/ic_lockscreen_chevron_up</item> - <item>@null</item> - <item>@null</item> - </array> - </resources> diff --git a/core/res/res/values-sw720dp-land/arrays.xml b/core/res/res/values-sw720dp-land/arrays.xml deleted file mode 100644 index d845875..0000000 --- a/core/res/res/values-sw720dp-land/arrays.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/assets/res/any/colors.xml -** -** Copyright 2012, 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. -*/ ---> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - - <array name="lockscreen_chevron_drawables"> - <item>@drawable/ic_lockscreen_chevron_right</item> - <item>@null</item> - <item>@null</item> - <item>@null</item> - </array> - -</resources> diff --git a/core/res/res/values-sw720dp-port/arrays.xml b/core/res/res/values-sw720dp-port/arrays.xml deleted file mode 100644 index d845875..0000000 --- a/core/res/res/values-sw720dp-port/arrays.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/assets/res/any/colors.xml -** -** Copyright 2012, 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. -*/ ---> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - - <array name="lockscreen_chevron_drawables"> - <item>@drawable/ic_lockscreen_chevron_right</item> - <item>@null</item> - <item>@null</item> - <item>@null</item> - </array> - -</resources> diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml index b425ad7..8615476 100644 --- a/core/res/res/values/arrays.xml +++ b/core/res/res/values/arrays.xml @@ -242,8 +242,6 @@ <item>@drawable/list_divider_holo_dark</item> <item>@drawable/list_divider_holo_light</item> <item>@drawable/list_divider_holo_light</item> - <item>@drawable/ic_lockscreen_chevron_left</item> - <item>@drawable/ic_lockscreen_chevron_right</item> <item>@drawable/ab_transparent_dark_holo</item> <item>@drawable/ab_stacked_transparent_dark_holo</item> <item>@drawable/ab_bottom_transparent_dark_holo</item> @@ -400,11 +398,4 @@ <item>@null</item> </array> - <array name="lockscreen_chevron_drawables"> - <item>@drawable/ic_lockscreen_chevron_right</item> - <item>@null</item> - <item>@null</item> - <item>@null</item> - </array> - </resources> diff --git a/packages/SystemUI/res/drawable/navbar_search_handle.xml b/packages/SystemUI/res/drawable/navbar_search_handle.xml deleted file mode 100644 index e40fa2c..0000000 --- a/packages/SystemUI/res/drawable/navbar_search_handle.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?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_enabled="true" - android:state_active="false" - android:state_focused="false" - android:drawable="@*android:drawable/ic_lockscreen_handle_pressed" /> - - <item - android:state_enabled="true" - android:state_active="true" - android:state_focused="false" - android:drawable="@*android:drawable/ic_lockscreen_handle_pressed" /> - -</selector> diff --git a/packages/SystemUI/res/layout-land/status_bar_search_panel.xml b/packages/SystemUI/res/layout-land/status_bar_search_panel.xml index c8a120d..f56b03b 100644 --- a/packages/SystemUI/res/layout-land/status_bar_search_panel.xml +++ b/packages/SystemUI/res/layout-land/status_bar_search_panel.xml @@ -49,7 +49,6 @@ prvandroid:targetDrawables="@array/navbar_search_targets" prvandroid:targetDescriptions="@array/navbar_search_target_descriptions" prvandroid:directionDescriptions="@array/navbar_search_direction_descriptions" - prvandroid:handleDrawable="@drawable/navbar_search_handle" prvandroid:outerRingDrawable="@drawable/navbar_search_outerring" prvandroid:outerRadius="@dimen/navbar_search_outerring_radius" prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius" diff --git a/packages/SystemUI/res/layout-port/status_bar_search_panel.xml b/packages/SystemUI/res/layout-port/status_bar_search_panel.xml index 1e4bb57..b871bef 100644 --- a/packages/SystemUI/res/layout-port/status_bar_search_panel.xml +++ b/packages/SystemUI/res/layout-port/status_bar_search_panel.xml @@ -49,7 +49,6 @@ prvandroid:targetDrawables="@array/navbar_search_targets" prvandroid:targetDescriptions="@array/navbar_search_target_descriptions" prvandroid:directionDescriptions="@array/navbar_search_direction_descriptions" - prvandroid:handleDrawable="@drawable/navbar_search_handle" prvandroid:outerRingDrawable="@drawable/navbar_search_outerring" prvandroid:outerRadius="@dimen/navbar_search_outerring_radius" prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius" diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_search_panel.xml b/packages/SystemUI/res/layout-sw600dp/status_bar_search_panel.xml index 3b6c52e..1fa67bd 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_search_panel.xml +++ b/packages/SystemUI/res/layout-sw600dp/status_bar_search_panel.xml @@ -35,7 +35,6 @@ prvandroid:targetDrawables="@array/navbar_search_targets" prvandroid:targetDescriptions="@array/navbar_search_target_descriptions" prvandroid:directionDescriptions="@array/navbar_search_direction_descriptions" - prvandroid:handleDrawable="@drawable/navbar_search_handle" prvandroid:outerRingDrawable="@drawable/navbar_search_outerring" prvandroid:outerRadius="@dimen/navbar_search_outerring_radius" prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius" diff --git a/packages/SystemUI/res/layout-sw720dp/status_bar_search_panel.xml b/packages/SystemUI/res/layout-sw720dp/status_bar_search_panel.xml index 8c2360e..b5f1f90 100644 --- a/packages/SystemUI/res/layout-sw720dp/status_bar_search_panel.xml +++ b/packages/SystemUI/res/layout-sw720dp/status_bar_search_panel.xml @@ -36,7 +36,6 @@ prvandroid:targetDrawables="@array/navbar_search_targets" prvandroid:targetDescriptions="@array/navbar_search_target_descriptions" prvandroid:directionDescriptions="@array/navbar_search_direction_descriptions" - prvandroid:handleDrawable="@drawable/navbar_search_handle" prvandroid:outerRingDrawable="@drawable/navbar_search_outerring" prvandroid:outerRadius="@dimen/navbar_search_outerring_radius" prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius" |
