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

Merge "Fix UiBench MainActivity fragment" into nyc-mr1-dev

Browse Source
This commit is contained in:
Chris Craik
2016-07-09 00:31:58 +00:00
committed by Android (Google) Code Review
parent 3e869587e8 2759f9333d
commit 8b31db3621
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/UiBench/src/com/android/test/uibench/MainActivity.java
View File

@@ -38,6 +38,23 @@ public class MainActivity extends AppCompatActivity {
private static final String EXTRA_PATH = "activity_path"; private static final String EXTRA_PATH = "activity_path";
private static final String CATEGORY_HWUI_TEST = "com.android.test.uibench.TEST"; private static final String CATEGORY_HWUI_TEST = "com.android.test.uibench.TEST";
public static class TestListFragment extends ListFragment {
@Override
@SuppressWarnings("unchecked")
public void onListItemClick(ListView l, View v, int position, long id) {
Map<String, Object> map = (Map<String, Object>)l.getItemAtPosition(position);
Intent intent = (Intent) map.get("intent");
startActivity(intent);
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
getListView().setTextFilterEnabled(true);
}
}
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@@ -54,22 +71,7 @@ public class MainActivity extends AppCompatActivity {
FragmentManager fm = getSupportFragmentManager(); FragmentManager fm = getSupportFragmentManager();
if (fm.findFragmentById(android.R.id.content) == null) { if (fm.findFragmentById(android.R.id.content) == null) {
ListFragment listFragment = new ListFragment() { ListFragment listFragment = new TestListFragment();
@Override
@SuppressWarnings("unchecked")
public void onListItemClick(ListView l, View v, int position, long id) {
Map<String, Object> map = (Map<String, Object>)l.getItemAtPosition(position);
Intent intent = (Intent) map.get("intent");
startActivity(intent);
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
getListView().setTextFilterEnabled(true);
}
};
listFragment.setListAdapter(new SimpleAdapter(this, getData(path), listFragment.setListAdapter(new SimpleAdapter(this, getData(path),
android.R.layout.simple_list_item_1, new String[] { "title" }, android.R.layout.simple_list_item_1, new String[] { "title" },
new int[] { android.R.id.text1 })); new int[] { android.R.id.text1 }));