summaryrefslogtreecommitdiffstats
path: root/tests/Split
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2015-01-13 13:42:41 -0800
committerAdam Lesinski <adamlesinski@google.com>2015-01-14 12:02:15 -0800
commit28994d8d181c286b39811441ce78399576c2d315 (patch)
tree2e1d2308c8c49184fc04ad98994f95ed4d462961 /tests/Split
parent7ce662ef870df34cd189b4ce9e487e496ba407dd (diff)
downloadframeworks_base-28994d8d181c286b39811441ce78399576c2d315.zip
frameworks_base-28994d8d181c286b39811441ce78399576c2d315.tar.gz
frameworks_base-28994d8d181c286b39811441ce78399576c2d315.tar.bz2
AAPT: Handle all old unversioned attribute usage
All references to attributes defined in pre-LOLLIPOP_MR1 SDK are moved to version qualified resource entries. Bug:18221682 Change-Id: Ifd739530ebcf99e6bc7ddb3f10bc5e05f0726e62
Diffstat (limited to 'tests/Split')
-rw-r--r--tests/Split/res/layout/main.xml2
-rw-r--r--tests/Split/res/values-v10/values.xml28
-rw-r--r--tests/Split/res/values-v17/values.xml24
-rw-r--r--tests/Split/res/values/values.xml6
4 files changed, 60 insertions, 0 deletions
diff --git a/tests/Split/res/layout/main.xml b/tests/Split/res/layout/main.xml
index 607cdb0..5a33c86 100644
--- a/tests/Split/res/layout/main.xml
+++ b/tests/Split/res/layout/main.xml
@@ -21,5 +21,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
+ android:colorAccent="#ffffffff"
+ android:paddingStart="13dp"
android:src="@drawable/image"/>
</RelativeLayout>
diff --git a/tests/Split/res/values-v10/values.xml b/tests/Split/res/values-v10/values.xml
new file mode 100644
index 0000000..3d41a84
--- /dev/null
+++ b/tests/Split/res/values-v10/values.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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>
+ <style name="toop">
+ <item name="android:paddingStart">12dp</item>
+ <item name="android:layout_width">23dp</item>
+ </style>
+
+ <style name="temp">
+ <item name="android:versionName">hey</item>
+ <item name="android:allowBackup">true</item>
+ <item name="android:colorAccent">#ffffffff</item>
+ </style>
+</resources>
diff --git a/tests/Split/res/values-v17/values.xml b/tests/Split/res/values-v17/values.xml
new file mode 100644
index 0000000..c24eeae
--- /dev/null
+++ b/tests/Split/res/values-v17/values.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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>
+ <style name="toop">
+ <item name="android:paddingStart">12dp</item>
+ <item name="android:layout_width">23dp</item>
+ <item name="android:layout_height">45dp</item>
+ </style>
+
+</resources>
diff --git a/tests/Split/res/values/values.xml b/tests/Split/res/values/values.xml
index 68edc77..aabb232 100644
--- a/tests/Split/res/values/values.xml
+++ b/tests/Split/res/values/values.xml
@@ -44,4 +44,10 @@
<item>@string/boom</item>
<item>25dp</item>
</array>
+
+ <style name="temp">
+ <item name="android:versionName">hey</item>
+ <item name="android:allowBackup">true</item>
+ <item name="android:colorAccent">#ffffffff</item>
+ </style>
</resources>