From 9fa96ad4f6baa5d46aa8bb79f4311b8023d216af Mon Sep 17 00:00:00 2001 From: Dake Gu Date: Wed, 16 Dec 2015 14:47:22 -0800 Subject: [PATCH] Tuning GuidedAction APIs Change-Id: I6d7f354d32315270201d9ab5ccae1c3d5f7b7e0d --- .../android/leanback/GuidedStepActivity.java | 19 +++++++++++++------ .../leanback/GuidedStepSupportActivity.java | 19 +++++++++++++------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepActivity.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepActivity.java index 3b69bb032..cac3e8466 100644 --- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepActivity.java +++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepActivity.java @@ -175,10 +175,13 @@ public class GuidedStepActivity extends Activity { @Override public void onCreateActions(List actions, Bundle savedInstanceState) { - actions.add(new GuidedAction.Builder().constructContinue(getActivity()) + Context context = getActivity(); + actions.add(new GuidedAction.Builder(context) + .clickAction(GuidedAction.ACTION_ID_CONTINUE) .description("Let's do it") .build()); - actions.add(new GuidedAction.Builder().constructCancel(getActivity()) + actions.add(new GuidedAction.Builder(context) + .clickAction(GuidedAction.ACTION_ID_CANCEL) .description("Never mind") .build()); } @@ -222,7 +225,8 @@ public class GuidedStepActivity extends Activity { @Override public void onCreateButtonActions(List actions, Bundle savedInstanceState) { - actions.add(new GuidedAction.Builder().constructOK(getActivity()) + Context context = getActivity(); + actions.add(new GuidedAction.Builder(context).clickAction(GuidedAction.ACTION_ID_OK) .build()); actions.get(actions.size() - 1).setEnabled(false); } @@ -310,7 +314,8 @@ public class GuidedStepActivity extends Activity { @Override public void onCreateButtonActions(List actions, Bundle savedInstanceState) { - actions.add(new GuidedAction.Builder().constructContinue(getActivity()) + actions.add(new GuidedAction.Builder(getActivity()) + .clickAction(GuidedAction.ACTION_ID_CONTINUE) .description("Continue") .build()); } @@ -452,7 +457,8 @@ public class GuidedStepActivity extends Activity { @Override public void onCreateButtonActions(List actions, Bundle savedInstanceState) { - actions.add(new GuidedAction.Builder().constructContinue(getActivity()) + actions.add(new GuidedAction.Builder(getActivity()) + .clickAction(GuidedAction.ACTION_ID_CONTINUE) .build()); } @@ -495,7 +501,8 @@ public class GuidedStepActivity extends Activity { @Override public void onCreateActions(List actions, Bundle savedInstanceState) { - actions.add(new GuidedAction.Builder().constructFinish(getActivity()) + actions.add(new GuidedAction.Builder(getActivity()) + .clickAction(GuidedAction.ACTION_ID_FINISH) .description("All Done...") .build()); addAction(actions, BACK, "Start Over", "Let's try this again..."); diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepSupportActivity.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepSupportActivity.java index 2c429c7c2..0787ed593 100644 --- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepSupportActivity.java +++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepSupportActivity.java @@ -177,10 +177,13 @@ public class GuidedStepSupportActivity extends FragmentActivity { @Override public void onCreateActions(List actions, Bundle savedInstanceState) { - actions.add(new GuidedAction.Builder().constructContinue(getActivity()) + Context context = getActivity(); + actions.add(new GuidedAction.Builder(context) + .clickAction(GuidedAction.ACTION_ID_CONTINUE) .description("Let's do it") .build()); - actions.add(new GuidedAction.Builder().constructCancel(getActivity()) + actions.add(new GuidedAction.Builder(context) + .clickAction(GuidedAction.ACTION_ID_CANCEL) .description("Never mind") .build()); } @@ -224,7 +227,8 @@ public class GuidedStepSupportActivity extends FragmentActivity { @Override public void onCreateButtonActions(List actions, Bundle savedInstanceState) { - actions.add(new GuidedAction.Builder().constructOK(getActivity()) + Context context = getActivity(); + actions.add(new GuidedAction.Builder(context).clickAction(GuidedAction.ACTION_ID_OK) .build()); actions.get(actions.size() - 1).setEnabled(false); } @@ -312,7 +316,8 @@ public class GuidedStepSupportActivity extends FragmentActivity { @Override public void onCreateButtonActions(List actions, Bundle savedInstanceState) { - actions.add(new GuidedAction.Builder().constructContinue(getActivity()) + actions.add(new GuidedAction.Builder(getActivity()) + .clickAction(GuidedAction.ACTION_ID_CONTINUE) .description("Continue") .build()); } @@ -454,7 +459,8 @@ public class GuidedStepSupportActivity extends FragmentActivity { @Override public void onCreateButtonActions(List actions, Bundle savedInstanceState) { - actions.add(new GuidedAction.Builder().constructContinue(getActivity()) + actions.add(new GuidedAction.Builder(getActivity()) + .clickAction(GuidedAction.ACTION_ID_CONTINUE) .build()); } @@ -497,7 +503,8 @@ public class GuidedStepSupportActivity extends FragmentActivity { @Override public void onCreateActions(List actions, Bundle savedInstanceState) { - actions.add(new GuidedAction.Builder().constructFinish(getActivity()) + actions.add(new GuidedAction.Builder(getActivity()) + .clickAction(GuidedAction.ACTION_ID_FINISH) .description("All Done...") .build()); addAction(actions, BACK, "Start Over", "Let's try this again...");