OSDN Git Service

Remove a bunch of unused layouts and drawables from the music app
authorMarco Nelissen <marcone@google.com>
Fri, 15 Jan 2010 00:21:40 +0000 (16:21 -0800)
committerMarco Nelissen <marcone@google.com>
Fri, 15 Jan 2010 00:21:40 +0000 (16:21 -0800)
26 files changed:
res/drawable-finger/main_menu_button.xml [deleted file]
res/drawable-finger/pickerbox.xml [deleted file]
res/drawable-hdpi-finger/btn_music_highlight.9.png [deleted file]
res/drawable-hdpi-finger/btn_music_normal.9.png [deleted file]
res/drawable-hdpi-finger/btn_music_pressed.9.png [deleted file]
res/drawable-hdpi-finger/ic_menu_playback.png [deleted file]
res/drawable-hdpi-finger/ic_mp_screen_albums.png [deleted file]
res/drawable-hdpi-finger/ic_mp_screen_artists.png [deleted file]
res/drawable-hdpi-finger/ic_mp_screen_playlists.png [deleted file]
res/drawable-hdpi-finger/ic_mp_screen_tracks.png [deleted file]
res/drawable-land-hdpi-finger/btn_music_highlight.9.png [deleted file]
res/drawable-land-hdpi-finger/btn_music_normal.9.png [deleted file]
res/drawable-land-hdpi-finger/btn_music_pressed.9.png [deleted file]
res/drawable-land-mdpi-finger/btn_music_highlight.9.png [deleted file]
res/drawable-land-mdpi-finger/btn_music_normal.9.png [deleted file]
res/drawable-land-mdpi-finger/btn_music_pressed.9.png [deleted file]
res/drawable-mdpi-finger/btn_music_highlight.9.png [deleted file]
res/drawable-mdpi-finger/btn_music_normal.9.png [deleted file]
res/drawable-mdpi-finger/btn_music_pressed.9.png [deleted file]
res/drawable-mdpi-finger/ic_menu_playback.png [deleted file]
res/drawable-mdpi-finger/ic_mp_screen_albums.png [deleted file]
res/drawable-mdpi-finger/ic_mp_screen_artists.png [deleted file]
res/drawable-mdpi-finger/ic_mp_screen_playlists.png [deleted file]
res/drawable-mdpi-finger/ic_mp_screen_tracks.png [deleted file]
res/layout-finger/music_library.xml [deleted file]
res/layout-land-finger/music_library.xml [deleted file]

diff --git a/res/drawable-finger/main_menu_button.xml b/res/drawable-finger/main_menu_button.xml
deleted file mode 100644 (file)
index 370bc59..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/btn_music_pressed" />
-    <item android:state_focused="true" android:state_pressed="false" android:drawable="@drawable/btn_music_highlight" />
-    <item android:drawable="@drawable/btn_music_normal" />
-</selector>
-
diff --git a/res/drawable-finger/pickerbox.xml b/res/drawable-finger/pickerbox.xml
deleted file mode 100644 (file)
index 9cb2436..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/pickerbox_selected" />
-    <item android:drawable="@drawable/pickerbox_unselected" />
-</selector>
-
diff --git a/res/drawable-hdpi-finger/btn_music_highlight.9.png b/res/drawable-hdpi-finger/btn_music_highlight.9.png
deleted file mode 100644 (file)
index 31ef51b..0000000
Binary files a/res/drawable-hdpi-finger/btn_music_highlight.9.png and /dev/null differ
diff --git a/res/drawable-hdpi-finger/btn_music_normal.9.png b/res/drawable-hdpi-finger/btn_music_normal.9.png
deleted file mode 100644 (file)
index 48eec8b..0000000
Binary files a/res/drawable-hdpi-finger/btn_music_normal.9.png and /dev/null differ
diff --git a/res/drawable-hdpi-finger/btn_music_pressed.9.png b/res/drawable-hdpi-finger/btn_music_pressed.9.png
deleted file mode 100644 (file)
index 755c525..0000000
Binary files a/res/drawable-hdpi-finger/btn_music_pressed.9.png and /dev/null differ
diff --git a/res/drawable-hdpi-finger/ic_menu_playback.png b/res/drawable-hdpi-finger/ic_menu_playback.png
deleted file mode 100644 (file)
index 10af07f..0000000
Binary files a/res/drawable-hdpi-finger/ic_menu_playback.png and /dev/null differ
diff --git a/res/drawable-hdpi-finger/ic_mp_screen_albums.png b/res/drawable-hdpi-finger/ic_mp_screen_albums.png
deleted file mode 100644 (file)
index c22c0fd..0000000
Binary files a/res/drawable-hdpi-finger/ic_mp_screen_albums.png and /dev/null differ
diff --git a/res/drawable-hdpi-finger/ic_mp_screen_artists.png b/res/drawable-hdpi-finger/ic_mp_screen_artists.png
deleted file mode 100644 (file)
index 1a3deef..0000000
Binary files a/res/drawable-hdpi-finger/ic_mp_screen_artists.png and /dev/null differ
diff --git a/res/drawable-hdpi-finger/ic_mp_screen_playlists.png b/res/drawable-hdpi-finger/ic_mp_screen_playlists.png
deleted file mode 100644 (file)
index 4cbe083..0000000
Binary files a/res/drawable-hdpi-finger/ic_mp_screen_playlists.png and /dev/null differ
diff --git a/res/drawable-hdpi-finger/ic_mp_screen_tracks.png b/res/drawable-hdpi-finger/ic_mp_screen_tracks.png
deleted file mode 100644 (file)
index ebfa00c..0000000
Binary files a/res/drawable-hdpi-finger/ic_mp_screen_tracks.png and /dev/null differ
diff --git a/res/drawable-land-hdpi-finger/btn_music_highlight.9.png b/res/drawable-land-hdpi-finger/btn_music_highlight.9.png
deleted file mode 100644 (file)
index fa12c42..0000000
Binary files a/res/drawable-land-hdpi-finger/btn_music_highlight.9.png and /dev/null differ
diff --git a/res/drawable-land-hdpi-finger/btn_music_normal.9.png b/res/drawable-land-hdpi-finger/btn_music_normal.9.png
deleted file mode 100644 (file)
index 4be02e6..0000000
Binary files a/res/drawable-land-hdpi-finger/btn_music_normal.9.png and /dev/null differ
diff --git a/res/drawable-land-hdpi-finger/btn_music_pressed.9.png b/res/drawable-land-hdpi-finger/btn_music_pressed.9.png
deleted file mode 100644 (file)
index 3cf8813..0000000
Binary files a/res/drawable-land-hdpi-finger/btn_music_pressed.9.png and /dev/null differ
diff --git a/res/drawable-land-mdpi-finger/btn_music_highlight.9.png b/res/drawable-land-mdpi-finger/btn_music_highlight.9.png
deleted file mode 100644 (file)
index 0e5a270..0000000
Binary files a/res/drawable-land-mdpi-finger/btn_music_highlight.9.png and /dev/null differ
diff --git a/res/drawable-land-mdpi-finger/btn_music_normal.9.png b/res/drawable-land-mdpi-finger/btn_music_normal.9.png
deleted file mode 100644 (file)
index 80e2263..0000000
Binary files a/res/drawable-land-mdpi-finger/btn_music_normal.9.png and /dev/null differ
diff --git a/res/drawable-land-mdpi-finger/btn_music_pressed.9.png b/res/drawable-land-mdpi-finger/btn_music_pressed.9.png
deleted file mode 100644 (file)
index 3592781..0000000
Binary files a/res/drawable-land-mdpi-finger/btn_music_pressed.9.png and /dev/null differ
diff --git a/res/drawable-mdpi-finger/btn_music_highlight.9.png b/res/drawable-mdpi-finger/btn_music_highlight.9.png
deleted file mode 100644 (file)
index 0e18a9e..0000000
Binary files a/res/drawable-mdpi-finger/btn_music_highlight.9.png and /dev/null differ
diff --git a/res/drawable-mdpi-finger/btn_music_normal.9.png b/res/drawable-mdpi-finger/btn_music_normal.9.png
deleted file mode 100644 (file)
index 10d2a96..0000000
Binary files a/res/drawable-mdpi-finger/btn_music_normal.9.png and /dev/null differ
diff --git a/res/drawable-mdpi-finger/btn_music_pressed.9.png b/res/drawable-mdpi-finger/btn_music_pressed.9.png
deleted file mode 100644 (file)
index ef2caa6..0000000
Binary files a/res/drawable-mdpi-finger/btn_music_pressed.9.png and /dev/null differ
diff --git a/res/drawable-mdpi-finger/ic_menu_playback.png b/res/drawable-mdpi-finger/ic_menu_playback.png
deleted file mode 100755 (executable)
index 22f203a..0000000
Binary files a/res/drawable-mdpi-finger/ic_menu_playback.png and /dev/null differ
diff --git a/res/drawable-mdpi-finger/ic_mp_screen_albums.png b/res/drawable-mdpi-finger/ic_mp_screen_albums.png
deleted file mode 100755 (executable)
index 4804ac0..0000000
Binary files a/res/drawable-mdpi-finger/ic_mp_screen_albums.png and /dev/null differ
diff --git a/res/drawable-mdpi-finger/ic_mp_screen_artists.png b/res/drawable-mdpi-finger/ic_mp_screen_artists.png
deleted file mode 100755 (executable)
index 1803880..0000000
Binary files a/res/drawable-mdpi-finger/ic_mp_screen_artists.png and /dev/null differ
diff --git a/res/drawable-mdpi-finger/ic_mp_screen_playlists.png b/res/drawable-mdpi-finger/ic_mp_screen_playlists.png
deleted file mode 100755 (executable)
index 068c5d1..0000000
Binary files a/res/drawable-mdpi-finger/ic_mp_screen_playlists.png and /dev/null differ
diff --git a/res/drawable-mdpi-finger/ic_mp_screen_tracks.png b/res/drawable-mdpi-finger/ic_mp_screen_tracks.png
deleted file mode 100755 (executable)
index f9c3836..0000000
Binary files a/res/drawable-mdpi-finger/ic_mp_screen_tracks.png and /dev/null differ
diff --git a/res/layout-finger/music_library.xml b/res/layout-finger/music_library.xml
deleted file mode 100644 (file)
index 12449f4..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:paddingTop="35dip"
-        android:paddingLeft="18dip"
-        android:paddingRight="18dip"
-        android:orientation="horizontal"
-        >
-
-        <LinearLayout
-            android:layout_weight="1"
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:layout_marginRight="18dip"
-            >
-
-            <Button
-                android:id="@+id/browse_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/main_menu_button"
-                android:drawableTop="@drawable/ic_mp_screen_artists"
-                android:text="@string/browse_menu"
-                android:ellipsize="marquee"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="?android:attr/textColorPrimaryDisableOnly"
-                android:singleLine="true"
-                android:layout_marginBottom="35dip"
-            />
-
-            <Button
-                android:id="@+id/tracks_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/main_menu_button"
-                android:drawableTop="@drawable/ic_mp_screen_tracks"
-                android:text="@string/tracks_menu"
-                android:ellipsize="marquee"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="?android:attr/textColorPrimaryDisableOnly"
-                android:singleLine="true"
-                android:layout_marginBottom="35dip"
-            />
-
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_weight="1"
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            >
-
-            <Button
-                android:id="@+id/albums_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/main_menu_button"
-                android:drawableTop="@drawable/ic_mp_screen_albums"
-                android:text="@string/albums_menu"
-                android:ellipsize="marquee"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="?android:attr/textColorPrimaryDisableOnly"
-                android:singleLine="true"
-                android:layout_marginBottom="35dip"
-            />
-
-            <Button
-                android:id="@+id/playlists_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/main_menu_button"
-                android:drawableTop="@drawable/ic_mp_screen_playlists"
-                android:text="@string/playlists_menu"
-                android:ellipsize="marquee"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="?android:attr/textColorPrimaryDisableOnly"
-                android:singleLine="true"
-                android:layout_marginBottom="35dip"
-            />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/nowplaying"
-        android:layout_width="match_parent"
-        android:layout_height="64dip"
-        android:focusable="true"
-        android:visibility="invisible"
-        android:orientation="vertical">
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@android:drawable/divider_horizontal_dark" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:layout_marginLeft="18dip"
-            android:layout_marginRight="18dip">
-
-            <LinearLayout
-                android:layout_width="0dip"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/title"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                />
-                <TextView
-                    android:id="@+id/artist"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                />
-            </LinearLayout>
-
-            <ImageView android:id="@+id/icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:background="@drawable/indicator_ic_mp_playing_large"
-            />
-
-        </LinearLayout>
-    </LinearLayout>   
-</LinearLayout>
-
diff --git a/res/layout-land-finger/music_library.xml b/res/layout-land-finger/music_library.xml
deleted file mode 100644 (file)
index 6be8bd4..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:paddingTop="37dip"
-        android:paddingLeft="12dip"
-        android:paddingRight="12dip"
-        android:orientation="horizontal"
-        >
-
-        <Button
-            android:id="@+id/browse_button"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/main_menu_button"
-            android:drawableTop="@drawable/ic_mp_screen_artists"
-            android:text="@string/browse_menu"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="?android:attr/textColorPrimaryDisableOnly"
-            android:singleLine="true"
-            android:layout_marginBottom="35dip"
-            android:layout_marginRight="10dip"
-        />
-
-        <Button
-            android:id="@+id/albums_button"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/main_menu_button"
-            android:drawableTop="@drawable/ic_mp_screen_albums"
-            android:text="@string/albums_menu"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="?android:attr/textColorPrimaryDisableOnly"
-            android:singleLine="true"
-            android:layout_marginBottom="35dip"
-            android:layout_marginRight="10dip"
-        />
-
-        <Button
-            android:id="@+id/tracks_button"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/main_menu_button"
-            android:drawableTop="@drawable/ic_mp_screen_tracks"
-            android:text="@string/tracks_menu"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="?android:attr/textColorPrimaryDisableOnly"
-            android:singleLine="true"
-            android:layout_marginBottom="35dip"
-            android:layout_marginRight="10dip"
-        />
-
-        <Button
-            android:id="@+id/playlists_button"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/main_menu_button"
-            android:drawableTop="@drawable/ic_mp_screen_playlists"
-            android:text="@string/playlists_menu"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="?android:attr/textColorPrimaryDisableOnly"
-            android:singleLine="true"
-            android:layout_marginBottom="35dip"
-        />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/nowplaying"
-        android:layout_width="match_parent"
-        android:layout_height="64dip"
-        android:focusable="true"
-        android:visibility="invisible"
-        android:orientation="vertical">
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@android:drawable/divider_horizontal_dark" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:layout_marginLeft="12dip"
-            android:layout_marginRight="12dip">
-
-            <LinearLayout
-                android:layout_width="0dip"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/title"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                />
-                <TextView
-                    android:id="@+id/artist"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                />
-            </LinearLayout>
-
-            <ImageView android:id="@+id/icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:background="@drawable/indicator_ic_mp_playing_large"
-            />
-
-        </LinearLayout>
-    </LinearLayout>
-</LinearLayout>
-