Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed to enable building without error #2

Merged
merged 1 commit into from
Jan 17, 2012
Merged

fixed to enable building without error #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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))
30 changes: 15 additions & 15 deletions res/layout/do_not_show.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
9 changes: 5 additions & 4 deletions res/layout/sensitive.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 -->
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -121,4 +122,4 @@
</LinearLayout>
</LinearLayout>

</ScrollView>
</ScrollView>
9 changes: 8 additions & 1 deletion res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>