overhaul

5 files changed, 31 insertions, 357 deletions

diff --git a/res/xml/appwidget1x1_info.xml b/res/xml/appwidget1x1_info.xml
index 00df66f..680c1ef 100644
--- a/res/xml/appwidget1x1_info.xml
+++ b/res/xml/appwidget1x1_info.xml
@@ -1,24 +1,6 @@
 <?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.




--->

-

 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"

-    android:initialLayout="@layout/album_appwidget1x1"

-    android:minHeight="40dip"

-    android:minWidth="40dip"

-    android:updatePeriodMillis="0" >

-

-</appwidget-provider>
\ No newline at end of file
+    android:initialLayout="@layout/onebyone_app_widget"

+    android:minHeight="40dp"

+    android:minWidth="40dp"

+    android:updatePeriodMillis="0" />
\ No newline at end of file
diff --git a/res/xml/appwidget4x1_info.xml b/res/xml/appwidget4x1_info.xml
index cc665a1..aad2bb0 100644
--- a/res/xml/appwidget4x1_info.xml
+++ b/res/xml/appwidget4x1_info.xml
@@ -1,24 +1,6 @@
 <?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.
--->
-
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:initialLayout="@layout/album_appwidget4x1"
-    android:minHeight="40dip"
-    android:minWidth="260dip"
-    android:updatePeriodMillis="0" >
-
-</appwidget-provider>
\ No newline at end of file
+    android:initialLayout="@layout/fourbyone_app_widget"
+    android:minHeight="40dp"
+    android:minWidth="260dp"
+    android:updatePeriodMillis="0" />
diff --git a/res/xml/appwidget4x2_info.xml b/res/xml/appwidget4x2_info.xml
index 50094a3..0605762 100644
--- a/res/xml/appwidget4x2_info.xml
+++ b/res/xml/appwidget4x2_info.xml
@@ -1,23 +1,6 @@
 <?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.

--->

-

 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"

-    android:minWidth="250dp"

+    android:initialLayout="@layout/fourbytwo_app_widget"

     android:minHeight="110dp"

-    android:updatePeriodMillis="0"

-    android:initialLayout="@layout/album_appwidget4x2"

-    >

-</appwidget-provider>

+    android:minWidth="250dp"

+    android:updatePeriodMillis="0" />

diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml
index b00f540..c4f8174 100644
--- a/res/xml/searchable.xml
+++ b/res/xml/searchable.xml
@@ -16,12 +16,7 @@
 -->
 
 <searchable xmlns:android="http://schemas.android.com/apk/res/android"
-    android:hint="@string/search_hint"
     android:includeInGlobalSearch="true"
-    android:label="@string/search_title"
-    android:searchSettingsDescription="@string/search_settings_description"
-    android:searchSuggestAuthority="media"
+    android:label="@string/search"
     android:searchSuggestIntentAction="android.intent.action.VIEW"
-    android:searchSuggestPath="external/audio/search"
-    android:searchSuggestThreshold="3"
     android:voiceSearchMode="showVoiceSearchButton|launchRecognizer" />
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index cd2fde6..fbd15fc 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -1,296 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>

-<!--

-     /* * Copyright 2011, The CyanogenMod 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. */









--->

+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >

 

-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

-    android:key="settings"

-    android:title="@string/settings" >

-

-    <PreferenceCategory android:title="@string/audio_cat" >

-        <ListPreference

-            android:defaultValue="8"

-            android:dialogTitle="@string/duck_attenuation_db_title"

-            android:entries="@array/duck_attenuation_db_entries"

-            android:entryValues="@array/duck_attenuation_db_entryvalues"

-            android:key="duck_attenuation_db"

-            android:summary="@string/duck_attenuation_db_summary"

-            android:title="@string/duck_attenuation_db_title" />

-

-        <Preference

-            android:enabled="true"

-            android:key="eqEffects"

-            android:summary="@string/effectspanel_summary"

-            android:title="@string/effectspanel" />

-    </PreferenceCategory>

-    <PreferenceCategory android:title="@string/ui_cat" >

+    <PreferenceCategory android:title="@string/header_interface" >

         <PreferenceScreen

-            android:summary="@string/shaker_summary"

-            android:title="@string/shaker_title" >

-            <PreferenceCategory android:title="Action Control" >

-                <ListPreference

-                    android:defaultValue="0"

-                    android:dialogTitle="@string/shaker_title_nowplaying"

-                    android:entries="@array/shaker_db_entries"

-                    android:entryValues="@array/shaker_db_entrievalues"

-                    android:key="shake_actions_db"

-                    android:summary="@string/shaker_summary_nowplaying"

-                    android:title="@string/shaker_title_nowplaying" />

-

-                <CheckBoxPreference

-                    android:defaultValue="true"

-                    android:key="cbFlip"

-                    android:summary="@string/flip_to_pause_summary"

-                    android:title="@string/flip_to_pause" />

-

-                <PreferenceScreen

-                    android:key="sens_picker"

-                    android:title="@string/sensitivity" 

-                    android:summary="@string/sensitivity_summary">

-                    <intent

-                        android:action="com.android.music.Sensitivity"

-                        android.targetClass="com.android.music.Sensitivity"

-                        android:targetPackage="com.android.music" />

-                </PreferenceScreen>

-            </PreferenceCategory>

-        </PreferenceScreen>

-        <PreferenceScreen

-            android:summary="@string/customizations_summary"

-            android:title="@string/customizations_title" >

-            <PreferenceScreen

-                android:summary="@string/animation_ui_summary"

-                android:title="@string/animation_ui_title" >

-                <ListPreference

-                    android:defaultValue="7"

-                    android:dialogTitle="Now Playing Animations"

-                    android:entries="@array/animation_ui_db_entries"

-                    android:entryValues="@array/animation_ui_db_entrievalues"

-                    android:key="np_animation_ui_db"

-                    android:summary="@string/album_art_anim_summary"

-                    android:title="@string/album_art_anim_title" />

-            </PreferenceScreen>

-            <PreferenceScreen

-                android:summary="@string/small_np_window_summary"

-                android:title="@string/small_np_window_title" >

-                <PreferenceScreen

-                    android:summary="@string/small_np_ui_summary"

-                    android:title="@string/small_np_ui" >

-                    <PreferenceCategory android:title="@string/small_np_ui" >

-                        <CheckBoxPreference

-                            android:defaultValue="false"

-                            android:key="cbPlay"

-                            android:summary="@string/np_media_play_summary"

-                            android:title="@string/np_media_play_title" />

-                        <CheckBoxPreference

-                            android:defaultValue="false"

-                            android:key="cbNext"

-                            android:summary="@string/np_media_next_summary"

-                            android:title="@string/np_media_next_title" />

-                        <CheckBoxPreference

-                            android:defaultValue="false"

-                            android:key="cbPrev"

-                            android:summary="@string/np_media_prev_summary"

-                            android:title="@string/np_media_prev_title" />

-                        <CheckBoxPreference

-                            android:defaultValue="true"

-                            android:key="cbSearch"

-                            android:summary="@string/np_media_search_summary"

-                            android:title="@string/np_media_search_title" />

-                        <CheckBoxPreference

-                            android:defaultValue="true"

-                            android:key="cbPlaylist"

-                            android:summary="@string/np_media_playlist_summary"

-                            android:title="@string/np_media_playlist_title" />

-                        <CheckBoxPreference

-                            android:defaultValue="false"

-                            android:key="cbMarket"

-                            android:summary="@string/np_media_market_summary"

-                            android:title="@string/np_media_market_title" />

-                        <CheckBoxPreference

-                            android:defaultValue="false"

-                            android:key="cbShare"

-                            android:summary="@string/np_media_share_summary"

-                            android:title="@string/np_media_share_title" />

-                        <CheckBoxPreference

-                            android:defaultValue="true"

-                            android:key="cbArt"

-                            android:summary="@string/np_media_album_art_summary"

-                            android:title="@string/np_media_album_art_title" />

-                        <CheckBoxPreference

-                            android:defaultValue="false"

-                            android:key="cbProgress"

-                            android:summary="@string/np_progress_summary"

-                            android:title="@string/np_progress_title" />

-                        <CheckBoxPreference

-                            android:defaultValue="false"

-                            android:key="cbFlow"

-                            android:summary="@string/flow_summary"

-                            android:title="@string/flow" />

-                    </PreferenceCategory>

-                    <PreferenceCategory android:title="@string/np_tv" >

-                        <CheckBoxPreference

-                            android:defaultValue="true"

-                            android:key="tvLine1"

-                            android:summary="@string/np_tv_track_summary"

-                            android:title="@string/np_tv_track" />

-                        <CheckBoxPreference

-                            android:defaultValue="true"

-                            android:key="tvLine2"

-                            android:summary="@string/np_tv_artist_summary"

-                            android:title="@string/np_tv_artist" />

-                        <CheckBoxPreference

-                            android:defaultValue="false"

-                            android:key="tvLine3"

-                            android:summary="@string/np_tv_album_summary"

-                            android:title="@string/np_tv_album" />

-

-                        <ListPreference

-                            android:defaultValue="2"

-                            android:dialogTitle="@string/np_font_dialog_title"

-                            android:entries="@array/np_font_size_entries"

-                            android:entryValues="@array/np_font_size_entrievalues"

-                            android:key="np_font_size"

-                            android:summary="@string/np_font_summary"

-                            android:title="@string/np_font_title" />

-                    </PreferenceCategory>

-                </PreferenceScreen>

-

-                <ListPreference

-                    android:defaultValue="2"

-                    android:dialogTitle="@string/np_swipe_gesture_title"

-                    android:entries="@array/np_swipe_gesture_entries"

-                    android:entryValues="@array/np_swipe_gesture_entrievalues"

-                    android:key="np_swipe_gesture"

-                    android:summary="@string/np_swipe_gesture_title_summary"

-                    android:title="@string/swipe_up_gesture" />

-            </PreferenceScreen>

-            <PreferenceScreen

-                android:summary="@string/status_bar_ui_summary"

-                android:title="@string/status_bar_ui_title" >

-                <PreferenceCategory android:title="@string/status_bar_ui_title" >

-                    <CheckBoxPreference

-                        android:defaultValue="false"

-                        android:key="cbStatusPlay"

-                        android:summary="@string/np_media_play_summary"

-                        android:title="@string/np_media_play_title" />

-                    <CheckBoxPreference

-                        android:defaultValue="false"

-                        android:key="cbStatusNext"

-                        android:summary="@string/np_media_next_summary"

-                        android:title="@string/np_media_next_title" />

-                    <CheckBoxPreference

-                        android:defaultValue="false"

-                        android:key="cbStatusPrev"

-                        android:summary="@string/np_media_prev_summary"

-                        android:title="@string/np_media_prev_title" />

-                    <CheckBoxPreference

-                        android:defaultValue="false"

-                        android:key="cbStatusCollapse"

-                        android:summary="@string/status_bar_close_summary"

-                        android:title="@string/status_bar_close" />

-                    <CheckBoxPreference

-                        android:defaultValue="true"

-                        android:key="cbStatusArt"

-                        android:summary="@string/np_media_album_art_summary"

-                        android:title="@string/np_media_album_art_title" />

-                    <CheckBoxPreference

-                        android:defaultValue="false"

-                        android:key="cbStatusNonya"

-                        android:summary="@string/status_bar_nonya_summary"

-                        android:title="@string/status_bar_nonya_title" />

-                    <CheckBoxPreference

-                        android:defaultValue="true"

-                        android:key="cbStatusTicker"

-                        android:summary="@string/tick_summary"

-                        android:title="@string/tick" />

-                </PreferenceCategory>

-                <PreferenceCategory android:title="@string/status_bar_text_views" >

-                    <CheckBoxPreference

-                        android:defaultValue="true"

-                        android:key="tvStatusLine1"

-                        android:summary="@string/np_tv_track_summary"

-                        android:title="@string/np_tv_track" />

-                    <CheckBoxPreference

-                        android:defaultValue="true"

-                        android:key="tvStatusLine2"

-                        android:summary="@string/np_tv_artist_summary"

-                        android:title="@string/np_tv_artist" />

-                    <CheckBoxPreference

-                        android:defaultValue="false"

-                        android:key="tvStatusLine3"

-                        android:summary="@string/np_tv_album_summary"

-                        android:title="@string/np_tv_album" />

-                    <CheckBoxPreference

-                        android:defaultValue="true"

-                        android:key="tvStatusColor"

-                        android:summary="Use the default text colors"

-                        android:title="Default Text Colors" />

-

-                    <PreferenceScreen

-                        android:key="color_picker"

-                        android:summary="@string/status_bar_color_picker_summary"

-                        android:title="@string/status_bar_color_picker" >

-                        <intent

-                            android:action="com.android.music.ColorPicker"

-                            android.targetClass="com.android.music.ColorPicker"

-                            android:targetPackage="com.android.music" />

-                    </PreferenceScreen>

-                </PreferenceCategory>

-            </PreferenceScreen>

-

+            android:icon="@drawable/apollo_settings_themes"

+            android:key="@string/key_themes_preferences"

+            android:title="@string/themes" >

             <ListPreference

-                android:defaultValue="1"

-                android:dialogTitle="@string/back_button_action_title"

-                android:entries="@array/back_button_db_entries"

-                android:entryValues="@array/back_button_db_entrievalues"

-                android:key="back_button_db"

-                android:summary="@string/back_button_action_summary"

-                android:title="@string/back_button_action" />

+                android:key="@string/key_themes_package"

+                android:summary="@string/apollo_themes"

+                android:title="@string/select_theme" />

 

-            <CheckBoxPreference

-                android:defaultValue="false"

-                android:key="cbEnterNowPlaying"

-                android:summary="@string/full_np_summary"

-                android:title="@string/full_np_title" />

-            <CheckBoxPreference

-                android:defaultValue="true"

-                android:key="cbLock"

-                android:summary="@string/lock_summary"

-                android:title="@string/lock" />

-            <CheckBoxPreference

-                android:defaultValue="false"

-                android:key="cbHomeAlbumArt"

-                android:summary="@string/home_art_summary"

-                android:title="@string/home_art" />

+            <com.andrew.apollo.preferences.ThemePreview

+                android:key="@string/key_themes"

+                android:layout="@layout/theme_preview" />

         </PreferenceScreen>

     </PreferenceCategory>

-

-    <PreferenceScreen

-        android:key="themePrefences"

-        android:summary="@string/pref_summary_theme_settings"

-        android:title="@string/pref_title_theme_settings" >

-        <ListPreference

-            android:key="themePackageName"

-            android:summary="@string/pref_summary_theme_settings"

-            android:title="@string/pref_title_theme_package" />

-

-        <com.android.music.PreviewPreference

-            android:key="themePreview"

-            android:layout="@layout/theme_preview" />

-    </PreferenceScreen>

-

-    <Preference

-        style="?android:preferenceInformationStyle"

-        android:enabled="true"

-        android:key="build"

-        android:summary="@string/build_version_summary"

-        android:title="@string/build_version" />

+    <PreferenceCategory android:title="@string/about" >

+        <Preference

+            style="?android:preferenceInformationStyle"

+            android:enabled="false"

+            android:key="@string/key_build_version"

+            android:summary="1.0"

+            android:title="@string/version" />

+    </PreferenceCategory>

 

 </PreferenceScreen>
\ No newline at end of file