diff --git a/samples/SupportLeanbackDemos/AndroidManifest.xml b/samples/SupportLeanbackDemos/AndroidManifest.xml index 391bcb752..e429423f3 100644 --- a/samples/SupportLeanbackDemos/AndroidManifest.xml +++ b/samples/SupportLeanbackDemos/AndroidManifest.xml @@ -14,14 +14,17 @@ android:theme="@style/Theme.Example.Leanback"> + android:label="@string/app_name"> + + @@ -44,9 +47,14 @@ android:exported="true" /> + android:exported="true" /> + + + diff --git a/samples/SupportLeanbackDemos/res/drawable-hdpi/ic_main_icon.png b/samples/SupportLeanbackDemos/res/drawable-hdpi/ic_main_icon.png new file mode 100644 index 000000000..6f0c9628e Binary files /dev/null and b/samples/SupportLeanbackDemos/res/drawable-hdpi/ic_main_icon.png differ diff --git a/samples/SupportLeanbackDemos/res/drawable-mdpi/ic_main_icon.png b/samples/SupportLeanbackDemos/res/drawable-mdpi/ic_main_icon.png new file mode 100644 index 000000000..e9effc82e Binary files /dev/null and b/samples/SupportLeanbackDemos/res/drawable-mdpi/ic_main_icon.png differ diff --git a/samples/SupportLeanbackDemos/res/drawable-xhdpi/ic_main_icon.png b/samples/SupportLeanbackDemos/res/drawable-xhdpi/ic_main_icon.png new file mode 100644 index 000000000..2e5651689 Binary files /dev/null and b/samples/SupportLeanbackDemos/res/drawable-xhdpi/ic_main_icon.png differ diff --git a/samples/SupportLeanbackDemos/res/drawable/ic_guidedstep_option_a.png b/samples/SupportLeanbackDemos/res/drawable/ic_guidedstep_option_a.png new file mode 100644 index 000000000..b1afd78d3 Binary files /dev/null and b/samples/SupportLeanbackDemos/res/drawable/ic_guidedstep_option_a.png differ diff --git a/samples/SupportLeanbackDemos/res/drawable/ic_guidedstep_option_b.png b/samples/SupportLeanbackDemos/res/drawable/ic_guidedstep_option_b.png new file mode 100644 index 000000000..3349108bb Binary files /dev/null and b/samples/SupportLeanbackDemos/res/drawable/ic_guidedstep_option_b.png differ diff --git a/samples/SupportLeanbackDemos/res/drawable/ic_guidedstep_option_c.png b/samples/SupportLeanbackDemos/res/drawable/ic_guidedstep_option_c.png new file mode 100644 index 000000000..d92c92717 Binary files /dev/null and b/samples/SupportLeanbackDemos/res/drawable/ic_guidedstep_option_c.png differ diff --git a/samples/SupportLeanbackDemos/res/layout/main.xml b/samples/SupportLeanbackDemos/res/layout/browse.xml similarity index 100% rename from samples/SupportLeanbackDemos/res/layout/main.xml rename to samples/SupportLeanbackDemos/res/layout/browse.xml diff --git a/samples/SupportLeanbackDemos/res/layout/guidedstep_second_guidance.xml b/samples/SupportLeanbackDemos/res/layout/guidedstep_second_guidance.xml new file mode 100644 index 000000000..09aaef148 --- /dev/null +++ b/samples/SupportLeanbackDemos/res/layout/guidedstep_second_guidance.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + diff --git a/samples/SupportLeanbackDemos/res/values/colors.xml b/samples/SupportLeanbackDemos/res/values/colors.xml new file mode 100644 index 000000000..705ce0187 --- /dev/null +++ b/samples/SupportLeanbackDemos/res/values/colors.xml @@ -0,0 +1,19 @@ + + + + #4A4F51 + #2A2F51 + diff --git a/samples/SupportLeanbackDemos/res/values/strings.xml b/samples/SupportLeanbackDemos/res/values/strings.xml index e8840436b..09e43a685 100644 --- a/samples/SupportLeanbackDemos/res/values/strings.xml +++ b/samples/SupportLeanbackDemos/res/values/strings.xml @@ -17,4 +17,33 @@ MainActivity + Demo + Activities + Browse + BrowseFragment test + Search + SearchFragment test + Details + DetailsFragment test + Playback + PlaybackOverlay test + Horizontal Grid + HorizontalGridView test + Vertical Grid + VerticalGridView test + Guided Step + GuidedStepFragment test + Browse Error + BrowseError test + + + First + First step of guided sequence + Guided Steps + Second + Showcasing different action configurations + Guided Steps + Third + Third step of guided sequence + Guided Steps diff --git a/samples/SupportLeanbackDemos/res/values/styles.xml b/samples/SupportLeanbackDemos/res/values/styles.xml index 17ea0efad..dd86e7ec8 100644 --- a/samples/SupportLeanbackDemos/res/values/styles.xml +++ b/samples/SupportLeanbackDemos/res/values/styles.xml @@ -20,4 +20,13 @@ + + + \ No newline at end of file diff --git a/samples/SupportLeanbackDemos/res/values/themes.xml b/samples/SupportLeanbackDemos/res/values/themes.xml index 22a41f06d..5d7c2320a 100644 --- a/samples/SupportLeanbackDemos/res/values/themes.xml +++ b/samples/SupportLeanbackDemos/res/values/themes.xml @@ -25,4 +25,10 @@ @style/Widget.Example.Leanback.Title.Text @style/Widget.Example.Leanback.Rows.VerticalGridView + + diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseActivity.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseActivity.java new file mode 100644 index 000000000..fdd81c638 --- /dev/null +++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseActivity.java @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ +package com.example.android.leanback; + +import android.app.Activity; +import android.os.Bundle; + +public class BrowseActivity extends Activity { + /** Called when the activity is first created. */ + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.browse); + } +} diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseErrorActivity.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseErrorActivity.java index f2f61925f..022310191 100644 --- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseErrorActivity.java +++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseErrorActivity.java @@ -34,7 +34,7 @@ public class BrowseErrorActivity extends Activity public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.main); + setContentView(R.layout.browse); testError(); } diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepActivity.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepActivity.java new file mode 100644 index 000000000..3a3d712be --- /dev/null +++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/GuidedStepActivity.java @@ -0,0 +1,190 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.android.leanback; + +import android.app.Activity; +import android.app.FragmentManager; +import android.content.Context; +import android.content.Intent; +import android.graphics.drawable.Drawable; +import android.os.Bundle; +import android.support.v17.leanback.app.GuidedStepFragment; +import android.support.v17.leanback.widget.GuidedAction; +import android.support.v17.leanback.widget.GuidanceStylist; +import android.support.v17.leanback.widget.GuidanceStylist.Guidance; + +import java.util.List; +import java.util.ArrayList; + +/** + * Activity that showcases different aspects of GuidedStepFragments. + */ +public class GuidedStepActivity extends Activity { + + private static final int CONTINUE = 0; + private static final int BACK = 1; + + private static final int OPTION_CHECK_SET_ID = 10; + private static final int DEFAULT_OPTION = 0; + private static final String[] OPTION_NAMES = { "Option A", "Option B", "Option C" }; + private static final String[] OPTION_DESCRIPTIONS = { "Here's one thing you can do", + "Here's another thing you can do", "Here's one more thing you can do" }; + private static final int[] OPTION_DRAWABLES = { R.drawable.ic_guidedstep_option_a, + R.drawable.ic_guidedstep_option_b, R.drawable.ic_guidedstep_option_c }; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + GuidedStepFragment.add(getFragmentManager(), new FirstStepFragment()); + } + + private static void addAction(List actions, long id, String title, String desc) { + actions.add(new GuidedAction.Builder() + .id(id) + .title(title) + .description(desc) + .build()); + } + + private static void addCheckedAction(List actions, int iconResId, Context context, + String title, String desc) { + actions.add(new GuidedAction.Builder() + .title(title) + .description(desc) + .checkSetId(OPTION_CHECK_SET_ID) + .iconResourceId(iconResId, context) + .build()); + } + + /** + * The first fragment is instantiated via XML, so it must be public. + */ + public static class FirstStepFragment extends GuidedStepFragment { + @Override + public int onProvideTheme() { + return R.style.Theme_Example_Leanback_GuidedStep_First; + } + + @Override + public Guidance onCreateGuidance(Bundle savedInstanceState) { + 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); + return new Guidance(title, description, breadcrumb, icon); + } + + @Override + public void onCreateActions(List actions, Bundle savedInstanceState) { + addAction(actions, CONTINUE, "Continue", "Let's do it"); + addAction(actions, BACK, "Cancel", "Nevermind"); + } + + @Override + public void onGuidedActionClicked(GuidedAction action) { + FragmentManager fm = getFragmentManager(); + if (action.getId() == CONTINUE) { + GuidedStepFragment.add(fm, new SecondStepFragment()); + } else { + getActivity().finish(); + } + } + } + + private static class SecondStepFragment extends GuidedStepFragment { + + @Override + public Guidance onCreateGuidance(Bundle savedInstanceState) { + 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); + return new Guidance(title, description, breadcrumb, icon); + } + + @Override + public GuidanceStylist onCreateGuidanceStylist() { + return new GuidanceStylist() { + @Override + public int onProvideLayoutId() { + return R.layout.guidedstep_second_guidance; + } + }; + } + + @Override + public void onCreateActions(List actions, Bundle savedInstanceState) { + String desc = "The description can be quite long as well. "; + desc += "Just be sure to set multilineDescription to true in the GuidedAction."; + actions.add(new GuidedAction.Builder() + .title("Note that Guided Actions can have titles that are quite long.") + .description(desc) + .multilineDescription(true) + .infoOnly(true) + .enabled(false) + .build()); + for (int i = 0; i < OPTION_NAMES.length; i++) { + addCheckedAction(actions, OPTION_DRAWABLES[i], getActivity(), OPTION_NAMES[i], + OPTION_DESCRIPTIONS[i]); + if (i == DEFAULT_OPTION) { + actions.get(actions.size() -1).setChecked(true); + } + } + } + + @Override + public void onGuidedActionClicked(GuidedAction action) { + FragmentManager fm = getFragmentManager(); + GuidedStepFragment.add(fm, new ThirdStepFragment(getSelectedActionPosition()-1)); + } + + } + + private static class ThirdStepFragment extends GuidedStepFragment { + private final int mOption; + + public ThirdStepFragment(int option) { + mOption = option; + } + + @Override + public Guidance onCreateGuidance(Bundle savedInstanceState) { + String title = getString(R.string.guidedstep_third_title); + String breadcrumb = getString(R.string.guidedstep_third_breadcrumb); + String description = "You chose: " + OPTION_NAMES[mOption]; + Drawable icon = getActivity().getDrawable(R.drawable.ic_main_icon); + return new Guidance(title, description, breadcrumb, icon); + } + + @Override + public void onCreateActions(List actions, Bundle savedInstanceState) { + addAction(actions, CONTINUE, "Done", "All finished"); + addAction(actions, BACK, "Back", "Forgot something..."); + } + + @Override + public void onGuidedActionClicked(GuidedAction action) { + if (action.getId() == CONTINUE) { + getActivity().finish(); + } else { + getFragmentManager().popBackStack(); + } + } + + } + +} diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/MainActivity.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/MainActivity.java index 74e7fb216..90b1c6fc0 100644 --- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/MainActivity.java +++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/MainActivity.java @@ -1,28 +1,92 @@ /* * Copyright (C) 2014 The Android Open Source Project * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + package com.example.android.leanback; import android.app.Activity; +import android.content.Intent; +import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.support.v17.leanback.app.GuidedStepFragment; +import android.support.v17.leanback.widget.GuidedAction; +import android.support.v17.leanback.widget.GuidanceStylist.Guidance; + +import java.util.List; +import java.util.ArrayList; + +/** + * Activity that allows navigation among the demo activities. + */ +public class MainActivity extends Activity { + + private GuidedStepFragment mGuidedStepFragment; -public class MainActivity extends Activity -{ - /** Called when the activity is first created. */ @Override - public void onCreate(Bundle savedInstanceState) - { + protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.main); + + mGuidedStepFragment = new StepFragment(); + GuidedStepFragment.add(getFragmentManager(), mGuidedStepFragment); } + + private static class StepFragment extends GuidedStepFragment { + @Override + public Guidance onCreateGuidance(Bundle savedInstanceState) { + 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); + return new Guidance(title, description, breadcrumb, icon); + } + + @Override + public void onCreateActions(List actions, Bundle savedInstanceState) { + addAction(actions, BrowseActivity.class, R.string.browse, R.string.browse_description); + addAction(actions, SearchActivity.class, R.string.search, R.string.search_description); + addAction(actions, DetailsActivity.class, R.string.details, R.string.details_description); + actions.get(actions.size()-1).getIntent().putExtra(DetailsActivity.EXTRA_ITEM, + new PhotoItem("Hello world", R.drawable.gallery_photo_1)); + addAction(actions, PlaybackOverlayActivity.class, R.string.playback, + R.string.playback_description); + addAction(actions, HorizontalGridTestActivity.class, R.string.hgrid, + R.string.hgrid_description); + addAction(actions, VerticalGridActivity.class, R.string.vgrid, + R.string.vgrid_description); + addAction(actions, GuidedStepActivity.class, R.string.guidedstep, + R.string.guidedstep_description); + addAction(actions, BrowseErrorActivity.class, R.string.browseerror, + R.string.browseerror_description); + } + + private void addAction(List actions, Class cls, int titleRes, int descRes) { + actions.add(new GuidedAction.Builder() + .intent(new Intent(getActivity(), cls)) + .title(getString(titleRes)) + .description(getString(descRes)) + .build()); + } + + @Override + public void onGuidedActionClicked(GuidedAction action) { + Intent intent = action.getIntent(); + if (intent != null) { + startActivity(intent); + } + } + + } + }