diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-06-26 14:57:22 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2017-06-28 11:20:17 -0700 |
| commit | 5b7337f77cf036dda2c7218ccf22dedc774dcf76 (patch) | |
| tree | b7aab8df43eeff70759f84e45da95b507edfddcc /tools/aapt2/integration-tests | |
| parent | 8276d0e1527ad08aae3ec39529b10477358a1dae (diff) | |
AAPT2: Auto-version adaptive-icon XML
Auto version adaptive-icon XML to v26.
This change makes the logic for generating versioned resources
simpler by changing the comparison function of ResTable_config
to evaluate the sdkVersion property last, making configurations
that differ only in sdkVersion next to each other in a sorted vector.
Bug: 62316340
Test: manual (verified output of tools/aapt2/integration-tests/AppOne)
Change-Id: I977d45821722a65d2135efb4693304eacc565c9a
Diffstat (limited to 'tools/aapt2/integration-tests')
| -rw-r--r-- | tools/aapt2/integration-tests/AppOne/res/drawable/adaptive-icon.xml | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/tools/aapt2/integration-tests/AppOne/res/drawable/adaptive-icon.xml b/tools/aapt2/integration-tests/AppOne/res/drawable/adaptive-icon.xml new file mode 100644 index 000000000000..e3cda7e1e979 --- /dev/null +++ b/tools/aapt2/integration-tests/AppOne/res/drawable/adaptive-icon.xml @@ -0,0 +1,20 @@ +<?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. +--> + +<adaptive-icon xmlns:android="http://schema.android.com/apk/res/android"> + <background android:drawable="@android:color/white" /> + <foreground android:drawable="@drawable/image" /> +</adaptive-icon> |