diff options
Diffstat (limited to 'android/source/src/java/org/libreoffice/ui')
4 files changed, 14 insertions, 32 deletions
diff --git a/android/source/src/java/org/libreoffice/ui/FileUtilities.java b/android/source/src/java/org/libreoffice/ui/FileUtilities.java index e2df3f0021d9..3455b9c0742a 100644 --- a/android/source/src/java/org/libreoffice/ui/FileUtilities.java +++ b/android/source/src/java/org/libreoffice/ui/FileUtilities.java @@ -8,8 +8,6 @@ */ package org.libreoffice.ui; -import org.libreoffice.R; - import org.libreoffice.storage.IFile; import java.io.File; diff --git a/android/source/src/java/org/libreoffice/ui/FolderIconView.java b/android/source/src/java/org/libreoffice/ui/FolderIconView.java index 1c2b25f36766..004e5e9a8190 100644 --- a/android/source/src/java/org/libreoffice/ui/FolderIconView.java +++ b/android/source/src/java/org/libreoffice/ui/FolderIconView.java @@ -8,15 +8,11 @@ */ package org.libreoffice.ui; -import org.libreoffice.R; - import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; import android.graphics.Paint; -import android.graphics.Paint.Style; -import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Color; import android.util.AttributeSet; @@ -100,7 +96,7 @@ public class FolderIconView extends View{ for (File file : contents) { if (!FileUtilities.isThumbnail(file)) continue; - thumbs.push(factory.decodeFile(file.getAbsolutePath()));//TODO switch to push for semantics + thumbs.push(BitmapFactory.decodeFile(file.getAbsolutePath()));//TODO switch to push for semantics if (thumbs.size() > 3) break; } diff --git a/android/source/src/java/org/libreoffice/ui/GridItemAdapter.java b/android/source/src/java/org/libreoffice/ui/GridItemAdapter.java index c50d3a3edd59..d1e4278aee19 100644 --- a/android/source/src/java/org/libreoffice/ui/GridItemAdapter.java +++ b/android/source/src/java/org/libreoffice/ui/GridItemAdapter.java @@ -9,15 +9,6 @@ package org.libreoffice.ui; -import org.libreoffice.R; -import org.libreoffice.storage.IFile; - - -import java.io.File; -import java.nio.ByteBuffer; -import java.nio.IntBuffer; -import java.util.List; - import android.content.Context; import android.util.Log; import android.view.LayoutInflater; @@ -26,12 +17,11 @@ import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.ImageView; import android.widget.TextView; -import android.graphics.BitmapFactory; -import android.graphics.Bitmap; -import android.graphics.BlurMaskFilter; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Color; + +import org.libreoffice.R; +import org.libreoffice.storage.IFile; + +import java.util.List; public class GridItemAdapter extends BaseAdapter { Context mContext; @@ -69,7 +59,7 @@ public class GridItemAdapter extends BaseAdapter { if (convertView == null) { gridView = new View(mContext); } else { - gridView = (View) convertView; + gridView = convertView; } // get layout from mobile.xml diff --git a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java index 72d2e82800b5..5290a50cf7b8 100644 --- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java +++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java @@ -15,8 +15,6 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.database.DataSetObserver; -import android.graphics.Shader; -import android.graphics.drawable.BitmapDrawable; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; @@ -24,8 +22,8 @@ import android.os.Handler; import android.preference.PreferenceManager; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBar; -import android.support.v7.app.ActionBarActivity; import android.support.v7.app.ActionBarDrawerToggle; +import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.ContextMenu; @@ -68,7 +66,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -public class LibreOfficeUIActivity extends ActionBarActivity implements ActionBar.OnNavigationListener { +public class LibreOfficeUIActivity extends AppCompatActivity implements ActionBar.OnNavigationListener { private String LOGTAG = LibreOfficeUIActivity.class.getSimpleName(); private SharedPreferences prefs; private int filterMode = FileUtilities.ALL; @@ -464,7 +462,7 @@ public class LibreOfficeUIActivity extends ActionBarActivity implements ActionBa MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.view_menu, menu); - MenuItem item = (MenuItem)menu.findItem(R.id.menu_view_toggle); + MenuItem item = menu.findItem(R.id.menu_view_toggle); if (viewMode == GRID_VIEW) { item.setTitle(R.string.list_view); item.setIcon(R.drawable.light_view_as_list); @@ -473,21 +471,21 @@ public class LibreOfficeUIActivity extends ActionBarActivity implements ActionBa item.setIcon(R.drawable.light_view_as_grid); } - item = (MenuItem)menu.findItem(R.id.menu_sort_size); + item = menu.findItem(R.id.menu_sort_size); if (sortMode == FileUtilities.SORT_LARGEST) { item.setTitle(R.string.sort_smallest); } else { item.setTitle(R.string.sort_largest); } - item = (MenuItem)menu.findItem(R.id.menu_sort_az); + item = menu.findItem(R.id.menu_sort_az); if (sortMode == FileUtilities.SORT_AZ) { item.setTitle(R.string.sort_za); } else { item.setTitle(R.string.sort_az); } - item = (MenuItem)menu.findItem(R.id.menu_sort_modified); + item = menu.findItem(R.id.menu_sort_modified); if (sortMode == FileUtilities.SORT_NEWEST) { item.setTitle(R.string.sort_oldest); } else { @@ -721,7 +719,7 @@ public class LibreOfficeUIActivity extends ActionBarActivity implements ActionBa listItem = new View(mContext); listItem = inflater.inflate(R.layout.file_list_item, null); } else { - listItem = (View) convertView; + listItem = convertView; } final int pos = position; listItem.setClickable(true); |