Minor cleanup of left overs from GlowPadView integration.
- remove unused "chevron" assets - reduce memory footprint in SystemUI by not loading unused handle drawable. Change-Id: Iad1799d1a8a764c6abb4201520aa47ba84d33c38
@ -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();
|
||||
}
|
||||
|
||||
|
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 740 B |
Before Width: | Height: | Size: 754 B |
Before Width: | Height: | Size: 752 B |
Before Width: | Height: | Size: 748 B |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.3 KiB |
@ -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>
|
||||
|
@ -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>
|
@ -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>
|
@ -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>
|
||||
|
@ -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>
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|