Showcase: Update SDK to 23 and support lib to 23.0.1
Updated for new API addAsRoot() for GuidedStepFragment.
Rmove the awkward setStep() call, we can find current GuidedStepFragment
using standard API.
Change-Id: I7ecb108a36ab5d0091c230dd5c5686e3a91f1857
diff --git a/samples/SupportLeanbackShowcase/app/build.gradle b/samples/SupportLeanbackShowcase/app/build.gradle
index d632d8f..d593ef5 100644
--- a/samples/SupportLeanbackShowcase/app/build.gradle
+++ b/samples/SupportLeanbackShowcase/app/build.gradle
@@ -2,13 +2,13 @@
android {
- compileSdkVersion 'android-MNC'
- buildToolsVersion "22.0.1"
+ compileSdkVersion 'android-23'
+ buildToolsVersion "23.0.1"
defaultConfig {
applicationId "android.support.v17.leanback.supportleanbackshowcase"
minSdkVersion 17
- targetSdkVersion 'MNC'
+ targetSdkVersion '23'
versionCode 1
versionName "1.0"
}
@@ -22,15 +22,15 @@
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support:recyclerview-v7:23.0.0-rc1'
- compile 'com.android.support:leanback-v17:23.0.0-rc1'
- compile 'com.android.support:appcompat-v7:23.0.0-rc1'
+ compile 'com.android.support:recyclerview-v7:23.0.1'
+ compile 'com.android.support:leanback-v17:23.0.1'
+ compile 'com.android.support:appcompat-v7:23.0.1'
- compile 'com.android.support:preference-v7:23.0.0-rc1'
- compile 'com.android.support:preference-leanback-v17:23.0.0-rc1'
- compile 'com.android.support:preference-v14:23.0.0-rc1'
+ compile 'com.android.support:preference-v7:23.0.1'
+ compile 'com.android.support:preference-leanback-v17:23.0.1'
+ compile 'com.android.support:preference-v14:23.0.1'
compile 'com.google.code.gson:gson:1.7.2'
compile 'com.squareup.picasso:picasso:2.3.2'
- compile 'com.android.support:palette-v7:23.0.0-rc1'
+ compile 'com.android.support:palette-v7:23.0.1'
}
diff --git a/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/dialog/DialogExampleActivity.java b/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/dialog/DialogExampleActivity.java
index 763a18e..55f7575 100644
--- a/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/dialog/DialogExampleActivity.java
+++ b/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/dialog/DialogExampleActivity.java
@@ -30,6 +30,6 @@
getWindow().setBackgroundDrawable(new ColorDrawable(Color.parseColor("#21272A")));
GuidedStepFragment fragment = new DialogExampleFragment();
- GuidedStepFragment.add(getFragmentManager(), fragment);
+ GuidedStepFragment.addAsRoot(this, fragment, android.R.id.content);
}
}
diff --git a/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/wizard/WizardExample1stStepFragment.java b/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/wizard/WizardExample1stStepFragment.java
index e7808b1..b40cc82 100644
--- a/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/wizard/WizardExample1stStepFragment.java
+++ b/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/wizard/WizardExample1stStepFragment.java
@@ -32,12 +32,6 @@
private static final int ACTION_ID_BUY_HD = 1;
private static final int ACTION_ID_BUY_SD = ACTION_ID_BUY_HD + 1;
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- getWizardActivity().setStep(1);
- }
-
@NonNull
@Override
public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
diff --git a/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/wizard/WizardExample2ndStepFragment.java b/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/wizard/WizardExample2ndStepFragment.java
index 8bbf5a4..3b369ac 100644
--- a/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/wizard/WizardExample2ndStepFragment.java
+++ b/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/wizard/WizardExample2ndStepFragment.java
@@ -45,12 +45,6 @@
return fragment;
}
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- getWizardActivity().setStep(2);
- }
-
@NonNull
@Override
public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
diff --git a/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/wizard/WizardExample3rdStepFragment.java b/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/wizard/WizardExample3rdStepFragment.java
index 0cc4221..37f662f 100644
--- a/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/wizard/WizardExample3rdStepFragment.java
+++ b/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/wizard/WizardExample3rdStepFragment.java
@@ -36,12 +36,6 @@
private final Handler mFakeHttpHandler = new Handler();
@Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- getWizardActivity().setStep(3);
- }
-
- @Override
public void onStart() {
super.onStart();
diff --git a/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/wizard/WizardExample4thStepFragment.java b/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/wizard/WizardExample4thStepFragment.java
index 5601fda..be5e645 100644
--- a/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/wizard/WizardExample4thStepFragment.java
+++ b/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/wizard/WizardExample4thStepFragment.java
@@ -33,12 +33,6 @@
private static final int ACTION_ID_WATCH = 1;
private static final int ACTION_ID_LATER = ACTION_ID_WATCH + 1;
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- getWizardActivity().setStep(4);
- }
-
@NonNull
@Override
public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
diff --git a/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/wizard/WizardExampleActivity.java b/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/wizard/WizardExampleActivity.java
index bde1a06..f5d2937 100644
--- a/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/wizard/WizardExampleActivity.java
+++ b/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/wizard/WizardExampleActivity.java
@@ -25,46 +25,23 @@
*/
public class WizardExampleActivity extends Activity {
- // When the user 'bought' the product and presses back, we don't want to show the 'Processing..'
- // screen again, instead we want to go back to the very first step or close the wizard. Thus, we
- // have to save the current step of the wizard and make it accessible to it's children.
- private int mStep = 0;
-
@Override public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getWindow().setBackgroundDrawableResource(R.drawable.wizard_background_blackned);
- // Recover old step state.
- if (savedInstanceState != null) {
- mStep = savedInstanceState.getInt("step");
- }
-
GuidedStepFragment fragment = new WizardExample1stStepFragment();
fragment.setArguments(getIntent().getExtras()); // Delegate Movie to first step.
- GuidedStepFragment.add(getFragmentManager(), fragment);
- }
-
- public int getStep() {
- return mStep;
- }
-
- public void setStep(int step) {
- mStep = step;
+ GuidedStepFragment.addAsRoot(this, fragment, android.R.id.content);
}
@Override
public void onBackPressed() {
- if (4 == getStep()) {
+ if (GuidedStepFragment.getCurrentGuidedStepFragment(getFragmentManager())
+ instanceof WizardExample4thStepFragment) {
// The user 'bought' the product. When he presses 'Back' the Wizard will be closed and
// he will not be send back to 'Processing Payment...'-Screen.
finish();
} else super.onBackPressed();
}
- @Override
- public void onSaveInstanceState(Bundle outState, PersistableBundle outPersistentState) {
- // Save current step persitently.
- outPersistentState.putInt("step", mStep);
- super.onSaveInstanceState(outState, outPersistentState);
- }
}
