Update browseable samples for lmp-docs
Synced to commit df5e5013422b81b4fd05c0ac9fd964b13624847a. Includes new samples for Android Auto. Change-Id: I3fec46e2a6b3f196682a92f1afd91eb682dc2dc1
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
@@ -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">
|
||||
|
||||
0
samples/browseable/BasicTransition/res/values/strings.xml
Executable file → Normal file
0
samples/browseable/BasicTransition/res/values/strings.xml
Executable file → Normal file
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user