diff options
| author | Yuichi Araki <yaraki@google.com> | 2017-01-18 20:42:17 +0900 |
|---|---|---|
| committer | Yuichi Araki <yaraki@google.com> | 2017-01-24 14:59:51 +0900 |
| commit | 4d35cca96ce55eb29d1948086214f91ae94e9adb (patch) | |
| tree | 2ddb5bd63163bf8806be9dc4773e66630b5c4712 /tools/aapt2/integration-tests | |
| parent | 9727f22fc092fe7ccdbf2929d697126f2095d62e (diff) | |
AAPT: Add --no-version-transitions flag
Add a new flag to disable versioning of Transition related XMLs.
Transition support library will use this to handle these XMLs on older
API levels.
Test: make libaapt_tests AaptTestAppOne
Bug: 34427868
Change-Id: I66e81cca049e71ef6704177b2ca21c9cdeaff78f
Diffstat (limited to 'tools/aapt2/integration-tests')
| -rw-r--r-- | tools/aapt2/integration-tests/AppOne/Android.mk | 2 | ||||
| -rw-r--r-- | tools/aapt2/integration-tests/AppOne/res/transition/transition_set.xml | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/tools/aapt2/integration-tests/AppOne/Android.mk b/tools/aapt2/integration-tests/AppOne/Android.mk index bc40a6269382..a6f32d4b9fdc 100644 --- a/tools/aapt2/integration-tests/AppOne/Android.mk +++ b/tools/aapt2/integration-tests/AppOne/Android.mk @@ -24,5 +24,5 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src) LOCAL_STATIC_ANDROID_LIBRARIES := \ AaptTestStaticLibOne \ AaptTestStaticLibTwo -LOCAL_AAPT_FLAGS := --no-version-vectors +LOCAL_AAPT_FLAGS := --no-version-vectors --no-version-transitions include $(BUILD_PACKAGE) diff --git a/tools/aapt2/integration-tests/AppOne/res/transition/transition_set.xml b/tools/aapt2/integration-tests/AppOne/res/transition/transition_set.xml new file mode 100644 index 000000000000..e10e6c2f53da --- /dev/null +++ b/tools/aapt2/integration-tests/AppOne/res/transition/transition_set.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2017 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. +--> +<transitionSet xmlns:android="http://schemas.android.com/apk/res/android" + android:transitionOrdering="sequential"> + <fade android:fadingMode="fade_out" /> + <changeBounds /> + <fade android:fadingMode="fade_in" /> +</transitionSet> |