PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5a201b78: Merge change 27473 into eclair

Browse Source 
Merge commit '5a201b787233a7e2b9b4bf6f84ab14b2cd3eec74' into eclair-plus-aosp

* commit '5a201b787233a7e2b9b4bf6f84ab14b2cd3eec74':
  Rename empty view so that the standard list view implementation
This commit is contained in:
Suchi Amalapurapu
2009-09-28 13:19:01 -07:00
committed by Android Git Automerger
parent ea7f30ffc4 5a201b7872
commit b20be6e24a
2 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/compute_sizes.xml
View File

@@ -23,7 +23,7 @@
android:drawSelectorOnTop="false" android:drawSelectorOnTop="false"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView android:id="@+id/empty_view" <TextView android:id="@android:id/empty"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="20dip" android:paddingLeft="20dip"

16
src/com/android/settings/ManageApplications.java
View File

@@ -212,9 +212,6 @@ public class ManageApplications extends ListActivity implements
// Cache application attributes // Cache application attributes
private AppInfoCache mCache = new AppInfoCache(); private AppInfoCache mCache = new AppInfoCache();
// empty message displayed when list is empty
private TextView mEmptyView;
// Boolean variables indicating state // Boolean variables indicating state
private boolean mLoadLabels = false; private boolean mLoadLabels = false;
private boolean mSizesFirst = false; private boolean mSizesFirst = false;
@@ -776,17 +773,6 @@ public class ManageApplications extends ListActivity implements
} }
} }
private void showEmptyViewIfListEmpty() {
if (localLOGV) Log.i(TAG, "Checking for empty view");
if (mAppInfoAdapter.getCount() > 0) {
mListView.setVisibility(View.VISIBLE);
mEmptyView.setVisibility(View.GONE);
} else {
mListView.setVisibility(View.GONE);
mEmptyView.setVisibility(View.VISIBLE);
}
}
// internal structure used to track added and deleted packages when // internal structure used to track added and deleted packages when
// the activity has focus // the activity has focus
static class AddRemoveInfo { static class AddRemoveInfo {
@@ -1192,7 +1178,6 @@ public class ManageApplications extends ListActivity implements
} else { } else {
notifyDataSetChanged(); notifyDataSetChanged();
} }
showEmptyViewIfListEmpty();
return true; return true;
} }
@@ -1594,7 +1579,6 @@ public class ManageApplications extends ListActivity implements
// initialize the inflater // initialize the inflater
mInflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE); mInflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
mReceiver = new PackageIntentReceiver(); mReceiver = new PackageIntentReceiver();
mEmptyView = (TextView) findViewById(R.id.empty_view);
mObserver = new PkgSizeObserver(); mObserver = new PkgSizeObserver();
// Create adapter and list view here // Create adapter and list view here
List<ApplicationInfo> appList = getInstalledApps(mSortOrder); List<ApplicationInfo> appList = getInstalledApps(mSortOrder);