commit b6ab24f4d024720624e4c7e7adcc1d70fb4dc4e6
author Annie Chin <afchin@google.com> Wed Jun 01 17:46:27 2016 -0700
committer Annie Chin <afchin@google.com> Thu Jun 02 12:18:38 2016 -0700
tree b5085a747c5662dac71cdcddbf88a22a5a755b39
parent a5e81480b16e8cbf5a3c4f015b667893defb1456

Remove SystemUIFactory.getHomeLayoutId()

Bug: 29069470

Change-Id: I19078f293c85470caac8d372d80a7a8605842c61

packages/SystemUI/src/com/android/systemui/SystemUIFactory.java

diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
index 5a0c94f..9a36aca 100644
--- a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
+++ b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
@@ -119,13 +119,6 @@
         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);
     }

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java

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 b431820..dd46b08 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 @@
         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);
             }