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

Merge "Add setLandscape() method to ButtonInterface" into nyc-mr1-dev

Browse Source
This commit is contained in:
Annie Chin
2016-07-13 23:35:08 +00:00
committed by Android (Google) Code Review
parent 30c4050703 6fc4600d6e
commit 3372c90cd7
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,6 +49,13 @@ public class ButtonDispatcher {
mViews.clear(); mViews.clear();
} }
void addView(View view, boolean landscape) {
addView(view);
if (view instanceof ButtonInterface) {
((ButtonInterface) view).setLandscape(landscape);
}
}
void addView(View view) { void addView(View view) {
mViews.add(view); mViews.add(view);
view.setOnClickListener(mClickListener); view.setOnClickListener(mClickListener);
@@ -178,5 +185,7 @@ public class ButtonDispatcher {
void setImageDrawable(@Nullable Drawable drawable); void setImageDrawable(@Nullable Drawable drawable);
void abortCurrentGesture(); void abortCurrentGesture();
void setLandscape(boolean landscape);
} }
} }

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

@@ -280,7 +280,7 @@ public class NavigationBarInflaterView extends FrameLayout implements TunerServi
params.width = (int) (params.width * size); params.width = (int) (params.width * size);
} }
parent.addView(v); parent.addView(v);
addToDispatchers(v); addToDispatchers(v, landscape);
View lastView = landscape ? mLastRot90 : mLastRot0; View lastView = landscape ? mLastRot90 : mLastRot0;
if (lastView != null) { if (lastView != null) {
v.setAccessibilityTraversalAfter(lastView.getId()); v.setAccessibilityTraversalAfter(lastView.getId());
@@ -327,16 +327,16 @@ public class NavigationBarInflaterView extends FrameLayout implements TunerServi
return buttonSpec.substring(0, buttonSpec.indexOf(SIZE_MOD_START)); return buttonSpec.substring(0, buttonSpec.indexOf(SIZE_MOD_START));
} }
private void addToDispatchers(View v) { private void addToDispatchers(View v, boolean landscape) {
if (mButtonDispatchers != null) { if (mButtonDispatchers != null) {
final int indexOfKey = mButtonDispatchers.indexOfKey(v.getId()); final int indexOfKey = mButtonDispatchers.indexOfKey(v.getId());
if (indexOfKey >= 0) { if (indexOfKey >= 0) {
mButtonDispatchers.valueAt(indexOfKey).addView(v); mButtonDispatchers.valueAt(indexOfKey).addView(v, landscape);
} else if (v instanceof ViewGroup) { } else if (v instanceof ViewGroup) {
final ViewGroup viewGroup = (ViewGroup)v; final ViewGroup viewGroup = (ViewGroup)v;
final int N = viewGroup.getChildCount(); final int N = viewGroup.getChildCount();
for (int i = 0; i < N; i++) { for (int i = 0; i < N; i++) {
addToDispatchers(viewGroup.getChildAt(i)); addToDispatchers(viewGroup.getChildAt(i), landscape);
} }
} }
} }

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

@@ -265,6 +265,11 @@ public class KeyButtonView extends ImageView implements ButtonDispatcher.ButtonI
public void setImageDrawable(@Nullable Drawable drawable) { public void setImageDrawable(@Nullable Drawable drawable) {
super.setImageDrawable(drawable); super.setImageDrawable(drawable);
} }
@Override
public void setLandscape(boolean landscape) {
//no op
}
} }