Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use only android-14 items in SelectLocalApps until appcompat-v7 is added

Browse Source 
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
This commit is contained in:
Hans-Christoph Steiner 2014-05-09 13:35:49 -04:00
parent c7e1d4af7e
commit 776ad3f540
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
res/layout/select_local_apps_list_item.xml
View File

@ -27,8 +27,8 @@
<ImageView <ImageView
android:layout_width="48dip" android:layout_width="48dip"
android:layout_height="48dip" android:layout_height="48dip"
android:layout_marginLeft="?android:attr/listPreferredItemPaddingStart" android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft"
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart" android:layout_marginStart="?android:attr/listPreferredItemPaddingLeft"
android:layout_marginTop="6dip" android:layout_marginTop="6dip"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
@ -41,8 +41,8 @@
android:id="@+id/application_label" android:id="@+id/application_label"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="?android:attr/listPreferredItemPaddingStart" android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft"
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart" android:layout_marginStart="?android:attr/listPreferredItemPaddingLeft"
android:layout_marginTop="6dip" android:layout_marginTop="6dip"
android:textAppearance="?android:attr/textAppearanceListItem" /> android:textAppearance="?android:attr/textAppearanceListItem" />

2
src/org/fdroid/fdroid/views/LocalRepoActivity.java
View File

@ -139,7 +139,7 @@ public class LocalRepoActivity extends Activity {
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater(); MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.local_repo_activity, menu); 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); menu.findItem(R.id.menu_setup_repo).setVisible(false);
return true; return true;
} }

1
src/org/fdroid/fdroid/views/fragments/SelectLocalAppsFragment.java
View File

@ -86,7 +86,6 @@ public class SelectLocalAppsFragment extends ListFragment
@Override @Override
public boolean setViewValue(View view, Cursor cursor, int columnIndex) { public boolean setViewValue(View view, Cursor cursor, int columnIndex) {
Log.i("SelectLocalAppsFragment", "ViewBinder " + columnIndex);
if (columnIndex == cursor.getColumnIndex(InstalledAppProvider.DataColumns.APP_ID)) { if (columnIndex == cursor.getColumnIndex(InstalledAppProvider.DataColumns.APP_ID)) {
String packageName = cursor.getString(columnIndex); String packageName = cursor.getString(columnIndex);
TextView textView = (TextView) view.findViewById(R.id.package_name); TextView textView = (TextView) view.findViewById(R.id.package_name);