PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge from froyo-plus-aosp

Browse Source 
Change-Id: I6c6ee9c9567f5aef7e1beb585296c1e2fb884e9a
This commit is contained in:
The Android Open Source Project
2010-06-14 11:48:15 -07:00
parent ea38e67853 b817cb6e39
commit 73550d28df
13 changed files with 426 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
tests/res/drawable/ic_settings_applications.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

22
tests/res/layout/manufacturer_main.xml Normal file
View File

@@ -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>

22
tests/res/layout/operator_main.xml Normal file
View File

@@ -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>

6
tests/res/values/strings.xml
View File

@@ -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>