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

Merge branch 'master' of gitorious.org:f-droid/fdroidclient

Browse Source
This commit is contained in:
Ciaran Gultnieks 2013-07-11 13:55:40 +01:00
commit 79b789d2c0
7 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout-land/appdetails.xml
View File

@ -65,6 +65,7 @@
android:id="@android:id/list" android:id="@android:id/list"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_weight="0.5" /> android:layout_weight="0.5"
android:scrollbars="none" />
</LinearLayout> </LinearLayout>

3
res/layout/appdetails.xml
View File

@ -62,6 +62,7 @@
<ListView <ListView
android:id="@android:id/list" android:id="@android:id/list"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" /> android:layout_height="fill_parent"
android:scrollbars="none" />
</LinearLayout> </LinearLayout>

6
res/layout/applistitem.xml
View File

@ -14,6 +14,8 @@
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginRight="2dp"
android:layout_marginEnd="2dp"
android:padding="4dp"/> android:padding="4dp"/>
<LinearLayout android:id="@+id/status_icons" <LinearLayout android:id="@+id/status_icons"
@ -51,9 +53,7 @@
android:layout_toLeftOf="@id/status_icons" android:layout_toLeftOf="@id/status_icons"
android:layout_toStartOf="@id/status_icons" android:layout_toStartOf="@id/status_icons"
android:paddingTop="4dp" android:paddingTop="4dp"
android:paddingBottom="2dp" android:paddingBottom="2dp" />
android:paddingLeft="1dp"
android:paddingStart="1dp"/>
<TextView android:id="@+id/license" <TextView android:id="@+id/license"
android:textSize="12sp" android:textSize="12sp"

8
src/org/fdroid/fdroid/AppDetails.java
View File

@ -181,8 +181,10 @@ public class AppDetails extends ListActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if (Utils.hasApi(11)) if (Utils.hasApi(11)) {
getActionBar().setDisplayShowTitleEnabled(false);
getActionBar().setDisplayHomeAsUpEnabled(true); getActionBar().setDisplayHomeAsUpEnabled(true);
}
setContentView(R.layout.appdetails); setContentView(R.layout.appdetails);
@ -546,8 +548,8 @@ public class AppDetails extends ListActivity {
toShow.add(menu.add(Menu.NONE, INSTALL, 1, R.string.menu_install).setIcon( toShow.add(menu.add(Menu.NONE, INSTALL, 1, R.string.menu_install).setIcon(
android.R.drawable.ic_menu_add)); android.R.drawable.ic_menu_add));
} else { } else {
menu.add(Menu.NONE, UNINSTALL, 1, R.string.menu_uninstall).setIcon( toShow.add(menu.add(Menu.NONE, UNINSTALL, 1, R.string.menu_uninstall).setIcon(
android.R.drawable.ic_menu_delete); android.R.drawable.ic_menu_delete));
if (mPm.getLaunchIntentForPackage(app.id) != null) { if (mPm.getLaunchIntentForPackage(app.id) != null) {
toShow.add(menu.add( Menu.NONE, LAUNCH, 1, R.string.menu_launch ).setIcon( toShow.add(menu.add( Menu.NONE, LAUNCH, 1, R.string.menu_launch ).setIcon(

7
src/org/fdroid/fdroid/SearchResults.java
View File

@ -131,12 +131,7 @@ public class SearchResults extends ListActivity {
for (DB.App app : apps) { for (DB.App app : apps) {
applist.addItem(app); applist.addItem(app);
} }
if (Utils.hasApi(11)) { getListView().setFastScrollEnabled(true);
getListView().setFastScrollAlwaysVisible(true);
getListView().setScrollBarStyle(View.SCROLLBARS_INSIDE_INSET);
} else {
getListView().setFastScrollEnabled(true);
}
applist.notifyDataSetChanged(); applist.notifyDataSetChanged();
setListAdapter(applist); setListAdapter(applist);

1
src/org/fdroid/fdroid/views/AppListAdapter.java
View File

@ -115,6 +115,7 @@ abstract public class AppListAdapter extends BaseAdapter {
else else
summaryLayout.addRule(RelativeLayout.RIGHT_OF, R.id.icon); summaryLayout.addRule(RelativeLayout.RIGHT_OF, R.id.icon);
summary.setLayoutParams(summaryLayout); summary.setLayoutParams(summaryLayout);
summary.setPadding(0,0,0,0);
} }
} }

7
src/org/fdroid/fdroid/views/fragments/AppListFragment.java
View File

@ -49,12 +49,7 @@ abstract class AppListFragment extends Fragment implements AdapterView.OnItemCli
protected ListView createAppListView() { protected ListView createAppListView() {
ListView list = new ListView(getActivity()); ListView list = new ListView(getActivity());
if (Utils.hasApi(11)) { list.setVerticalScrollBarEnabled(false);
list.setFastScrollAlwaysVisible(true);
list.setScrollBarStyle(View.SCROLLBARS_INSIDE_INSET);
} else {
list.setFastScrollEnabled(true);
}
list.setOnItemClickListener(this); list.setOnItemClickListener(this);
list.setAdapter(getAppListAdapter()); list.setAdapter(getAppListAdapter());
return list; return list;