From 776ad3f540385dc9f03770a759b2aa960230a624 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 9 May 2014 13:35:49 -0400 Subject: [PATCH] use only android-14 items in SelectLocalApps until appcompat-v7 is added Set android-14 as minimum for SelectLocalApps and make sure that everything will work on >= 14. fixes #26 https://gitlab.com/fdroid/fdroidclient/issues/26 --- res/layout/select_local_apps_list_item.xml | 8 ++++---- src/org/fdroid/fdroid/views/LocalRepoActivity.java | 2 +- .../fdroid/views/fragments/SelectLocalAppsFragment.java | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/res/layout/select_local_apps_list_item.xml b/res/layout/select_local_apps_list_item.xml index eb77c8fd7..895d3a3a1 100644 --- a/res/layout/select_local_apps_list_item.xml +++ b/res/layout/select_local_apps_list_item.xml @@ -27,8 +27,8 @@ @@ -41,8 +41,8 @@ android:id="@+id/application_label" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="?android:attr/listPreferredItemPaddingStart" - android:layout_marginStart="?android:attr/listPreferredItemPaddingStart" + android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft" + android:layout_marginStart="?android:attr/listPreferredItemPaddingLeft" android:layout_marginTop="6dip" android:textAppearance="?android:attr/textAppearanceListItem" /> diff --git a/src/org/fdroid/fdroid/views/LocalRepoActivity.java b/src/org/fdroid/fdroid/views/LocalRepoActivity.java index 5e1ffc23a..aaf7695d0 100644 --- a/src/org/fdroid/fdroid/views/LocalRepoActivity.java +++ b/src/org/fdroid/fdroid/views/LocalRepoActivity.java @@ -139,7 +139,7 @@ public class LocalRepoActivity extends Activity { public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.local_repo_activity, menu); - if (Build.VERSION.SDK_INT < 11) // TODO remove after including appcompat-v7 + if (Build.VERSION.SDK_INT < 14) // TODO remove after including appcompat-v7 menu.findItem(R.id.menu_setup_repo).setVisible(false); return true; } diff --git a/src/org/fdroid/fdroid/views/fragments/SelectLocalAppsFragment.java b/src/org/fdroid/fdroid/views/fragments/SelectLocalAppsFragment.java index 87d692f9d..24b254cc6 100644 --- a/src/org/fdroid/fdroid/views/fragments/SelectLocalAppsFragment.java +++ b/src/org/fdroid/fdroid/views/fragments/SelectLocalAppsFragment.java @@ -86,7 +86,6 @@ public class SelectLocalAppsFragment extends ListFragment @Override public boolean setViewValue(View view, Cursor cursor, int columnIndex) { - Log.i("SelectLocalAppsFragment", "ViewBinder " + columnIndex); if (columnIndex == cursor.getColumnIndex(InstalledAppProvider.DataColumns.APP_ID)) { String packageName = cursor.getString(columnIndex); TextView textView = (TextView) view.findViewById(R.id.package_name);