summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2013-07-10 19:07:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-07-10 19:07:15 +0000
commit0d21c220ddb1873133c24449404f82c28b19b8b4 (patch)
treef0aeb7c7791a3ccc25684ae2c8ea781a5d7bc1df
parenta582d064868fae4ee2a8d56bab5103430453259d (diff)
parentc39451267bd0c484f7d9a7ae6475533268be6640 (diff)
downloadframeworks_base-0d21c220ddb1873133c24449404f82c28b19b8b4.zip
frameworks_base-0d21c220ddb1873133c24449404f82c28b19b8b4.tar.gz
frameworks_base-0d21c220ddb1873133c24449404f82c28b19b8b4.tar.bz2
Merge "Fix ListMenuItemView regression from patch 8933efd49"
-rw-r--r--core/java/com/android/internal/view/menu/ListMenuItemView.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/core/java/com/android/internal/view/menu/ListMenuItemView.java b/core/java/com/android/internal/view/menu/ListMenuItemView.java
index 464ae2f..35b76dd 100644
--- a/core/java/com/android/internal/view/menu/ListMenuItemView.java
+++ b/core/java/com/android/internal/view/menu/ListMenuItemView.java
@@ -242,17 +242,20 @@ public class ListMenuItemView extends RelativeLayout implements MenuView.ItemVie
private void insertIconView() {
mIconView = (ImageView) getInflater()
- .inflate(com.android.internal.R.layout.list_menu_item_icon, this, true);
+ .inflate(com.android.internal.R.layout.list_menu_item_icon, this, false);
+ addView(mIconView);
}
private void insertRadioButton() {
mRadioButton = (RadioButton) getInflater()
- .inflate(com.android.internal.R.layout.list_menu_item_radio, this, true);
+ .inflate(com.android.internal.R.layout.list_menu_item_radio, this, false);
+ addView(mRadioButton);
}
private void insertCheckBox() {
mCheckBox = (CheckBox) getInflater()
- .inflate(com.android.internal.R.layout.list_menu_item_checkbox, this, true);
+ .inflate(com.android.internal.R.layout.list_menu_item_checkbox, this, false);
+ addView(mCheckBox);
}
private void alignTextToStartOf(View v) {