Merge "Forgive me monkeys, for I have sinned." into jb-dev (ea3f8cc7) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/view/menu/ListMenuPresenter.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -220,7 +220,6 @@ public class ListMenuPresenter implements MenuPresenter, AdapterView.OnItemClick
		private int mExpandedIndex = -1;

		public MenuAdapter() {
		registerDataSetObserver(new ExpandedIndexObserver());
		findExpandedIndex();
		}

		@@ -273,12 +272,11 @@ public class ListMenuPresenter implements MenuPresenter, AdapterView.OnItemClick
		}
		mExpandedIndex = -1;
		}
		}

		private class ExpandedIndexObserver extends DataSetObserver {
		@Override
		public void onChanged() {
		mAdapter.findExpandedIndex();
		public void notifyDataSetChanged() {
		findExpandedIndex();
		super.notifyDataSetChanged();
		}
		}
		}

+3 −5

Original line number	Diff line number	Diff line
		@@ -307,7 +307,6 @@ public class MenuPopupHelper implements AdapterView.OnItemClickListener, View.On

		public MenuAdapter(MenuBuilder menu) {
		mAdapterMenu = menu;
		registerDataSetObserver(new ExpandedIndexObserver());
		findExpandedIndex();
		}

		@@ -363,12 +362,11 @@ public class MenuPopupHelper implements AdapterView.OnItemClickListener, View.On
		}
		mExpandedIndex = -1;
		}
		}

		private class ExpandedIndexObserver extends DataSetObserver {
		@Override
		public void onChanged() {
		mAdapter.findExpandedIndex();
		public void notifyDataSetChanged() {
		findExpandedIndex();
		super.notifyDataSetChanged();
		}
		}
		}