Merge "Fix ShadowGrid in UiBench" (86929d22) · Commits · e / os / android_frameworks_base

tests/UiBench/src/com/android/test/uibench/ShadowGridActivity.java

+10 −7

Original line number	Diff line number	Diff line
		@@ -23,13 +23,7 @@ import android.view.View;
		import android.widget.ArrayAdapter;

		public class ShadowGridActivity extends AppCompatActivity {
		@Override
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);

		FragmentManager fm = getSupportFragmentManager();
		if (fm.findFragmentById(android.R.id.content) == null) {
		ListFragment listFragment = new ListFragment() {
		public static class NoDividerListFragment extends ListFragment {
		@Override
		public void onViewCreated(View view, Bundle savedInstanceState) {
		super.onViewCreated(view, savedInstanceState);
		@@ -37,6 +31,15 @@ public class ShadowGridActivity extends AppCompatActivity {
		}
		};


		@Override
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);

		FragmentManager fm = getSupportFragmentManager();
		if (fm.findFragmentById(android.R.id.content) == null) {
		ListFragment listFragment = new NoDividerListFragment();

		listFragment.setListAdapter(new ArrayAdapter<>(this,
		R.layout.card_row, R.id.card_text, TextUtils.buildSimpleStringList()));
		fm.beginTransaction().add(android.R.id.content, listFragment).commit();