diff options
-rw-r--r-- | WallpaperPicker/res/values-am/strings.xml | 6 | ||||
-rw-r--r-- | WallpaperPicker/res/values-th/strings.xml | 2 | ||||
-rw-r--r-- | WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java | 9 | ||||
-rw-r--r-- | res/values-pt/strings.xml | 42 | ||||
-rw-r--r-- | src/com/android/launcher3/AutoInstallsLayout.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/BubbleTextView.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 8 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherFiles.java | 27 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher3/WidgetPreviewLoader.java | 8 |
10 files changed, 68 insertions, 42 deletions
diff --git a/WallpaperPicker/res/values-am/strings.xml b/WallpaperPicker/res/values-am/strings.xml index 59c3bf733..394161634 100644 --- a/WallpaperPicker/res/values-am/strings.xml +++ b/WallpaperPicker/res/values-am/strings.xml @@ -19,7 +19,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="wallpaper_instructions" msgid="3524143401182707094">"ልጣፍ አዘጋጅ"</string> + <string name="wallpaper_instructions" msgid="3524143401182707094">"የግድግዳ ወረቀት አዘጋጅ"</string> <string name="image_load_fail" msgid="7538534580694411837">"ምስሉን መጫን አልተቻለም"</string> <string name="wallpaper_load_fail" msgid="4800700444605404650">"ምስሉን እንደ ግድግዳ ወረቀት መጫን አልተቻለም"</string> <plurals name="number_of_items_selected"> @@ -27,10 +27,10 @@ <item quantity="one" msgid="8409622005831789373">"%1$d ተመርጧል"</item> <item quantity="other" msgid="479468347731745357">"%1$d ተመርጧል"</item> </plurals> - <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"ልጣፍ %1$d የ%2$d"</string> + <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"የግድግዳ ወረቀት %1$d የ%2$d"</string> <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> ተመርጧል"</string> <string name="wallpaper_delete" msgid="1459353972739215344">"ሰርዝ"</string> <string name="pick_image" msgid="6704438906027442697">"ምስል ይምረጡ"</string> <string name="pick_wallpaper" msgid="4628969645948454559">"የግድግዳ ወረቀቶች"</string> - <string name="crop_wallpaper" msgid="4882870800623585836">"ልጣፍ ይከርክሙ"</string> + <string name="crop_wallpaper" msgid="4882870800623585836">"የግድግዳ ወረቀት ይከርክሙ"</string> </resources> diff --git a/WallpaperPicker/res/values-th/strings.xml b/WallpaperPicker/res/values-th/strings.xml index 6b4c23536..c81720563 100644 --- a/WallpaperPicker/res/values-th/strings.xml +++ b/WallpaperPicker/res/values-th/strings.xml @@ -29,7 +29,7 @@ </plurals> <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"วอลเปเปอร์ %1$d จาก %2$d"</string> <string name="announce_selection" msgid="123723511662250539">"เลือก <xliff:g id="LABEL">%1$s</xliff:g> แล้ว"</string> - <string name="wallpaper_delete" msgid="1459353972739215344">"ลบ"</string> + <string name="wallpaper_delete" msgid="1459353972739215344">"นำออก"</string> <string name="pick_image" msgid="6704438906027442697">"เลือกรูปภาพ"</string> <string name="pick_wallpaper" msgid="4628969645948454559">"วอลเปเปอร์"</string> <string name="crop_wallpaper" msgid="4882870800623585836">"ครอบตัดวอลเปเปอร์"</string> diff --git a/WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java b/WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java index 2bdf8f1cd..9f92bc105 100644 --- a/WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java +++ b/WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java @@ -180,7 +180,6 @@ public class SavedWallpaperImages extends BaseAdapter implements ListAdapter { static class ImageDb extends SQLiteOpenHelper { final static int DB_VERSION = 1; - final static String DB_NAME = "saved_wallpaper_images.db"; final static String TABLE_NAME = "saved_wallpaper_images"; final static String COLUMN_ID = "id"; final static String COLUMN_IMAGE_THUMBNAIL_FILENAME = "image_thumbnail"; @@ -189,7 +188,8 @@ public class SavedWallpaperImages extends BaseAdapter implements ListAdapter { Context mContext; public ImageDb(Context context) { - super(context, context.getDatabasePath(DB_NAME).getPath(), null, DB_VERSION); + super(context, context.getDatabasePath(LauncherFiles.WALLPAPER_IMAGES_DB).getPath(), + null, DB_VERSION); // Store the context for later use mContext = context; } @@ -197,8 +197,9 @@ public class SavedWallpaperImages extends BaseAdapter implements ListAdapter { public static void moveFromCacheDirectoryIfNecessary(Context context) { // We used to store the saved images in the cache directory, but that meant they'd get // deleted sometimes-- move them to the data directory - File oldSavedImagesFile = new File(context.getCacheDir(), ImageDb.DB_NAME); - File savedImagesFile = context.getDatabasePath(ImageDb.DB_NAME); + File oldSavedImagesFile = new File(context.getCacheDir(), + LauncherFiles.WALLPAPER_IMAGES_DB); + File savedImagesFile = context.getDatabasePath(LauncherFiles.WALLPAPER_IMAGES_DB); if (oldSavedImagesFile.exists()) { oldSavedImagesFile.renameTo(savedImagesFile); } diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index ddbb25310..20b193aa3 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -21,9 +21,9 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="5181331383435256801">"Launcher3"</string> <string name="home" msgid="7658288663002113681">"Início"</string> - <string name="uid_name" msgid="7820867637514617527">"Principais apps do Android"</string> + <string name="uid_name" msgid="7820867637514617527">"Principais aplicativos do Android"</string> <string name="folder_name" msgid="7371454440695724752"></string> - <string name="activity_not_found" msgid="8071924732094499514">"O app não está instalado."</string> + <string name="activity_not_found" msgid="8071924732094499514">"O aplicativo não está instalado."</string> <string name="safemode_shortcut_error" msgid="9160126848219158407">"App transferido por download desativado no modo de segurança"</string> <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string> <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string> @@ -38,7 +38,7 @@ <string name="rename_action" msgid="5559600076028658757">"Ok"</string> <string name="cancel_action" msgid="7009134900002915310">"Cancelar"</string> <string name="menu_item_add_item" msgid="1264911265836810421">"Adicionar à tela inicial"</string> - <string name="group_applications" msgid="3797214114206693605">"Apps"</string> + <string name="group_applications" msgid="3797214114206693605">"Aplicativos"</string> <string name="group_shortcuts" msgid="6012256992764410535">"Atalhos"</string> <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string> <string name="completely_out_of_space" msgid="6106288382070760318">"Não há mais espaço nas telas iniciais."</string> @@ -49,49 +49,49 @@ <string name="shortcut_uninstalled" msgid="8176767991305701821">"O atalho \"<xliff:g id="NAME">%s</xliff:g>\" foi removido."</string> <string name="shortcut_duplicate" msgid="9167217446062498127">"O atalho \"<xliff:g id="NAME">%s</xliff:g>\" já existe."</string> <string name="title_select_shortcut" msgid="6680642571148153868">"Selecione um atalho"</string> - <string name="title_select_application" msgid="3280812711670683644">"Selecione um app"</string> - <string name="all_apps_button_label" msgid="9110807029020582876">"Apps"</string> + <string name="title_select_application" msgid="3280812711670683644">"Selecione um aplicativo"</string> + <string name="all_apps_button_label" msgid="9110807029020582876">"Aplicativos"</string> <string name="all_apps_home_button_label" msgid="252062713717058851">"Início"</string> <string name="delete_zone_label_workspace" msgid="4009607676751398685">"Remover"</string> <string name="delete_zone_label_all_apps" msgid="8083826390278958980">"Desinstalar"</string> <string name="delete_target_label" msgid="1822697352535677073">"Remover"</string> <string name="delete_target_uninstall_label" msgid="5100785476250872595">"Desinstalar"</string> - <string name="info_target_label" msgid="8053346143994679532">"Informações do app"</string> + <string name="info_target_label" msgid="8053346143994679532">"Informações do aplicativo"</string> <string name="accessibility_search_button" msgid="1628520399424565142">"Pesquisar"</string> <string name="accessibility_voice_search_button" msgid="4637324840434406584">"Pesquisa por voz"</string> - <string name="accessibility_all_apps_button" msgid="2603132375383800483">"Apps"</string> + <string name="accessibility_all_apps_button" msgid="2603132375383800483">"Aplicativos"</string> <string name="accessibility_delete_button" msgid="6466114477993744621">"Remover"</string> <string name="delete_zone_label_all_apps_system_app" msgid="449755632749610895">"Desinstalar atualização"</string> - <string name="cab_menu_delete_app" msgid="7435191475867183689">"Desinstalar app"</string> - <string name="cab_menu_app_info" msgid="8593722221450362342">"Detalhes do app"</string> - <string name="cab_app_selection_text" msgid="374688303047985416">"Um app selecionado"</string> + <string name="cab_menu_delete_app" msgid="7435191475867183689">"Desinstalar aplicativo"</string> + <string name="cab_menu_app_info" msgid="8593722221450362342">"Detalhes do aplicativo"</string> + <string name="cab_app_selection_text" msgid="374688303047985416">"Um aplicativo selecionado"</string> <string name="cab_widget_selection_text" msgid="1833458597831541241">"Um widget selecionado"</string> <string name="cab_folder_selection_text" msgid="7999992513806132118">"Uma pasta selecionada"</string> <string name="cab_shortcut_selection_text" msgid="2103811025667946450">"Um atalho selecionado"</string> <string name="permlab_install_shortcut" msgid="5632423390354674437">"instalar atalhos"</string> - <string name="permdesc_install_shortcut" msgid="923466509822011139">"Permite que um app adicione atalhos sem intervenção do usuário."</string> + <string name="permdesc_install_shortcut" msgid="923466509822011139">"Permite que um aplicativo adicione atalhos sem intervenção do usuário."</string> <string name="permlab_uninstall_shortcut" msgid="864595034498083837">"desinstalar atalhos"</string> - <string name="permdesc_uninstall_shortcut" msgid="5134129545001836849">"Permite que o app remova atalhos sem a intervenção do usuário."</string> + <string name="permdesc_uninstall_shortcut" msgid="5134129545001836849">"Permite que o aplicativo remova atalhos sem a intervenção do usuário."</string> <string name="permlab_read_settings" msgid="1941457408239617576">"ler configurações e atalhos da tela inicial"</string> - <string name="permdesc_read_settings" msgid="5833423719057558387">"Permite que o app leia as configurações e os atalhos na tela inicial."</string> + <string name="permdesc_read_settings" msgid="5833423719057558387">"Permite que o aplicativo leia as configurações e os atalhos na tela inicial."</string> <string name="permlab_write_settings" msgid="3574213698004620587">"gravar configurações e atalhos da tela inicial"</string> - <string name="permdesc_write_settings" msgid="5440712911516509985">"Permite que o app altere as configurações e os atalhos na tela inicial."</string> + <string name="permdesc_write_settings" msgid="5440712911516509985">"Permite que o aplicativo altere as configurações e os atalhos na tela inicial."</string> <string name="gadget_error_text" msgid="6081085226050792095">"Problema ao carregar o widget"</string> <string name="gadget_setup_text" msgid="8274003207686040488">"Configuração"</string> - <string name="uninstall_system_app_text" msgid="4172046090762920660">"Este é um app do sistema e não pode ser desinstalado."</string> + <string name="uninstall_system_app_text" msgid="4172046090762920660">"Este é um aplicativo do sistema e não pode ser desinstalado."</string> <string name="dream_name" msgid="1530253749244328964">"Rocket Launcher"</string> <string name="folder_hint_text" msgid="6617836969016293992">"Pasta sem nome"</string> <string name="workspace_description_format" msgid="2950174241104043327">"Tela inicial %1$d"</string> <string name="default_scroll_format" msgid="7475544710230993317">"Página %1$d de %2$d"</string> <string name="workspace_scroll_format" msgid="8458889198184077399">"Tela inicial %1$d de %2$d"</string> - <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Página de apps, %1$d de %2$d"</string> + <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Página de aplicativos, %1$d de %2$d"</string> <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Página de widgets, %1$d de %2$d"</string> <string name="first_run_cling_title" msgid="2459738000155917941">"Bem-vindo"</string> <string name="first_run_cling_description" msgid="6447072552696253358">"Fique à vontade."</string> <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string> <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string> - <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Crie mais telas para apps e pastas"</string> - <string name="migration_cling_title" msgid="9181776667882933767">"Copiar ícones de apps"</string> + <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Crie mais telas para aplicativos e pastas"</string> + <string name="migration_cling_title" msgid="9181776667882933767">"Copiar ícones de aplicativos"</string> <string name="migration_cling_description" msgid="2752413805582227644">"Importar ícones e pastas de suas telas iniciais antigas?"</string> <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIAR ÍCONES"</string> <string name="migration_cling_use_default" msgid="2626475813981258626">"COMEÇAR DO ZERO"</string> @@ -101,7 +101,7 @@ <string name="workspace_cling_longpress_description" msgid="4119994475505235248">"Toque e mantenha pressionado o segundo plano para personalizar"</string> <string name="workspace_cling_longpress_dismiss" msgid="368660286867640874">"ENTENDI"</string> <string name="folder_cling_title" msgid="3894908818693254164">"Aqui está uma pasta"</string> - <string name="folder_cling_create_folder" msgid="6158215559475836131">"Para criar uma pasta como esta, mantenha pressionado um app e mova-o para cima de outro."</string> + <string name="folder_cling_create_folder" msgid="6158215559475836131">"Para criar uma pasta como esta, mantenha pressionado um aplicativo e mova-o para cima de outro."</string> <string name="cling_dismiss" msgid="8962359497601507581">"Ok"</string> <string name="folder_opened" msgid="94695026776264709">"Pasta aberta, <xliff:g id="WIDTH">%1$d</xliff:g> por <xliff:g id="HEIGHT">%2$d</xliff:g>"</string> <string name="folder_tap_to_close" msgid="1884479294466410023">"Toque para fechar a pasta"</string> @@ -120,6 +120,6 @@ <string name="abandoned_clean_all" msgid="5256770727689657618">"Remover tudo"</string> <string name="abandoned_clean_this" msgid="7610119707847920412">"Remover"</string> <string name="abandoned_search" msgid="891119232568284442">"Pesquisar"</string> - <string name="abandoned_promises_title" msgid="7096178467971716750">"Este app não está instalado"</string> - <string name="abandoned_promise_explanation" msgid="3990027586878167529">"O app deste ícone não está instalado. Você pode remover o ícone, ou procurar o app e instalá-lo manualmente."</string> + <string name="abandoned_promises_title" msgid="7096178467971716750">"Este aplicativo não está instalado"</string> + <string name="abandoned_promise_explanation" msgid="3990027586878167529">"O aplicativo deste ícone não está instalado. Você pode remover o ícone, ou procurar o aplicativo e instalá-lo manualmente."</string> </resources> diff --git a/src/com/android/launcher3/AutoInstallsLayout.java b/src/com/android/launcher3/AutoInstallsLayout.java index 00f0cf36f..08ed89b43 100644 --- a/src/com/android/launcher3/AutoInstallsLayout.java +++ b/src/com/android/launcher3/AutoInstallsLayout.java @@ -142,7 +142,7 @@ public class AutoInstallsLayout implements WorkspaceLoader { mDb = db; try { return parseLayout(mRes, mLayoutId, screenIds); - } catch (XmlPullParserException | IOException | RuntimeException e) { + } catch (Exception e) { Log.w(TAG, "Got exception parsing layout.", e); return -1; } diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index a368796bd..73c7831f9 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -40,7 +40,7 @@ import android.widget.TextView; */ public class BubbleTextView extends TextView { - private static SparseArray<Theme> sPreloaderThemes = new SparseArray<>(2); + private static SparseArray<Theme> sPreloaderThemes = new SparseArray<Theme>(2); private static final float SHADOW_LARGE_RADIUS = 4.0f; private static final float SHADOW_SMALL_RADIUS = 1.75f; diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 6603dcedb..3b903c062 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -168,7 +168,6 @@ public class Launcher extends Activity static final int SCREEN_COUNT = 5; static final int DEFAULT_SCREEN = 2; - private static final String PREFERENCES = "launcher.preferences"; // To turn on these properties, type // adb shell setprop log.tag.PROPERTY_NAME [VERBOSE | SUPPRESS] static final String FORCE_ENABLE_ROTATION_PROPERTY = "launcher_force_rotate"; @@ -620,7 +619,7 @@ public class Launcher extends Activity private static void readConfiguration(Context context, LocaleConfiguration configuration) { DataInputStream in = null; try { - in = new DataInputStream(context.openFileInput(PREFERENCES)); + in = new DataInputStream(context.openFileInput(LauncherFiles.LAUNCHER_PREFS)); configuration.locale = in.readUTF(); configuration.mcc = in.readInt(); configuration.mnc = in.readInt(); @@ -642,7 +641,8 @@ public class Launcher extends Activity private static void writeConfiguration(Context context, LocaleConfiguration configuration) { DataOutputStream out = null; try { - out = new DataOutputStream(context.openFileOutput(PREFERENCES, MODE_PRIVATE)); + out = new DataOutputStream(context.openFileOutput( + LauncherFiles.LAUNCHER_PREFS, MODE_PRIVATE)); out.writeUTF(configuration.locale); out.writeInt(configuration.mcc); out.writeInt(configuration.mnc); @@ -651,7 +651,7 @@ public class Launcher extends Activity // Ignore } catch (IOException e) { //noinspection ResultOfMethodCallIgnored - context.getFileStreamPath(PREFERENCES).delete(); + context.getFileStreamPath(LauncherFiles.LAUNCHER_PREFS).delete(); } finally { if (out != null) { try { diff --git a/src/com/android/launcher3/LauncherFiles.java b/src/com/android/launcher3/LauncherFiles.java new file mode 100644 index 000000000..89600c2df --- /dev/null +++ b/src/com/android/launcher3/LauncherFiles.java @@ -0,0 +1,27 @@ +package com.android.launcher3; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +/** + * Central list of files the Launcher writes to the application data directory. + * + * To add a new Launcher file, create a String constant referring to the filename, and add it to + * ALL_FILES, as shown below. + */ +public class LauncherFiles { + + public static final String SHARED_PREFS = "com.android.launcher3.prefs.xml"; + public static final String LAUNCHER_DB = "launcher.db"; + public static final String LAUNCHER_PREFS = "launcher.preferences"; + public static final String WALLPAPER_IMAGES_DB = "saved_wallpaper_images.db"; + public static final String WIDGET_PREVIEWS_DB = "widgetpreviews.db"; + + public static final List<String> ALL_FILES = Collections.unmodifiableList(Arrays.asList( + SHARED_PREFS, + LAUNCHER_DB, + LAUNCHER_PREFS, + WALLPAPER_IMAGES_DB, + WIDGET_PREVIEWS_DB)); +} diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index c0e648758..4b27837c4 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -73,8 +73,6 @@ public class LauncherProvider extends ContentProvider { private static final String TAG = "Launcher.LauncherProvider"; private static final boolean LOGD = false; - private static final String DATABASE_NAME = "launcher.db"; - private static final int DATABASE_VERSION = 20; static final String OLD_AUTHORITY = "com.android.launcher2.settings"; @@ -431,7 +429,7 @@ public class LauncherProvider extends ContentProvider { private boolean mNewDbCreated = false; DatabaseHelper(Context context) { - super(context, DATABASE_NAME, null, DATABASE_VERSION); + super(context, LauncherFiles.LAUNCHER_DB, null, DATABASE_VERSION); mContext = context; mPackageManager = context.getPackageManager(); mAppWidgetHost = new AppWidgetHost(context, Launcher.APPWIDGET_HOST_ID); diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java index 5aa719027..92d7c7d7f 100644 --- a/src/com/android/launcher3/WidgetPreviewLoader.java +++ b/src/com/android/launcher3/WidgetPreviewLoader.java @@ -130,8 +130,8 @@ public class WidgetPreviewLoader { private final PaintCache mDefaultAppWidgetPreviewPaint = new PaintCache(); private final BitmapFactoryOptionsCache mCachedBitmapFactoryOptions = new BitmapFactoryOptionsCache(); - private final HashMap<String, WeakReference<Bitmap>> mLoadedPreviews = new HashMap<>(); - private final ArrayList<SoftReference<Bitmap>> mUnusedBitmaps = new ArrayList<>(); + private final HashMap<String, WeakReference<Bitmap>> mLoadedPreviews = new HashMap<String, WeakReference<Bitmap>>(); + private final ArrayList<SoftReference<Bitmap>> mUnusedBitmaps = new ArrayList<SoftReference<Bitmap>>(); private final Context mContext; private final int mAppIconSize; @@ -287,7 +287,6 @@ public class WidgetPreviewLoader { static class CacheDb extends SQLiteOpenHelper { final static int DB_VERSION = 2; - final static String DB_NAME = "widgetpreviews.db"; final static String TABLE_NAME = "shortcut_and_widget_previews"; final static String COLUMN_NAME = "name"; final static String COLUMN_SIZE = "size"; @@ -295,7 +294,8 @@ public class WidgetPreviewLoader { Context mContext; public CacheDb(Context context) { - super(context, new File(context.getCacheDir(), DB_NAME).getPath(), null, DB_VERSION); + super(context, new File(context.getCacheDir(), + LauncherFiles.WIDGET_PREVIEWS_DB).getPath(), null, DB_VERSION); // Store the context for later use mContext = context; } |