[Libreoffice-commits] core.git: android/experimental

[Jacobo Aragunde Pérez]

 android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml         |   36 ----------
 android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java |    8 --
 2 files changed, 44 deletions(-)

New commits:
commit f3eccc655387b47fb0986558b8835588eee2898d
Author: Jacobo Aragunde Pérez <jaragunde at igalia.com>
Date:   Tue Feb 3 18:19:32 2015 +0000

    tdf#87432: normal icons for folders in android doc browser
    
    The code used to draw a black circle and populate it with thumbnails
    of the documents inside the folder, but they are always empty because
    we are not generating any thumbnails.
    
    Change-Id: Id0b63f7e901525b5a962d12441cda84dfeb59d52

diff --git a/android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml b/android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml
deleted file mode 100644
index 4271ac4..0000000
--- a/android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- This file is part of the LibreOffice project.
- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <org.libreoffice.ui.FolderIconView
-        android:id="@+id/folder_icon"
-        android:layout_width="100dp"
-        android:layout_height="142dp"
-        android:paddingTop="15dp"
-        android:paddingBottom="10dp"
-        android:layout_gravity="center" >
-    </org.libreoffice.ui.FolderIconView>
-
-    <TextView
-        android:id="@+id/grid_item_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@+id/label"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:layout_gravity="center"
-        android:textSize="15dp"
-        android:textStyle="bold"
-        android:textColor="@android:color/secondary_text_light"
-        android:maxLines="2">
-    </TextView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
index 621ccef..9307851 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
@@ -101,14 +101,6 @@ public class GridItemAdapter extends BaseAdapter {
         {
             // Default view is a generic folder icon.
             imageView.setImageResource(R.drawable.folder);
-            // How should we handle empty folders / folders with no thumbnails? -> new files
-            gridView =  inflater.inflate(R.layout.file_explorer_folder_icon, null);
-            org.libreoffice.ui.FolderIconView icon =
-                (org.libreoffice.ui.FolderIconView)gridView.findViewById(R.id.folder_icon);
-            // icon.setDir( filePaths[position]);
-            textView = (TextView) gridView.findViewById(R.id.grid_item_label);
-            textView.setText(filePaths.get(position).getName());
-            return gridView;
         }
         else
         {