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

Merge "GuidedStep example: Use standard action IDs and titles" into mnc-ub-dev

Browse Source
This commit is contained in:
Dake Gu
2015-10-28 21:14:25 +00:00
committed by Android (Google) Code Review
parent d4035382f2 37836fd9d7
commit bea9cef302
2 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,6 @@ import java.util.List;
*/ */
public class GuidedStepActivity extends Activity { public class GuidedStepActivity extends Activity {
private static final int CONTINUE = 1;
private static final int BACK = 2; private static final int BACK = 2;
private static final int FIRST_NAME = 3; private static final int FIRST_NAME = 3;
@@ -163,16 +162,20 @@ public class GuidedStepActivity extends Activity {
@Override @Override
public void onCreateActions(List<GuidedAction> actions, Bundle savedInstanceState) { public void onCreateActions(List<GuidedAction> actions, Bundle savedInstanceState) {
addAction(actions, CONTINUE, "Continue", "Let's do it"); actions.add(new GuidedAction.Builder().constructContinue(getActivity())
addAction(actions, BACK, "Cancel", "Nevermind"); .description("Let's do it")
.build());
actions.add(new GuidedAction.Builder().constructCancel(getActivity())
.description("Never mind")
.build());
} }
@Override @Override
public void onGuidedActionClicked(GuidedAction action) { public void onGuidedActionClicked(GuidedAction action) {
FragmentManager fm = getFragmentManager(); FragmentManager fm = getFragmentManager();
if (action.getId() == CONTINUE) { if (action.getId() == GuidedAction.ACTION_ID_CONTINUE) {
GuidedStepFragment.add(fm, new SecondStepFragment(), android.R.id.content); GuidedStepFragment.add(fm, new SecondStepFragment(), android.R.id.content);
} else { } else if (action.getId() == GuidedAction.ACTION_ID_CANCEL){
finishGuidedStepFragments(); finishGuidedStepFragments();
} }
} }
@@ -202,13 +205,15 @@ public class GuidedStepActivity extends Activity {
"Input credit card number", "Input credit card number"); "Input credit card number", "Input credit card number");
addEditableDescriptionAction(actions, PASSWORD, "Password", "", "", addEditableDescriptionAction(actions, PASSWORD, "Password", "", "",
InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD); InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
addAction(actions, CONTINUE, "Continue", "Continue"); actions.add(new GuidedAction.Builder().constructContinue(getActivity())
.description("Continue")
.build());
actions.get(actions.size() - 1).setEnabled(false); actions.get(actions.size() - 1).setEnabled(false);
} }
@Override @Override
public void onGuidedActionClicked(GuidedAction action) { public void onGuidedActionClicked(GuidedAction action) {
if (action.getId() == CONTINUE) { if (action.getId() == GuidedAction.ACTION_ID_CONTINUE) {
FragmentManager fm = getFragmentManager(); FragmentManager fm = getFragmentManager();
GuidedStepFragment.add(fm, new ThirdStepFragment()); GuidedStepFragment.add(fm, new ThirdStepFragment());
} }
@@ -259,8 +264,8 @@ public class GuidedStepActivity extends Activity {
} }
void updateContinue(boolean enabled) { void updateContinue(boolean enabled) {
findActionById(CONTINUE).setEnabled(enabled); findActionById(GuidedAction.ACTION_ID_CONTINUE).setEnabled(enabled);
notifyActionChanged(findActionPositionById(CONTINUE)); notifyActionChanged(findActionPositionById(GuidedAction.ACTION_ID_CONTINUE));
} }
} }
@@ -305,12 +310,13 @@ public class GuidedStepActivity extends Activity {
actions.get(actions.size() -1).setChecked(true); actions.get(actions.size() -1).setChecked(true);
} }
} }
addAction(actions, CONTINUE, "Continue", ""); actions.add(new GuidedAction.Builder().constructContinue(getActivity())
.build());
} }
@Override @Override
public void onGuidedActionClicked(GuidedAction action) { public void onGuidedActionClicked(GuidedAction action) {
if (action.getId() == CONTINUE) { if (action.getId() == GuidedAction.ACTION_ID_CONTINUE) {
FragmentManager fm = getFragmentManager(); FragmentManager fm = getFragmentManager();
FourthStepFragment f = new FourthStepFragment(); FourthStepFragment f = new FourthStepFragment();
Bundle arguments = new Bundle(); Bundle arguments = new Bundle();
@@ -347,15 +353,17 @@ public class GuidedStepActivity extends Activity {
@Override @Override
public void onCreateActions(List<GuidedAction> actions, Bundle savedInstanceState) { public void onCreateActions(List<GuidedAction> actions, Bundle savedInstanceState) {
addAction(actions, CONTINUE, "Done", "All finished"); actions.add(new GuidedAction.Builder().constructFinish(getActivity())
.description("All Done...")
.build());
addAction(actions, BACK, "Start Over", "Let's try this again..."); addAction(actions, BACK, "Start Over", "Let's try this again...");
} }
@Override @Override
public void onGuidedActionClicked(GuidedAction action) { public void onGuidedActionClicked(GuidedAction action) {
if (action.getId() == CONTINUE) { if (action.getId() == GuidedAction.ACTION_ID_FINISH) {
finishGuidedStepFragments(); finishGuidedStepFragments();
} else { } else if (action.getId() == BACK) {
// pop 4, 3, 2 // pop 4, 3, 2
popBackStackToGuidedStepFragment(SecondStepFragment.class, popBackStackToGuidedStepFragment(SecondStepFragment.class,
FragmentManager.POP_BACK_STACK_INCLUSIVE); FragmentManager.POP_BACK_STACK_INCLUSIVE);

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

@@ -42,7 +42,6 @@ import java.util.List;
*/ */
public class GuidedStepSupportActivity extends FragmentActivity { public class GuidedStepSupportActivity extends FragmentActivity {
private static final int CONTINUE = 1;
private static final int BACK = 2; private static final int BACK = 2;
private static final int FIRST_NAME = 3; private static final int FIRST_NAME = 3;
@@ -165,16 +164,20 @@ public class GuidedStepSupportActivity extends FragmentActivity {
@Override @Override
public void onCreateActions(List<GuidedAction> actions, Bundle savedInstanceState) { public void onCreateActions(List<GuidedAction> actions, Bundle savedInstanceState) {
addAction(actions, CONTINUE, "Continue", "Let's do it"); actions.add(new GuidedAction.Builder().constructContinue(getActivity())
addAction(actions, BACK, "Cancel", "Nevermind"); .description("Let's do it")
.build());
actions.add(new GuidedAction.Builder().constructCancel(getActivity())
.description("Never mind")
.build());
} }
@Override @Override
public void onGuidedActionClicked(GuidedAction action) { public void onGuidedActionClicked(GuidedAction action) {
FragmentManager fm = getFragmentManager(); FragmentManager fm = getFragmentManager();
if (action.getId() == CONTINUE) { if (action.getId() == GuidedAction.ACTION_ID_CONTINUE) {
GuidedStepSupportFragment.add(fm, new SecondStepFragment(), android.R.id.content); GuidedStepSupportFragment.add(fm, new SecondStepFragment(), android.R.id.content);
} else { } else if (action.getId() == GuidedAction.ACTION_ID_CANCEL){
finishGuidedStepSupportFragments(); finishGuidedStepSupportFragments();
} }
} }
@@ -204,13 +207,15 @@ public class GuidedStepSupportActivity extends FragmentActivity {
"Input credit card number", "Input credit card number"); "Input credit card number", "Input credit card number");
addEditableDescriptionAction(actions, PASSWORD, "Password", "", "", addEditableDescriptionAction(actions, PASSWORD, "Password", "", "",
InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD); InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
addAction(actions, CONTINUE, "Continue", "Continue"); actions.add(new GuidedAction.Builder().constructContinue(getActivity())
.description("Continue")
.build());
actions.get(actions.size() - 1).setEnabled(false); actions.get(actions.size() - 1).setEnabled(false);
} }
@Override @Override
public void onGuidedActionClicked(GuidedAction action) { public void onGuidedActionClicked(GuidedAction action) {
if (action.getId() == CONTINUE) { if (action.getId() == GuidedAction.ACTION_ID_CONTINUE) {
FragmentManager fm = getFragmentManager(); FragmentManager fm = getFragmentManager();
GuidedStepSupportFragment.add(fm, new ThirdStepFragment()); GuidedStepSupportFragment.add(fm, new ThirdStepFragment());
} }
@@ -261,8 +266,8 @@ public class GuidedStepSupportActivity extends FragmentActivity {
} }
void updateContinue(boolean enabled) { void updateContinue(boolean enabled) {
findActionById(CONTINUE).setEnabled(enabled); findActionById(GuidedAction.ACTION_ID_CONTINUE).setEnabled(enabled);
notifyActionChanged(findActionPositionById(CONTINUE)); notifyActionChanged(findActionPositionById(GuidedAction.ACTION_ID_CONTINUE));
} }
} }
@@ -307,12 +312,13 @@ public class GuidedStepSupportActivity extends FragmentActivity {
actions.get(actions.size() -1).setChecked(true); actions.get(actions.size() -1).setChecked(true);
} }
} }
addAction(actions, CONTINUE, "Continue", ""); actions.add(new GuidedAction.Builder().constructContinue(getActivity())
.build());
} }
@Override @Override
public void onGuidedActionClicked(GuidedAction action) { public void onGuidedActionClicked(GuidedAction action) {
if (action.getId() == CONTINUE) { if (action.getId() == GuidedAction.ACTION_ID_CONTINUE) {
FragmentManager fm = getFragmentManager(); FragmentManager fm = getFragmentManager();
FourthStepFragment f = new FourthStepFragment(); FourthStepFragment f = new FourthStepFragment();
Bundle arguments = new Bundle(); Bundle arguments = new Bundle();
@@ -349,15 +355,17 @@ public class GuidedStepSupportActivity extends FragmentActivity {
@Override @Override
public void onCreateActions(List<GuidedAction> actions, Bundle savedInstanceState) { public void onCreateActions(List<GuidedAction> actions, Bundle savedInstanceState) {
addAction(actions, CONTINUE, "Done", "All finished"); actions.add(new GuidedAction.Builder().constructFinish(getActivity())
.description("All Done...")
.build());
addAction(actions, BACK, "Start Over", "Let's try this again..."); addAction(actions, BACK, "Start Over", "Let's try this again...");
} }
@Override @Override
public void onGuidedActionClicked(GuidedAction action) { public void onGuidedActionClicked(GuidedAction action) {
if (action.getId() == CONTINUE) { if (action.getId() == GuidedAction.ACTION_ID_FINISH) {
finishGuidedStepSupportFragments(); finishGuidedStepSupportFragments();
} else { } else if (action.getId() == BACK) {
// pop 4, 3, 2 // pop 4, 3, 2
popBackStackToGuidedStepSupportFragment(SecondStepFragment.class, popBackStackToGuidedStepSupportFragment(SecondStepFragment.class,
FragmentManager.POP_BACK_STACK_INCLUSIVE); FragmentManager.POP_BACK_STACK_INCLUSIVE);