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

Merge "Merge "Remove ButtonInterface.setCarMode()" into oc-mr1-dev am: 3512953d27" into oc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-08-15 21:35:20 +00:00
committed by Android (Google) Code Review
parent cbf317b731 0ed85ddc73
commit e22c929e85
4 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/plugin/src/com/android/systemui/plugins/statusbar/phone/NavBarButtonProvider.java
View File

@@ -27,7 +27,7 @@ public interface NavBarButtonProvider extends Plugin {
public static final String ACTION = "com.android.systemui.action.PLUGIN_NAV_BUTTON";
public static final int VERSION = 2;
public static final int VERSION = 3;
/**
* Returns a view in the nav bar. If the id is set "back", "home", "recent_apps", "menu",
@@ -46,8 +46,6 @@ public interface NavBarButtonProvider extends Plugin {
void setVertical(boolean vertical);
void setCarMode(boolean carMode);
void setDarkIntensity(float intensity);
}
}

10
packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java
View File

@@ -174,16 +174,6 @@ public class ButtonDispatcher {
mCurrentView = currentView.findViewById(mId);
}
public void setCarMode(boolean carMode) {
final int N = mViews.size();
for (int i = 0; i < N; i++) {
final View view = mViews.get(i);
if (view instanceof ButtonInterface) {
((ButtonInterface) view).setCarMode(carMode);
}
}
}
public void setVertical(boolean vertical) {
mVertical = vertical;
final int N = mViews.size();

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

@@ -683,8 +683,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
if (isCarMode != mInCarMode) {
mInCarMode = isCarMode;
getHomeButton().setCarMode(isCarMode);
if (ALTERNATE_CAR_MODE_UI) {
mUseCarModeUi = isCarMode;
uiCarModeChanged = true;

5
packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
View File

@@ -304,11 +304,6 @@ public class KeyButtonView extends ImageView implements ButtonInterface {
public void setVertical(boolean vertical) {
//no op
}
@Override
public void setCarMode(boolean carMode) {
// no op
}
}