LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Context.getDrawable() crash on earlier platforms

Browse Source 
Change-Id: I821577795f17e48e6fe58208861be501e9ee4627
This commit is contained in:
Dake Gu
2015-12-02 13:07:32 -08:00
parent d245e0fc5d
commit 9ad497c285
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepActivity.java
View File

@@ -51,7 +51,6 @@ public class GuidedStepActivity extends Activity {
private static final int PASSWORD = 5;
private static final int PAYMENT = 6;
private static final int NEW_PAYMENT = 7;
private static final int CREDIT_CARD = 8;
private static final int OPTION_CHECK_SET_ID = 10;
private static final int DEFAULT_OPTION = 0;
@@ -170,7 +169,7 @@ public class GuidedStepActivity extends Activity {
String title = getString(R.string.guidedstep_first_title);
String breadcrumb = getString(R.string.guidedstep_first_breadcrumb);
String description = getString(R.string.guidedstep_first_description);
Drawable icon = getActivity().getDrawable(R.drawable.ic_main_icon);
Drawable icon = getActivity().getResources().getDrawable(R.drawable.ic_main_icon);
return new Guidance(title, description, breadcrumb, icon);
}
@@ -210,7 +209,7 @@ public class GuidedStepActivity extends Activity {
String title = getString(R.string.guidedstep_newpayment_title);
String breadcrumb = getString(R.string.guidedstep_newpayment_breadcrumb);
String description = getString(R.string.guidedstep_newpayment_description);
Drawable icon = getActivity().getDrawable(R.drawable.ic_main_icon);
Drawable icon = getActivity().getResources().getDrawable(R.drawable.ic_main_icon);
return new Guidance(title, description, breadcrumb, icon);
}
@@ -295,7 +294,7 @@ public class GuidedStepActivity extends Activity {
String title = getString(R.string.guidedstep_second_title);
String breadcrumb = getString(R.string.guidedstep_second_breadcrumb);
String description = getString(R.string.guidedstep_second_description);
Drawable icon = getActivity().getDrawable(R.drawable.ic_main_icon);
Drawable icon = getActivity().getResources().getDrawable(R.drawable.ic_main_icon);
return new Guidance(title, description, breadcrumb, icon);
}
@@ -368,6 +367,7 @@ public class GuidedStepActivity extends Activity {
@Override
public void onResume() {
super.onResume();
// when resumed, update sub actions list and selected index from data model.
GuidedAction payments = findActionById(PAYMENT);
payments.getSubActions().clear();
for (int i = 0; i < sCards.size(); i++) {
@@ -411,7 +411,7 @@ public class GuidedStepActivity extends Activity {
String title = getString(R.string.guidedstep_third_title);
String breadcrumb = getString(R.string.guidedstep_third_breadcrumb);
String description = getString(R.string.guidedstep_third_description);
Drawable icon = getActivity().getDrawable(R.drawable.ic_main_icon);
Drawable icon = getActivity().getResources().getDrawable(R.drawable.ic_main_icon);
return new Guidance(title, description, breadcrumb, icon);
}
@@ -489,7 +489,7 @@ public class GuidedStepActivity extends Activity {
String title = getString(R.string.guidedstep_fourth_title);
String breadcrumb = getString(R.string.guidedstep_fourth_breadcrumb);
String description = "You chose: " + OPTION_NAMES[getOption()];
Drawable icon = getActivity().getDrawable(R.drawable.ic_main_icon);
Drawable icon = getActivity().getResources().getDrawable(R.drawable.ic_main_icon);
return new Guidance(title, description, breadcrumb, icon);
}

12
samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepSupportActivity.java
View File

@@ -53,7 +53,6 @@ public class GuidedStepSupportActivity extends FragmentActivity {
private static final int PASSWORD = 5;
private static final int PAYMENT = 6;
private static final int NEW_PAYMENT = 7;
private static final int CREDIT_CARD = 8;
private static final int OPTION_CHECK_SET_ID = 10;
private static final int DEFAULT_OPTION = 0;
@@ -172,7 +171,7 @@ public class GuidedStepSupportActivity extends FragmentActivity {
String title = getString(R.string.guidedstep_first_title);
String breadcrumb = getString(R.string.guidedstep_first_breadcrumb);
String description = getString(R.string.guidedstep_first_description);
Drawable icon = getActivity().getDrawable(R.drawable.ic_main_icon);
Drawable icon = getActivity().getResources().getDrawable(R.drawable.ic_main_icon);
return new Guidance(title, description, breadcrumb, icon);
}
@@ -212,7 +211,7 @@ public class GuidedStepSupportActivity extends FragmentActivity {
String title = getString(R.string.guidedstep_newpayment_title);
String breadcrumb = getString(R.string.guidedstep_newpayment_breadcrumb);
String description = getString(R.string.guidedstep_newpayment_description);
Drawable icon = getActivity().getDrawable(R.drawable.ic_main_icon);
Drawable icon = getActivity().getResources().getDrawable(R.drawable.ic_main_icon);
return new Guidance(title, description, breadcrumb, icon);
}
@@ -297,7 +296,7 @@ public class GuidedStepSupportActivity extends FragmentActivity {
String title = getString(R.string.guidedstep_second_title);
String breadcrumb = getString(R.string.guidedstep_second_breadcrumb);
String description = getString(R.string.guidedstep_second_description);
Drawable icon = getActivity().getDrawable(R.drawable.ic_main_icon);
Drawable icon = getActivity().getResources().getDrawable(R.drawable.ic_main_icon);
return new Guidance(title, description, breadcrumb, icon);
}
@@ -370,6 +369,7 @@ public class GuidedStepSupportActivity extends FragmentActivity {
@Override
public void onResume() {
super.onResume();
// when resumed, update sub actions list and selected index from data model.
GuidedAction payments = findActionById(PAYMENT);
payments.getSubActions().clear();
for (int i = 0; i < sCards.size(); i++) {
@@ -413,7 +413,7 @@ public class GuidedStepSupportActivity extends FragmentActivity {
String title = getString(R.string.guidedstep_third_title);
String breadcrumb = getString(R.string.guidedstep_third_breadcrumb);
String description = getString(R.string.guidedstep_third_description);
Drawable icon = getActivity().getDrawable(R.drawable.ic_main_icon);
Drawable icon = getActivity().getResources().getDrawable(R.drawable.ic_main_icon);
return new Guidance(title, description, breadcrumb, icon);
}
@@ -491,7 +491,7 @@ public class GuidedStepSupportActivity extends FragmentActivity {
String title = getString(R.string.guidedstep_fourth_title);
String breadcrumb = getString(R.string.guidedstep_fourth_breadcrumb);
String description = "You chose: " + OPTION_NAMES[getOption()];
Drawable icon = getActivity().getDrawable(R.drawable.ic_main_icon);
Drawable icon = getActivity().getResources().getDrawable(R.drawable.ic_main_icon);
return new Guidance(title, description, breadcrumb, icon);
}

2
samples/SupportLeanbackDemos/src/com/example/android/leanback/MainActivity.java
View File

@@ -50,7 +50,7 @@ public class MainActivity extends Activity {
String title = getString(R.string.main_title);
String breadcrumb = getString(R.string.main_breadcrumb);
String description = "";
Drawable icon = getActivity().getDrawable(R.drawable.ic_main_icon);
Drawable icon = getActivity().getResources().getDrawable(R.drawable.ic_main_icon);
return new Guidance(title, description, breadcrumb, icon);
}