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

Merge "SystemUI optimization - rely on inheritance for layout direction"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2013-02-20 23:17:56 +00:00
committed by Android (Google) Code Review
parent c49f47220a b5fe52b389
commit 50c291b653
4 changed files with 0 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/widget/SizeAdaptiveLayout.java
View File

@@ -121,12 +121,6 @@ public class SizeAdaptiveLayout extends ViewGroup {
mTransitionAnimation.addListener(mAnimatorListener);
}
@Override
public void setLayoutDirection(int layoutDirection) {
super.setLayoutDirection(layoutDirection);
mModestyPanel.setLayoutDirection(layoutDirection);
}
/**
* Visible for testing
* @hide
@@ -246,7 +240,6 @@ public class SizeAdaptiveLayout extends ViewGroup {
View.MeasureSpec.EXACTLY);
mActiveChild = selectActiveChild(measureSpec);
mActiveChild.setVisibility(View.VISIBLE);
mActiveChild.setLayoutDirection(getLayoutDirection());
if (mLastActive != mActiveChild && mLastActive != null) {
if (DEBUG) Log.d(TAG, this + " changed children from: " + mLastActive +

4
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -462,7 +462,6 @@ public abstract class BaseStatusBar extends SystemUI implements
mSearchPanelView.setOnTouchListener(
new TouchOutsideListener(MSG_CLOSE_SEARCH_PANEL, mSearchPanelView));
mSearchPanelView.setVisibility(View.GONE);
mSearchPanelView.setLayoutDirection(mLayoutDirection);
WindowManager.LayoutParams lp = getSearchLayoutParams(mSearchPanelView.getLayoutParams());
@@ -739,7 +738,6 @@ public abstract class BaseStatusBar extends SystemUI implements
LayoutInflater inflater = (LayoutInflater)mContext.getSystemService(
Context.LAYOUT_INFLATER_SERVICE);
View row = inflater.inflate(R.layout.status_bar_notification_row, parent, false);
row.setLayoutDirection(mLayoutDirection);
// for blaming (see SwipeHelper.setLongPressListener)
row.setTag(sbn.pkg);
@@ -787,7 +785,6 @@ public abstract class BaseStatusBar extends SystemUI implements
params.minHeight = minHeight;
params.maxHeight = minHeight;
adaptive.addView(expandedOneU, params);
expandedOneU.setLayoutDirection(mLayoutDirection);
}
if (expandedLarge != null) {
SizeAdaptiveLayout.LayoutParams params =
@@ -795,7 +792,6 @@ public abstract class BaseStatusBar extends SystemUI implements
params.minHeight = minHeight+1;
params.maxHeight = maxHeight;
adaptive.addView(expandedLarge, params);
expandedLarge.setLayoutDirection(mLayoutDirection);
}
row.setDrawingCacheEnabled(true);

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

@@ -348,7 +348,6 @@ public class PhoneStatusBar extends BaseStatusBar {
}
return mStatusBarWindow.onTouchEvent(event);
}});
mStatusBarWindow.setLayoutDirection(mLayoutDirection);
mStatusBarView = (PhoneStatusBarView) mStatusBarWindow.findViewById(R.id.status_bar);
mStatusBarView.setBar(this);
@@ -380,7 +379,6 @@ public class PhoneStatusBar extends BaseStatusBar {
mIntruderAlertView = (IntruderAlertView) View.inflate(context, R.layout.intruder_alert, null);
mIntruderAlertView.setVisibility(View.GONE);
mIntruderAlertView.setBar(this);
mIntruderAlertView.setLayoutDirection(mLayoutDirection);
}
if (MULTIUSER_DEBUG) {
mNotificationPanelDebugText = (TextView) mNotificationPanel.findViewById(R.id.header_debug_info);
@@ -398,7 +396,6 @@ public class PhoneStatusBar extends BaseStatusBar {
mNavigationBarView.setDisabledFlags(mDisabled);
mNavigationBarView.setBar(this);
mNavigationBarView.setLayoutDirection(mLayoutDirection);
}
} catch (RemoteException ex) {
// no window manager? good luck with that
@@ -963,11 +960,6 @@ public class PhoneStatusBar extends BaseStatusBar {
@Override
protected void refreshLayout(int layoutDirection) {
mStatusBarWindow.setLayoutDirection(layoutDirection);
if (ENABLE_INTRUDERS) {
mIntruderAlertView.setLayoutDirection(layoutDirection);
}
if (mNavigationBarView != null) {
mNavigationBarView.setLayoutDirection(layoutDirection);
}
@@ -1030,7 +1022,6 @@ public class PhoneStatusBar extends BaseStatusBar {
View v = toShow.get(i);
if (v.getParent() == null) {
mPile.addView(v, i);
v.setLayoutDirection(mLayoutDirection);
}
}

11
packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
View File

@@ -247,7 +247,6 @@ public class TabletStatusBar extends BaseStatusBar implements
mNotificationPanel.show(false, false);
mNotificationPanel.setOnTouchListener(
new TouchOutsideListener(MSG_CLOSE_NOTIFICATION_PANEL, mNotificationPanel));
mNotificationPanel.setLayoutDirection(mLayoutDirection);
// the battery icon
mBatteryController.addIconView((ImageView)mNotificationPanel.findViewById(R.id.battery));
@@ -313,7 +312,6 @@ public class TabletStatusBar extends BaseStatusBar implements
mInputMethodsPanel.setOnTouchListener(new TouchOutsideListener(
MSG_CLOSE_INPUT_METHODS_PANEL, mInputMethodsPanel));
mInputMethodsPanel.setImeSwitchButton(mInputMethodSwitchButton);
mInputMethodsPanel.setLayoutDirection(mLayoutDirection);
mStatusBarView.setIgnoreChildren(2, mInputMethodSwitchButton, mInputMethodsPanel);
lp = new WindowManager.LayoutParams(
ViewGroup.LayoutParams.WRAP_CONTENT,
@@ -337,7 +335,6 @@ public class TabletStatusBar extends BaseStatusBar implements
MSG_CLOSE_COMPAT_MODE_PANEL, mCompatModePanel));
mCompatModePanel.setTrigger(mCompatModeButton);
mCompatModePanel.setVisibility(View.GONE);
mCompatModePanel.setLayoutDirection(mLayoutDirection);
mStatusBarView.setIgnoreChildren(3, mCompatModeButton, mCompatModePanel);
lp = new WindowManager.LayoutParams(
250,
@@ -395,13 +392,7 @@ public class TabletStatusBar extends BaseStatusBar implements
@Override
protected void refreshLayout(int layoutDirection) {
mStatusBarView.setLayoutDirection(layoutDirection);
if (mCompatibilityHelpDialog != null) {
mCompatibilityHelpDialog.setLayoutDirection(layoutDirection);
}
mNotificationPanel.refreshLayout(layoutDirection);
mInputMethodsPanel.setLayoutDirection(layoutDirection);
mCompatModePanel.setLayoutDirection(layoutDirection);
}
protected void loadDimens() {
@@ -463,7 +454,6 @@ public class TabletStatusBar extends BaseStatusBar implements
final TabletStatusBarView sb = (TabletStatusBarView)View.inflate(
context, R.layout.system_bar, null);
mStatusBarView = sb;
mStatusBarView.setLayoutDirection(mLayoutDirection);
sb.setHandler(mHandler);
@@ -1134,7 +1124,6 @@ public class TabletStatusBar extends BaseStatusBar implements
}
mCompatibilityHelpDialog = View.inflate(mContext, R.layout.compat_mode_help, null);
mCompatibilityHelpDialog.setLayoutDirection(mLayoutDirection);
View button = mCompatibilityHelpDialog.findViewById(R.id.button);
button.setOnClickListener(new View.OnClickListener() {