2 files changed, 10 insertions, 37 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeAssetManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeAssetManager.java
index 43ff424..71803fc 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeAssetManager.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeAssetManager.java
@@ -17,12 +17,9 @@
 package com.android.layoutlib.bridge;
 
 import android.content.res.AssetManager;
-import android.content.res.Configuration;
-
-import java.util.Locale;
 
 public class BridgeAssetManager extends AssetManager {
-    
+
     /**
      * This initializes the static field {@link AssetManager#mSystem} which is used
      * by methods who get a global asset manager using {@link AssetManager#getSystem()}.
@@ -40,7 +37,7 @@ public class BridgeAssetManager extends AssetManager {
         }
         return AssetManager.sSystem;
     }
-    
+
     /**
      * Clears the static {@link AssetManager#sSystem} to make sure we don't leave objects
      * around that would prevent us from unloading the library.
@@ -48,29 +45,7 @@ public class BridgeAssetManager extends AssetManager {
     /*package*/ static void clearSystem() {
         AssetManager.sSystem = null;
     }
-    
+
     private BridgeAssetManager() {
     }
-    
-    /**
-     * Change the configuration used when retrieving resources.  Not for use by applications.
-     */
-    @Override
-    public void setConfiguration(int mcc, int mnc, String locale,
-            int orientation, int touchscreen, int density, int keyboard,
-            int keyboardHidden, int navigation, int screenWidth, int screenHeight,
-            int screenLayout, int uiMode, int version)  {
-        
-        Configuration c = new Configuration();
-        c.mcc = mcc;
-        c.mnc = mnc;
-        c.locale = new Locale(locale);
-        c.touchscreen = touchscreen;
-        c.keyboard = keyboard;
-        c.keyboardHidden = keyboardHidden;
-        c.navigation = navigation;
-        c.orientation = orientation;
-        c.screenLayout = screenLayout;
-        c.uiMode = uiMode;
-    }
 }
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java
index 57b5d4e..73a3986 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java
@@ -66,14 +66,14 @@ import java.util.Map.Entry;
  */
 public final class BridgeContext extends Context {
 
-    private Resources mResources;
-    private Theme mTheme;
-    private HashMap<View, Object> mViewKeyMap = new HashMap<View, Object>();
-    private IStyleResourceValue mThemeValues;
+    private final Resources mResources;
+    private final Theme mTheme;
+    private final HashMap<View, Object> mViewKeyMap = new HashMap<View, Object>();
+    private final IStyleResourceValue mThemeValues;
     private final Object mProjectKey;
-    private Map<String, Map<String, IResourceValue>> mProjectResources;
-    private Map<String, Map<String, IResourceValue>> mFrameworkResources;
-    private Map<IStyleResourceValue, IStyleResourceValue> mStyleInheritanceMap;
+    private final Map<String, Map<String, IResourceValue>> mProjectResources;
+    private final Map<String, Map<String, IResourceValue>> mFrameworkResources;
+    private final Map<IStyleResourceValue, IStyleResourceValue> mStyleInheritanceMap;
 
     // maps for dynamically generated id representing style objects (IStyleResourceValue)
     private Map<Integer, IStyleResourceValue> mDynamicIdToStyleMap;
@@ -927,7 +927,6 @@ public final class BridgeContext extends Context {
         return null;
     }
 
-    @Override
     public File getExternalCacheDir() {
         // TODO Auto-generated method stub
         return null;
@@ -965,7 +964,6 @@ public final class BridgeContext extends Context {
         return null;
     }
 
-    @Override
     public File getExternalFilesDir(String type) {
         // TODO Auto-generated method stub
         return null;