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

Commit 64a2480f authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Remove SystemUIFactory.getHomeLayoutId()" into nyc-mr1-dev am: 84c074ad" into nyc-mr1-dev-plus-aosp
parents 97ae77e4 2c446e0a

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);

            }