Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Remove SystemUIFactory.getHomeLayoutId()" into nyc-mr1-dev am: 84c074adb2" into nyc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-06-02 22:22:14 +00:00
committed by Android (Google) Code Review
parent 97ae77e41b 2c446e0a64
commit 64a2480f6c
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
View File

@@ -119,13 +119,6 @@ public class SystemUIFactory {
return null; return null;
} }
/**
* @return The id for the home button layout.
*/
public int getHomeLayoutId() {
return R.layout.home;
}
public AssistManager createAssistManager(BaseStatusBar bar, Context context) { public AssistManager createAssistManager(BaseStatusBar bar, Context context) {
return new AssistManager(bar, context); return new AssistManager(bar, context);
} }

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

@@ -221,7 +221,7 @@ public class NavigationBarInflaterView extends FrameLayout implements TunerServi
String button = extractButton(buttonSpec); String button = extractButton(buttonSpec);
View v = null; View v = null;
if (HOME.equals(button)) { if (HOME.equals(button)) {
v = inflater.inflate(SystemUIFactory.getInstance().getHomeLayoutId(), parent, false); v = inflater.inflate(R.layout.home, parent, false);
if (landscape && isSw600Dp()) { if (landscape && isSw600Dp()) {
setupLandButton(v); setupLandButton(v);
} }