Permalink
Browse files

Merge branch 'integration' of http://github.com/AnderWeb/android_pack…

  • Loading branch information...
cyanogen committed Jun 9, 2010
2 parents 70223fd + a46a580 commit 4019c1ffd3a89d4ed8c45d8eb6be38bad4d41f03
View
@@ -60,7 +60,7 @@
<uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
<uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.RESTART_PACKAGES" />
-
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<application
android:name="LauncherApplication"
android:process="android.process.acore"
@@ -187,13 +187,15 @@
<string name="pref_summary_icon_highlights_focus">フォーカスしたアイコンのカラー</string>
<string name="pref_title_new_selectors">新しいアイコンセレクタ</string>
<string name="pref_summary_new_selectors">以前のものにするにはオフにする</string>
+ <string name="pref_title_drawer_color">背景色</string>
+ <string name="pref_summary_drawer_color">ドロワーの背景色を設定</string>
<string name="pref_dialog_title_color_picker">色を選択</string>
<string name="pref_dialog_message_color_picker">中央をタップして確定\n戻るボタンでキャンセル</string>
<string name="pref_dialog_color_picker_alpha">不透明度</string>
+ <string name="drop_to_uninstall">ドロップしてアンインストール</string>
<string name="pref_message_restart_normal">この設定を変更するとランチャーは再起動されます。</string>
<string name="pref_message_restart_froyo">この設定を変更するとランチャーは再起動されます。</string>
-
</resources>
View
@@ -261,7 +261,49 @@
<string name="pref_dialog_title_color_picker">Pick a color.</string>
<string name="pref_dialog_message_color_picker">Tap on center color to confirm.\nPress back to cancel.</string>
<string name="pref_dialog_color_picker_alpha">alpha</string>
- <string name="drop_to_uninstall">Drop to Uninstall</string>
<string name="pref_message_restart_normal">Changing this setting will make the Launcher restart itself</string>
<string name="pref_message_restart_froyo">Changing this setting will make the Launcher restart itself</string>
+ <string name="drop_to_uninstall">Drop to Uninstall</string>
+
+ <string name="pref_title_import_export">Backup and restore</string>
+ <string name="pref_title_xml">ADW settings</string>
+ <string name="pref_title_xml_import">Restore ADW settings</string>
+ <string name="pref_summary_xml_import">Restore from /sdcard/adw_settings.xml</string>
+ <string name="pref_title_xml_export">Backup ADW settings</string>
+ <string name="pref_summary_xml_export">Backup to /sdcard/adw_settings.xml</string>
+
+ <string name="pref_title_db">Desktop configuration</string>
+ <string name="pref_title_db_import">Restore desktop configuration</string>
+ <string name="pref_summary_db_import">Restore from /sdcard/adw_launcher.db</string>
+ <string name="pref_title_db_export">Backup desktop configuration</string>
+ <string name="pref_summary_db_export">Backup to /sdcard/adw_launcher.db</string>
+
+ <string name="title_dialog_xml">ADW Launcher Settings</string>
+ <string name="import_export_sdcard_unmounted">SD card not mounted!</string>
+
+ <!-- XML Import/Export strings -->
+ <string name="message_dialog_export">Backup ADW settings? Any existing file will be overwritten.</string>
+ <string name="xml_export_dialog">Backing up ADW settings...</string>
+ <string name="xml_export_success">ADW settings backed up successfully!</string>
+ <string name="xml_export_error">Error backing up ADW settings!</string>
+
+ <string name="message_dialog_import">Restore ADW settings? ADW.Launcher will be restarted.</string>
+ <string name="xml_import_dialog">Restoring ADW settings...</string>
+ <string name="xml_file_not_found">Settings backup file not found!</string>
+ <string name="xml_not_readable">Settings backup file exists, but is not readable!</string>
+ <string name="xml_import_success">ADW settings restored successfully!</string>
+ <string name="xml_import_error">Error restoring ADW settings!</string>
+
+ <!-- Config Import/Export strings -->
+ <string name="message_dialog_export_config">Backup desktop configuration? Any existing file will be overwritten.</string>
+ <string name="dbfile_export_dialog">Backing up desktop configuration...</string>
+ <string name="dbfile_export_success">Configuration backed up successfully!</string>
+ <string name="dbfile_export_error">Error backing up configuration!</string>
+
+ <string name="message_dialog_import_config">Restore desktop configuration? ADW.Launcher will be restarted.</string>
+ <string name="dbfile_import_dialog">Restoring desktop configuration...</string>
+ <string name="dbfile_not_found">Configuration file not found!</string>
+ <string name="dbfile_not_readable">Configuration file exists, but is not readable!</string>
+ <string name="dbfile_import_success">Configuration restored successfully!</string>
+ <string name="dbfile_import_error">Error restoring configuration!</string>
</resources>
@@ -166,8 +166,31 @@
android:title="@string/pref_title_icon_highlights_focus"
android:summary="@string/pref_summary_icon_highlights_focus"
android:defaultValue="-16777216" />
-
</PreferenceScreen>
+ <PreferenceScreen
+ android:key="xmlPreferences"
+ android:title="@string/pref_title_import_export">
+ <PreferenceCategory android:title="@string/pref_title_xml">
+ <Preference
+ android:title="@string/pref_title_xml_export"
+ android:summary="@string/pref_summary_xml_export"
+ android:key="xml_export" />
+ <Preference
+ android:title="@string/pref_title_xml_import"
+ android:summary="@string/pref_summary_xml_import"
+ android:key="xml_import" />
+ </PreferenceCategory>
+ <PreferenceCategory android:title="@string/pref_title_db">
+ <Preference
+ android:title="@string/pref_title_db_export"
+ android:summary="@string/pref_summary_db_export"
+ android:key="db_export" />
+ <Preference
+ android:title="@string/pref_title_db_import"
+ android:summary="@string/pref_summary_db_import"
+ android:key="db_import" />
+ </PreferenceCategory>
+ </PreferenceScreen>
<PreferenceCategory android:title="@string/pref_title_build_info">
<Preference
android:key="donatePref"
@@ -52,7 +52,7 @@ private static Drawable oldSelector(Context context){
StateListDrawable drawable=new StateListDrawable();
Resources res = context.getResources();
- mDrawPressed=(NinePatchDrawable) res.getDrawable(R.drawable.pressed_application_background);
+ mDrawPressed=res.getDrawable(R.drawable.pressed_application_background);
mDrawSelected=res.getDrawable(R.drawable.focused_application_background);
//TODO:ADW This doesn't work and i don't know why
//So for now i'll use only one colour for tinting both drawables
@@ -2745,8 +2745,6 @@ public void dismissPreviews(){
if(newPreviews){
hideDesktop(false);
showingPreviews=false;
- mWorkspace.unlock();
- mWorkspace.invalidate();
//mDesktopLocked=false;
mWorkspace.openSense(false);
}else{
@@ -2813,8 +2811,6 @@ public void showPreviews(final View anchor, int start, int end) {
showingPreviews=true;
hideDesktop(true);
mWorkspace.lock();
- //mDesktopLocked=true;
- mWorkspace.invalidate();
mWorkspace.openSense(true);
}else{
//check first if it's already open
Oops, something went wrong.

0 comments on commit 4019c1f

Please sign in to comment.