Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84c074ad authored by Annie Chin's avatar Annie Chin Committed by Android (Google) Code Review
Browse files

Merge "Remove SystemUIFactory.getHomeLayoutId()" into nyc-mr1-dev

parents 24b41568 b6ab24f4

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

+0 −7
Original line number Diff line number Diff line
@@ -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);

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

            }