summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-09-28 14:46:24 -0400
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-09-28 14:46:24 -0400
commit5a201b787233a7e2b9b4bf6f84ab14b2cd3eec74 (patch)
tree7d179edf2f25b1f1bf3cf00b86d5a9bb955eea34
parent5928da682a31f3375a206d551c478d76437bb7cf (diff)
parent78c69095eac147b60ce4ea5685c2dfcb4448c9f4 (diff)
downloadpackages_apps_settings-5a201b787233a7e2b9b4bf6f84ab14b2cd3eec74.zip
packages_apps_settings-5a201b787233a7e2b9b4bf6f84ab14b2cd3eec74.tar.gz
packages_apps_settings-5a201b787233a7e2b9b4bf6f84ab14b2cd3eec74.tar.bz2
Merge change 27473 into eclair
* changes: Rename empty view so that the standard list view implementation displays empty list message when list goes empty. Ideally the list is not empty for running processes and All filter options. so the message is just set to third party apps Remove the empty list view logic from code base
-rwxr-xr-xres/layout/compute_sizes.xml2
-rw-r--r--src/com/android/settings/ManageApplications.java16
2 files changed, 1 insertions, 17 deletions
diff --git a/res/layout/compute_sizes.xml b/res/layout/compute_sizes.xml
index 1c8e966..b32ba58 100755
--- a/res/layout/compute_sizes.xml
+++ b/res/layout/compute_sizes.xml
@@ -23,7 +23,7 @@
android:drawSelectorOnTop="false"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
- <TextView android:id="@+id/empty_view"
+ <TextView android:id="@android:id/empty"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingLeft="20dip"
diff --git a/src/com/android/settings/ManageApplications.java b/src/com/android/settings/ManageApplications.java
index 21647a8..a71d17b 100644
--- a/src/com/android/settings/ManageApplications.java
+++ b/src/com/android/settings/ManageApplications.java
@@ -212,9 +212,6 @@ public class ManageApplications extends ListActivity implements
// Cache application attributes
private AppInfoCache mCache = new AppInfoCache();
- // empty message displayed when list is empty
- private TextView mEmptyView;
-
// Boolean variables indicating state
private boolean mLoadLabels = 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
// the activity has focus
static class AddRemoveInfo {
@@ -1192,7 +1178,6 @@ public class ManageApplications extends ListActivity implements
} else {
notifyDataSetChanged();
}
- showEmptyViewIfListEmpty();
return true;
}
@@ -1594,7 +1579,6 @@ public class ManageApplications extends ListActivity implements
// initialize the inflater
mInflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
mReceiver = new PackageIntentReceiver();
- mEmptyView = (TextView) findViewById(R.id.empty_view);
mObserver = new PkgSizeObserver();
// Create adapter and list view here
List<ApplicationInfo> appList = getInstalledApps(mSortOrder);