From 7819a56217fd4e216d3675905586b275799723bb Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Thu, 19 Sep 2013 15:55:45 -0700 Subject: Tweaking page indicators to support add page icon, remembering widget picker page (Bug 10787439) Change-Id: Iab0b5676aa9c34a610b4b968940abc81c913c234 --- src/com/android/launcher3/PageIndicatorMarker.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src/com/android/launcher3/PageIndicatorMarker.java') diff --git a/src/com/android/launcher3/PageIndicatorMarker.java b/src/com/android/launcher3/PageIndicatorMarker.java index 1ad0abb6b..b1025d6fe 100644 --- a/src/com/android/launcher3/PageIndicatorMarker.java +++ b/src/com/android/launcher3/PageIndicatorMarker.java @@ -19,10 +19,12 @@ package com.android.launcher3; import android.animation.AnimatorListenerAdapter; import android.animation.LayoutTransition; import android.content.Context; +import android.content.res.Resources; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageView; import android.widget.FrameLayout; import com.android.launcher3.R; @@ -32,8 +34,8 @@ public class PageIndicatorMarker extends FrameLayout { private static final int MARKER_FADE_DURATION = 175; - private View mActiveMarker; - private View mInactiveMarker; + private ImageView mActiveMarker; + private ImageView mInactiveMarker; private boolean mIsActive = false; public PageIndicatorMarker(Context context) { @@ -49,8 +51,14 @@ public class PageIndicatorMarker extends FrameLayout { } protected void onFinishInflate() { - mActiveMarker = findViewById(R.id.active); - mInactiveMarker = findViewById(R.id.inactive); + mActiveMarker = (ImageView) findViewById(R.id.active); + mInactiveMarker = (ImageView) findViewById(R.id.inactive); + } + + void setMarkerDrawables(int activeResId, int inactiveResId) { + Resources r = getResources(); + mActiveMarker.setImageDrawable(r.getDrawable(activeResId)); + mInactiveMarker.setImageDrawable(r.getDrawable(inactiveResId)); } void activate(boolean immediate) { -- cgit v1.2.3