diff options
| author | Mihai Preda <preda@google.com> | 2009-04-28 14:24:47 +0200 |
|---|---|---|
| committer | Mihai Preda <preda@google.com> | 2009-04-29 11:06:20 +0200 |
| commit | 83817df9b28943c0587388ea30b440f4b0744313 (patch) | |
| tree | 5217ac9e23d2addc775ed040bd5f97051e2651bd /src/com | |
| parent | 33424c9f544f0993c801e65c7cc88781cb5de562 (diff) | |
| download | packages_apps_Browser-83817df9b28943c0587388ea30b440f4b0744313.tar.gz packages_apps_Browser-83817df9b28943c0587388ea30b440f4b0744313.tar.bz2 packages_apps_Browser-83817df9b28943c0587388ea30b440f4b0744313.zip | |
Use ViewStub for setEmptyView (bug 1803058)
and use <merge> instead of FrameLayout
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/browser/BrowserDownloadPage.java | 8 | ||||
| -rw-r--r-- | src/com/android/browser/BrowserHistoryPage.java | 4 | ||||
| -rw-r--r-- | src/com/android/browser/MostVisitedActivity.java | 4 |
3 files changed, 6 insertions, 10 deletions
diff --git a/src/com/android/browser/BrowserDownloadPage.java b/src/com/android/browser/BrowserDownloadPage.java index 977683479..22e0e652c 100644 --- a/src/com/android/browser/BrowserDownloadPage.java +++ b/src/com/android/browser/BrowserDownloadPage.java @@ -66,11 +66,7 @@ public class BrowserDownloadPage extends Activity setTitle(getText(R.string.download_title)); mListView = (ListView) findViewById(R.id.list); - LayoutInflater factory = LayoutInflater.from(this); - View v = factory.inflate(R.layout.no_downloads, null); - addContentView(v, new LayoutParams(LayoutParams.FILL_PARENT, - LayoutParams.FILL_PARENT)); - mListView.setEmptyView(v); + mListView.setEmptyView(findViewById(R.id.empty)); mDownloadCursor = managedQuery(Downloads.CONTENT_URI, new String [] {"_id", Downloads.COLUMN_TITLE, Downloads.COLUMN_STATUS, @@ -93,7 +89,7 @@ public class BrowserDownloadPage extends Activity // Create a list "controller" for the data mDownloadAdapter = new BrowserDownloadAdapter(this, R.layout.browser_download_item, mDownloadCursor); - + mListView.setAdapter(mDownloadAdapter); mListView.setScrollBarStyle(View.SCROLLBARS_INSIDE_INSET); mListView.setOnCreateContextMenuListener(this); diff --git a/src/com/android/browser/BrowserHistoryPage.java b/src/com/android/browser/BrowserHistoryPage.java index 42ca84809..368decf00 100644 --- a/src/com/android/browser/BrowserHistoryPage.java +++ b/src/com/android/browser/BrowserHistoryPage.java @@ -41,6 +41,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; import android.view.ContextMenu.ContextMenuInfo; +import android.view.ViewStub; import android.webkit.DateSorter; import android.webkit.WebIconDatabase.IconListener; import android.widget.AdapterView; @@ -110,8 +111,7 @@ public class BrowserHistoryPage extends ExpandableListActivity { setListAdapter(mAdapter); final ExpandableListView list = getExpandableListView(); list.setOnCreateContextMenuListener(this); - LayoutInflater factory = LayoutInflater.from(this); - View v = factory.inflate(R.layout.empty_history, null); + View v = new ViewStub(this, R.layout.empty_history); addContentView(v, new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT)); list.setEmptyView(v); diff --git a/src/com/android/browser/MostVisitedActivity.java b/src/com/android/browser/MostVisitedActivity.java index 704ee279f..f0d1c7f8a 100644 --- a/src/com/android/browser/MostVisitedActivity.java +++ b/src/com/android/browser/MostVisitedActivity.java @@ -35,6 +35,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; +import android.view.ViewStub; import java.util.Vector; @@ -50,8 +51,7 @@ public class MostVisitedActivity extends ListActivity { .addListener(new IconReceiver()); setListAdapter(mAdapter); ListView list = getListView(); - LayoutInflater factory = LayoutInflater.from(this); - View v = factory.inflate(R.layout.empty_history, null); + View v = new ViewStub(this, R.layout.empty_history); addContentView(v, new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT)); list.setEmptyView(v); |