diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-06-11 13:31:28 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2010-06-11 13:31:28 -0700 |
commit | 00c406364e7bb6b9191e928b1d1e4be9a7bb0960 (patch) | |
tree | de071e3e72477517b9131acf3defef51c06dde57 /tests/res | |
parent | 97ece591a65f5848e527d45501d586e613f379bf (diff) | |
parent | b2dd90383bae9f3ca0a99b59d3f5992e7fd5ad48 (diff) | |
download | packages_apps_settings-00c406364e7bb6b9191e928b1d1e4be9a7bb0960.zip packages_apps_settings-00c406364e7bb6b9191e928b1d1e4be9a7bb0960.tar.gz packages_apps_settings-00c406364e7bb6b9191e928b1d1e4be9a7bb0960.tar.bz2 |
merge from open-source master
Change-Id: I7d167c97600bbf25e2ed8872cffecd9fa5b1db7c
Diffstat (limited to 'tests/res')
-rwxr-xr-x | tests/res/drawable/ic_settings_applications.png | bin | 0 -> 1723 bytes | |||
-rw-r--r-- | tests/res/layout/manufacturer_main.xml | 22 | ||||
-rw-r--r-- | tests/res/layout/operator_main.xml | 22 | ||||
-rw-r--r-- | tests/res/values/strings.xml | 6 |
4 files changed, 50 insertions, 0 deletions
diff --git a/tests/res/drawable/ic_settings_applications.png b/tests/res/drawable/ic_settings_applications.png Binary files differnew file mode 100755 index 0000000..5cea33f --- /dev/null +++ b/tests/res/drawable/ic_settings_applications.png diff --git a/tests/res/layout/manufacturer_main.xml b/tests/res/layout/manufacturer_main.xml new file mode 100644 index 0000000..8f8c48f --- /dev/null +++ b/tests/res/layout/manufacturer_main.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2009 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. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" android:layout_width="fill_parent" + android:layout_height="fill_parent"> + <TextView android:layout_width="fill_parent" + android:layout_height="wrap_content" android:text="@string/manufacturer_hello" /> +</LinearLayout> diff --git a/tests/res/layout/operator_main.xml b/tests/res/layout/operator_main.xml new file mode 100644 index 0000000..3cf8e00 --- /dev/null +++ b/tests/res/layout/operator_main.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2009 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. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" android:layout_width="fill_parent" + android:layout_height="fill_parent"> + <TextView android:layout_width="fill_parent" + android:layout_height="wrap_content" android:text="@string/operator_hello" /> +</LinearLayout> diff --git a/tests/res/values/strings.xml b/tests/res/values/strings.xml index 00de425..9fb98f9 100644 --- a/tests/res/values/strings.xml +++ b/tests/res/values/strings.xml @@ -22,4 +22,10 @@ <string name="discoverable">Discoverable</string> <string name="start_scan">Start scan</string> <string name="stop_scan">Stop scan</string> + <string name="operator_hello">Hello Operator!</string> + <string name="operator_settings_title">Operator</string> + <string name="operator_settings_summary">Operator hook that can be used to start activity of choice</string> + <string name="manufacturer_hello">Hello Manufacturer!</string> + <string name="manufacturer_settings_title">Manufacturer</string> + <string name="manufacturer_settings_summary">Manufacturer hook that can be used to start activity of choice</string> </resources> |