Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a7124cdd: Merge "Cleanup ContextThemeWrapper"

Browse Source 
* commit 'a7124cdd83723027f5880fa96f0c285a7615f3fa':
  Cleanup ContextThemeWrapper
This commit is contained in:
Fabrice Di Meglio
2014-03-12 13:07:34 -07:00
committed by Android Git Automerger
parent d35c96f98c a7124cdd83
commit 7211da3401
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/view/ContextThemeWrapper.java
View File

@@ -26,7 +26,6 @@ import android.content.res.Resources;
* wrapped context.
*/
public class ContextThemeWrapper extends ContextWrapper {
private Context mBase;
private int mThemeResource;
private Resources.Theme mTheme;
private LayoutInflater mInflater;
@@ -39,13 +38,11 @@ public class ContextThemeWrapper extends ContextWrapper {
public ContextThemeWrapper(Context base, int themeres) {
super(base);
mBase = base;
mThemeResource = themeres;
}
@Override protected void attachBaseContext(Context newBase) {
super.attachBaseContext(newBase);
mBase = newBase;
}
/**
@@ -109,11 +106,11 @@ public class ContextThemeWrapper extends ContextWrapper {
@Override public Object getSystemService(String name) {
if (LAYOUT_INFLATER_SERVICE.equals(name)) {
if (mInflater == null) {
mInflater = LayoutInflater.from(mBase).cloneInContext(this);
mInflater = LayoutInflater.from(getBaseContext()).cloneInContext(this);
}
return mInflater;
}
return mBase.getSystemService(name);
return getBaseContext().getSystemService(name);
}
/**
@@ -135,7 +132,7 @@ public class ContextThemeWrapper extends ContextWrapper {
final boolean first = mTheme == null;
if (first) {
mTheme = getResources().newTheme();
Resources.Theme theme = mBase.getTheme();
Resources.Theme theme = getBaseContext().getTheme();
if (theme != null) {
mTheme.setTo(theme);
}