diff options
Diffstat (limited to 'samples/browseable/BasicTransition')
6 files changed, 34 insertions, 18 deletions
diff --git a/samples/browseable/BasicTransition/AndroidManifest.xml b/samples/browseable/BasicTransition/AndroidManifest.xml index b4698d688..435f5e0c2 100644 --- a/samples/browseable/BasicTransition/AndroidManifest.xml +++ b/samples/browseable/BasicTransition/AndroidManifest.xml @@ -19,7 +19,7 @@ android:versionCode="1" android:versionName="1.0"> - <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="19" /> + <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle --> <application android:allowBackup="true" diff --git a/samples/browseable/BasicTransition/_index.jd b/samples/browseable/BasicTransition/_index.jd index af2a6e739..16415f685 100644 --- a/samples/browseable/BasicTransition/_index.jd +++ b/samples/browseable/BasicTransition/_index.jd @@ -1,12 +1,10 @@ - - - page.tags="BasicTransition" sample.group=UI @jd:body <p> -This sample demonstrates the basic use of the transition framework introduced in KitKat. -Select each of the radio buttons to switch between the -{@link android.transition.Scene Scene}s. -</p> + + This sample demonstrates the basic use of the transition framework introduced in KitKat. + Select each of the RadioButtons to switch between the Scenes. + + </p> diff --git a/samples/browseable/BasicTransition/res/values-v21/template-styles.xml b/samples/browseable/BasicTransition/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/BasicTransition/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 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. + --> + +<resources> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> diff --git a/samples/browseable/BasicTransition/res/values/base-strings.xml b/samples/browseable/BasicTransition/res/values/base-strings.xml index 466e59069..d14eb5465 100644 --- a/samples/browseable/BasicTransition/res/values/base-strings.xml +++ b/samples/browseable/BasicTransition/res/values/base-strings.xml @@ -14,9 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - <resources> <string name="app_name">BasicTransition</string> <string name="intro_message"> diff --git a/samples/browseable/BasicTransition/res/values/strings.xml b/samples/browseable/BasicTransition/res/values/strings.xml index 319cf3151..319cf3151 100755..100644 --- a/samples/browseable/BasicTransition/res/values/strings.xml +++ b/samples/browseable/BasicTransition/res/values/strings.xml diff --git a/samples/browseable/BasicTransition/src/com.example.android.basictransition/MainActivity.java b/samples/browseable/BasicTransition/src/com.example.android.basictransition/MainActivity.java index 1e7c3017b..7eeac2e6d 100644 --- a/samples/browseable/BasicTransition/src/com.example.android.basictransition/MainActivity.java +++ b/samples/browseable/BasicTransition/src/com.example.android.basictransition/MainActivity.java @@ -14,9 +14,6 @@ * limitations under the License. */ - - - package com.example.android.basictransition; import android.os.Bundle; @@ -50,10 +47,12 @@ public class MainActivity extends SampleActivityBase { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); - BasicTransitionFragment fragment = new BasicTransitionFragment(); - transaction.replace(R.id.sample_content_fragment, fragment); - transaction.commit(); + if (savedInstanceState == null) { + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + BasicTransitionFragment fragment = new BasicTransitionFragment(); + transaction.replace(R.id.sample_content_fragment, fragment); + transaction.commit(); + } } @Override |