From b6ab24f4d024720624e4c7e7adcc1d70fb4dc4e6 Mon Sep 17 00:00:00 2001 From: Annie Chin Date: Wed, 1 Jun 2016 17:46:27 -0700 Subject: [PATCH] Remove SystemUIFactory.getHomeLayoutId() Bug: 29069470 Change-Id: I19078f293c85470caac8d372d80a7a8605842c61 --- .../SystemUI/src/com/android/systemui/SystemUIFactory.java | 7 ------- .../statusbar/phone/NavigationBarInflaterView.java | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java index 5a0c94fd9a9d6..9a36aca97d752 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java @@ -119,13 +119,6 @@ public class SystemUIFactory { return null; } - /** - * @return The id for the home button layout. - */ - public int getHomeLayoutId() { - return R.layout.home; - } - public AssistManager createAssistManager(BaseStatusBar bar, Context context) { return new AssistManager(bar, context); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java index b431820e2e8e9..dd46b085e005d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java @@ -221,7 +221,7 @@ public class NavigationBarInflaterView extends FrameLayout implements TunerServi String button = extractButton(buttonSpec); View v = null; if (HOME.equals(button)) { - v = inflater.inflate(SystemUIFactory.getInstance().getHomeLayoutId(), parent, false); + v = inflater.inflate(R.layout.home, parent, false); if (landscape && isSw600Dp()) { setupLandButton(v); }