From 49ce36e1754243eedc124b4f7e68af1b458c821c Mon Sep 17 00:00:00 2001 From: Deepanshu Gupta Date: Tue, 14 Apr 2015 15:17:07 -0700 Subject: [PATCH] Remove implementation of deprecated method. BridgeResources.getDrawable(int) is not needed anymore, since the super method is deprecated and it calls the alternative getDrawable(int, Theme), which we override. Change-Id: I00c0bfaef6c4167a787bb74990b91cebb951c847 --- .../bridge/src/android/content/res/BridgeResources.java | 5 ----- .../com/android/layoutlib/bridge/impl/RenderSessionImpl.java | 5 +++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/tools/layoutlib/bridge/src/android/content/res/BridgeResources.java b/tools/layoutlib/bridge/src/android/content/res/BridgeResources.java index 96ca25059afa4..a744345fb9092 100644 --- a/tools/layoutlib/bridge/src/android/content/res/BridgeResources.java +++ b/tools/layoutlib/bridge/src/android/content/res/BridgeResources.java @@ -153,11 +153,6 @@ public final class BridgeResources extends Resources { return null; } - @Override - public Drawable getDrawable(int id) throws NotFoundException { - return getDrawable(id, null); - } - @Override public Drawable getDrawable(int id, Theme theme) { Pair value = getResourceValue(id, mPlatformResourceFlag); diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java index fc4f9f15d6dce..ff67f65cc8eb6 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java @@ -1406,8 +1406,9 @@ public class RenderSessionImpl extends RenderAction { if (count == 0) { // Create a dummy child to get a single tab - TabSpec spec = tabHost.newTabSpec("tag").setIndicator("Tab Label", - tabHost.getResources().getDrawable(android.R.drawable.ic_menu_info_details)) + TabSpec spec = tabHost.newTabSpec("tag") + .setIndicator("Tab Label", tabHost.getResources() + .getDrawable(android.R.drawable.ic_menu_info_details, null)) .setContent(new TabHost.TabContentFactory() { @Override public View createTabContent(String tag) {