Add @TransitionRes for transition resource integers

Change-Id: I37f523282156c2f87c4d961167d6a980d5f6e34c
This commit is contained in:
Tor Norbye
2015-03-10 20:53:06 -07:00
parent 4998467ce1
commit bc2dd79af9
2 changed files with 43 additions and 2 deletions

View File

@@ -0,0 +1,37 @@
/*
* Copyright (C) 2015 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 android.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.SOURCE;
/**
* Denotes that an integer parameter, field or method return value is expected
* to be a transition resource reference.
*
* {@hide}
*/
@Documented
@Retention(SOURCE)
@Target({METHOD, PARAMETER, FIELD})
public @interface TransitionRes {
}

View File

@@ -16,6 +16,7 @@
package android.transition;
import android.annotation.TransitionRes;
import com.android.internal.R;
import org.xmlpull.v1.XmlPullParser;
@@ -71,7 +72,8 @@ public class TransitionInflater {
* @throws android.content.res.Resources.NotFoundException when the
* transition cannot be loaded
*/
public Transition inflateTransition(int resource) {
public Transition inflateTransition(@TransitionRes int resource) {
//noinspection ResourceType
XmlResourceParser parser = mContext.getResources().getXml(resource);
try {
return createTransitionFromXml(parser, Xml.asAttributeSet(parser), null);
@@ -98,7 +100,9 @@ public class TransitionInflater {
* @throws android.content.res.Resources.NotFoundException when the
* transition manager cannot be loaded
*/
public TransitionManager inflateTransitionManager(int resource, ViewGroup sceneRoot) {
public TransitionManager inflateTransitionManager(@TransitionRes int resource,
ViewGroup sceneRoot) {
//noinspection ResourceType
XmlResourceParser parser = mContext.getResources().getXml(resource);
try {
return createTransitionManagerFromXml(parser, Xml.asAttributeSet(parser), sceneRoot);