diff options
| author | Adam Powell <adamp@google.com> | 2014-10-01 18:11:18 +0000 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2014-10-01 18:11:18 +0000 |
| commit | 908c748096d855d47da2f5e20fd4d9d31d1e603c (patch) | |
| tree | 8031415a8deef274fa5bc89ba5c9744d6378889b /tests/SharedLibrary/lib/res | |
| parent | 5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6 (diff) | |
| download | frameworks_base-908c748096d855d47da2f5e20fd4d9d31d1e603c.zip frameworks_base-908c748096d855d47da2f5e20fd4d9d31d1e603c.tar.gz frameworks_base-908c748096d855d47da2f5e20fd4d9d31d1e603c.tar.bz2 | |
Revert "Fix issue with using locally defined attrs in a shared lib"
This reverts commit 5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6.
The reverted commit caused issues loading resources supplied by static libraries.
Bug 17748356
Change-Id: I860a4f31451ee7c03c02974826472a67226b029f
Diffstat (limited to 'tests/SharedLibrary/lib/res')
| -rw-r--r-- | tests/SharedLibrary/lib/res/layout/main.xml | 26 | ||||
| -rw-r--r-- | tests/SharedLibrary/lib/res/values/strings.xml | 1 |
2 files changed, 0 insertions, 27 deletions
diff --git a/tests/SharedLibrary/lib/res/layout/main.xml b/tests/SharedLibrary/lib/res/layout/main.xml deleted file mode 100644 index df0204d9..0000000 --- a/tests/SharedLibrary/lib/res/layout/main.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sample_layout"/> - - <com.google.android.test.shared_library.AddressView xmlns:address="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:background="#03a9f4" - address:name="Librarian L" - address:streetNumber="21" - address:streetName="Android Lane" - address:city="AndroidVille" - address:state="OS" - address:zip="12345" - address:country="Mobile"/> - -</LinearLayout> diff --git a/tests/SharedLibrary/lib/res/values/strings.xml b/tests/SharedLibrary/lib/res/values/strings.xml index 9beccd9..6827f93 100644 --- a/tests/SharedLibrary/lib/res/values/strings.xml +++ b/tests/SharedLibrary/lib/res/values/strings.xml @@ -28,5 +28,4 @@ </string-array> <string name="racoon">Racoon</string> - <string name="sample_layout">This is an example of a layout this library provides.</string> </resources> |