summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-02-03 18:40:20 -0800
committerAlan Viverette <alanv@google.com>2014-02-03 18:42:24 -0800
commit8eea3ea5591e59f55cbb4f6b2b7e9363a285ced3 (patch)
treea067807fe9c905fda3568db98cb654a520e694f8 /policy
parent8cff1a370e8d89c0a977b82cd8730ab791866808 (diff)
downloadframeworks_base-8eea3ea5591e59f55cbb4f6b2b7e9363a285ced3.zip
frameworks_base-8eea3ea5591e59f55cbb4f6b2b7e9363a285ced3.tar.gz
frameworks_base-8eea3ea5591e59f55cbb4f6b2b7e9363a285ced3.tar.bz2
Add APIs for obtaining themed Drawable from Theme, Context
BUG: 12611005 Change-Id: Ic0057be4e4c2d0c61ce02a019b3f7d0625e3a016
Diffstat (limited to 'policy')
-rw-r--r--policy/src/com/android/internal/policy/impl/GlobalActions.java4
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindow.java10
2 files changed, 7 insertions, 7 deletions
diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java
index 7c0735b..f82ca22 100644
--- a/policy/src/com/android/internal/policy/impl/GlobalActions.java
+++ b/policy/src/com/android/internal/policy/impl/GlobalActions.java
@@ -591,7 +591,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
icon.setImageDrawable(mIcon);
icon.setScaleType(ScaleType.CENTER_CROP);
} else if (mIconResId != 0) {
- icon.setImageDrawable(context.getResources().getDrawable(mIconResId));
+ icon.setImageDrawable(context.getDrawable(mIconResId));
}
if (mMessage != null) {
messageView.setText(mMessage);
@@ -681,7 +681,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
boolean on = ((mState == State.On) || (mState == State.TurningOn));
if (icon != null) {
- icon.setImageDrawable(context.getResources().getDrawable(
+ icon.setImageDrawable(context.getDrawable(
(on ? mEnabledIconResId : mDisabledIconResid)));
icon.setEnabled(enabled);
}
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index d0abe9c..a0ea53c 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -704,7 +704,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
// Otherwise, set the normal panel background
backgroundResId = st.background;
}
- st.decorView.setWindowBackground(getContext().getResources().getDrawable(
+ st.decorView.setWindowBackground(getContext().getDrawable(
backgroundResId));
ViewParent shownPanelParent = st.shownPanelView.getParent();
@@ -1289,7 +1289,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
if (st.resid != resId) {
st.resid = resId;
st.uri = null;
- st.local = getContext().getResources().getDrawable(resId);
+ st.local = getContext().getDrawable(resId);
updateDrawable(featureId, st, false);
}
} else {
@@ -2305,7 +2305,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
if (mMenuBackground == null && mFeatureId < 0
&& getAttributes().height
== WindowManager.LayoutParams.MATCH_PARENT) {
- mMenuBackground = getContext().getResources().getDrawable(
+ mMenuBackground = getContext().getDrawable(
com.android.internal.R.drawable.menu_background);
}
if (mMenuBackground != null) {
@@ -3122,12 +3122,12 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
if (getContainer() == null) {
Drawable drawable = mBackgroundDrawable;
if (mBackgroundResource != 0) {
- drawable = getContext().getResources().getDrawable(mBackgroundResource);
+ drawable = getContext().getDrawable(mBackgroundResource);
}
mDecor.setWindowBackground(drawable);
drawable = null;
if (mFrameResource != 0) {
- drawable = getContext().getResources().getDrawable(mFrameResource);
+ drawable = getContext().getDrawable(mFrameResource);
}
mDecor.setWindowFrame(drawable);