Merge pull request #2 from techmik/techtest2

fixed to enable building without error

Android.mk

@@ -6,6 +6,8 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
 	src/com/android/music/IMediaPlaybackService.aidl
 
+LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
+
 LOCAL_PACKAGE_NAME := Music
 
 LOCAL_SDK_VERSION := current
@@ -14,5 +16,5 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 include $(BUILD_PACKAGE)
 
-# Use the folloing include to make our test apk.
+# Use the following include to make our test apk.
 include $(call all-makefiles-under,$(LOCAL_PATH))

res/layout/do_not_show.xml

@@ -1,15 +1,15 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/do_not_show"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="horizontal"
-    android:padding="10dp" >
-
-    <CheckBox
-        android:id="@+id/noShow"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Do not show again" >
-    </CheckBox>
-
-</LinearLayout>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/do_not_show"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="horizontal"
+    android:padding="10dp" >
+
+    <CheckBox
+        android:id="@+id/noShow"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/do_not_show" >
+    </CheckBox>
+
+</LinearLayout>

res/layout/sensitive.xml

@@ -12,7 +12,8 @@
      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.
+     limitations under the License.
+
 -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -49,7 +50,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="left"
             android:paddingLeft="16dip"
-            android:text="Shake action sensitivity"
+            android:text="@string/tv_shake_sens"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
         <!-- Used for the shake sensitivity -->
@@ -92,7 +93,7 @@
                 android:layout_gravity="left"
                 android:layout_marginTop="16dip"
                 android:paddingLeft="16dip"
-                android:text="Flip action sensitivity"
+                android:text="@string/tv_flip_sens"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
             <LinearLayout
@@ -121,4 +122,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</ScrollView>
+</ScrollView>

res/values/strings.xml

@@ -630,4 +630,11 @@
     <string name="color_picker_green">Green</string>
     <string name="color_picker_blue">Blue</string>
 
-</resources>
+    <!-- Do not show again -->
+    <string name="do_not_show">Do not show again</string>
+
+    <!-- Shake and Flip sensitivity -->
+    <string name="tv_shake_sens">Shake action sensitivity</string>
+    <string name="tv_flip_sens">Flip action sensitivity</string>
+
+</resources>