LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix ApiDemo for transitions" into klp-dev

Browse Source
This commit is contained in:
Chet Haase
2013-10-23 18:01:42 +00:00
committed by Android (Google) Code Review
parent 7165109e6d 69ae34b2b9
commit 9262e7037f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/ApiDemos/res/transition/changebounds_fadein_together.xml
View File

@@ -13,11 +13,11 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<set xmlns:android="http://schemas.android.com/apk/res/android"> <transitionSet xmlns:android="http://schemas.android.com/apk/res/android">
<changeBounds/> <changeBounds/>
<fade android:fadingMode="fade_in" > <fade android:fadingMode="fade_in" >
<targets> <targets>
<target android:targetId="@id/grayscaleContainer" /> <target android:targetId="@id/grayscaleContainer" />
</targets> </targets>
</fade> </fade>
</set> </transitionSet>

4
samples/ApiDemos/res/transition/changebounds_fadeout_sequential.xml
View File

@@ -14,7 +14,7 @@
limitations under the License. limitations under the License.
--> -->
<!-- BEGIN_INCLUDE(TransitionSet) --> <!-- BEGIN_INCLUDE(TransitionSet) -->
<set xmlns:android="http://schemas.android.com/apk/res/android" <transitionSet xmlns:android="http://schemas.android.com/apk/res/android"
android:transitionOrdering="sequential"> android:transitionOrdering="sequential">
<changeBounds/> <changeBounds/>
<fade android:fadingMode="fade_out" > <fade android:fadingMode="fade_out" >
@@ -22,5 +22,5 @@
<target android:targetId="@id/grayscaleContainer" /> <target android:targetId="@id/grayscaleContainer" />
</targets> </targets>
</fade> </fade>
</set> </transitionSet>
<!-- END_INCLUDE(TransitionSet) --> <!-- END_INCLUDE(TransitionSet) -->