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

Merge "Fix issue where home layout click listener was being attached before it was initialized."

Browse Source
This commit is contained in:
Ben Komalo
2010-11-03 12:18:40 -07:00
committed by Android (Google) Code Review
parent 01f706260b ad199ecc44
commit 53eb6af2ac
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/java/com/android/internal/widget/ActionBarView.java
View File

@@ -123,8 +123,6 @@ public class ActionBarView extends ViewGroup {
}
};
private OnClickListener mHomeClickListener = null;
private OnClickListener mTabClickListener = null;
public ActionBarView(Context context, AttributeSet attrs) {
@@ -169,9 +167,6 @@ public class ActionBarView extends ViewGroup {
mHomeLayout = new LinearLayout(context, null,
com.android.internal.R.attr.actionButtonStyle);
mHomeLayout.setClickable(true);
mHomeLayout.setFocusable(true);
mHomeLayout.setOnClickListener(mHomeClickListener);
mHomeLayout.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT,
LayoutParams.MATCH_PARENT));
@@ -207,18 +202,18 @@ public class ActionBarView extends ViewGroup {
a.recycle();
if (mLogo != null || mIcon != null || mTitle != null) {
mLogoNavItem = new ActionMenuItem(context, 0, android.R.id.home, 0, 0, mTitle);
mHomeClickListener = new OnClickListener() {
public void onClick(View v) {
Context context = getContext();
if (context instanceof Activity) {
Activity activity = (Activity) context;
activity.onOptionsItemSelected(mLogoNavItem);
}
}
};
}
mLogoNavItem = new ActionMenuItem(context, 0, android.R.id.home, 0, 0, mTitle);
mHomeLayout.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
Context context = getContext();
if (context instanceof Activity) {
Activity activity = (Activity) context;
activity.onOptionsItemSelected(mLogoNavItem);
}
}
});
mHomeLayout.setClickable(true);
mHomeLayout.setFocusable(true);
}
@Override