summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/browser')
-rw-r--r--src/com/android/browser/BrowserActivity.java16
-rw-r--r--src/com/android/browser/BrowserBookmarksPage.java8
-rw-r--r--src/com/android/browser/BrowserHistoryPage.java7
-rw-r--r--src/com/android/browser/BrowserHomepagePreference.java4
-rw-r--r--src/com/android/browser/FindDialog.java4
-rw-r--r--src/com/android/browser/MostVisitedActivity.java6
6 files changed, 17 insertions, 28 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 10f39e428..83ae6a0fb 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -738,7 +738,7 @@ public class BrowserActivity extends Activity
*/
private FrameLayout.LayoutParams mFakeTitleBarParams
= new FrameLayout.LayoutParams(
- ViewGroup.LayoutParams.FILL_PARENT,
+ ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT);
/**
* Keeps track of whether the options menu is open. This is important in
@@ -844,7 +844,7 @@ public class BrowserActivity extends Activity
// while the menu is up
WindowManager.LayoutParams params
= new WindowManager.LayoutParams(
- ViewGroup.LayoutParams.FILL_PARENT,
+ ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT,
WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL,
WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
@@ -1706,7 +1706,7 @@ public class BrowserActivity extends Activity
}
mErrorConsoleContainer.addView(errorConsole,
- new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT,
+ new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT));
}
@@ -3595,7 +3595,7 @@ public class BrowserActivity extends Activity
// Now we can add it to the main view.
mErrorConsoleContainer.addView(errorConsole,
- new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT,
+ new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT));
} else {
mErrorConsoleContainer.removeView(errorConsole);
@@ -3711,12 +3711,12 @@ public class BrowserActivity extends Activity
/*package*/ static final FrameLayout.LayoutParams COVER_SCREEN_PARAMS =
new FrameLayout.LayoutParams(
- ViewGroup.LayoutParams.FILL_PARENT,
- ViewGroup.LayoutParams.FILL_PARENT);
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ ViewGroup.LayoutParams.MATCH_PARENT);
/*package*/ static final FrameLayout.LayoutParams COVER_SCREEN_GRAVITY_CENTER =
new FrameLayout.LayoutParams(
- ViewGroup.LayoutParams.FILL_PARENT,
- ViewGroup.LayoutParams.FILL_PARENT,
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ ViewGroup.LayoutParams.MATCH_PARENT,
Gravity.CENTER);
// Google search
final static String QuickSearch_G = "http://www.google.com/m?q=%s";
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index 25e364b90..de4d11339 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -40,15 +40,11 @@ import android.provider.Browser;
import android.text.IClipboard;
import android.util.Log;
import android.view.ContextMenu;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
-import android.view.ViewGroup.LayoutParams;
-import android.view.ViewStub;
import android.view.ContextMenu.ContextMenuInfo;
import android.widget.AdapterView;
import android.widget.GridView;
@@ -346,8 +342,8 @@ public class BrowserBookmarksPage extends Activity implements
private static final ViewGroup.LayoutParams FULL_SCREEN_PARAMS
= new ViewGroup.LayoutParams(
- ViewGroup.LayoutParams.FILL_PARENT,
- ViewGroup.LayoutParams.FILL_PARENT);
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ ViewGroup.LayoutParams.MATCH_PARENT);
private static final int SAVE_CURRENT_PAGE = 1000;
private static final int CREATE_ADAPTER = 1001;
diff --git a/src/com/android/browser/BrowserHistoryPage.java b/src/com/android/browser/BrowserHistoryPage.java
index 2eab1813c..57ea87990 100644
--- a/src/com/android/browser/BrowserHistoryPage.java
+++ b/src/com/android/browser/BrowserHistoryPage.java
@@ -33,7 +33,6 @@ import android.provider.Browser;
import android.text.IClipboard;
import android.util.Log;
import android.view.ContextMenu;
-import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@@ -45,14 +44,12 @@ import android.view.ContextMenu.ContextMenuInfo;
import android.view.ViewStub;
import android.webkit.DateSorter;
import android.webkit.WebIconDatabase.IconListener;
-import android.widget.AdapterView;
import android.widget.ExpandableListAdapter;
import android.widget.ExpandableListView;
import android.widget.ExpandableListView.ExpandableListContextMenuInfo;
import android.widget.TextView;
import android.widget.Toast;
-import java.util.List;
import java.util.Vector;
/**
@@ -115,8 +112,8 @@ public class BrowserHistoryPage extends ExpandableListActivity {
final ExpandableListView list = getExpandableListView();
list.setOnCreateContextMenuListener(this);
View v = new ViewStub(this, R.layout.empty_history);
- addContentView(v, new LayoutParams(LayoutParams.FILL_PARENT,
- LayoutParams.FILL_PARENT));
+ addContentView(v, new LayoutParams(LayoutParams.MATCH_PARENT,
+ LayoutParams.MATCH_PARENT));
list.setEmptyView(v);
// Do not post the runnable if there is nothing in the list.
if (list.getExpandableListAdapter().getGroupCount() > 0) {
diff --git a/src/com/android/browser/BrowserHomepagePreference.java b/src/com/android/browser/BrowserHomepagePreference.java
index ec603d395..4f18bd5db 100644
--- a/src/com/android/browser/BrowserHomepagePreference.java
+++ b/src/com/android/browser/BrowserHomepagePreference.java
@@ -105,12 +105,12 @@ public class BrowserHomepagePreference extends EditTextPreference {
protected void showDialog(Bundle state) {
super.showDialog(state);
// The dialog has its width set to wrap_content. Change it to
- // fill_parent so there is more room to type in a url.
+ // match_parent so there is more room to type in a url.
Window window = getDialog().getWindow();
View decorView = window.getDecorView();
WindowManager.LayoutParams params
= (WindowManager.LayoutParams) decorView.getLayoutParams();
- params.width = ViewGroup.LayoutParams.FILL_PARENT;
+ params.width = ViewGroup.LayoutParams.MATCH_PARENT;
window.getWindowManager().updateViewLayout(decorView, params);
}
}
diff --git a/src/com/android/browser/FindDialog.java b/src/com/android/browser/FindDialog.java
index 937910350..e8d2417e5 100644
--- a/src/com/android/browser/FindDialog.java
+++ b/src/com/android/browser/FindDialog.java
@@ -19,8 +19,6 @@ package com.android.browser;
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
import android.text.Editable;
import android.text.Spannable;
import android.text.TextWatcher;
@@ -105,7 +103,7 @@ import android.widget.TextView;
setContentView(R.layout.browser_find);
- theWindow.setLayout(ViewGroup.LayoutParams.FILL_PARENT,
+ theWindow.setLayout(ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT);
mEditText = (EditText) findViewById(R.id.edit);
diff --git a/src/com/android/browser/MostVisitedActivity.java b/src/com/android/browser/MostVisitedActivity.java
index d03c7a3ad..416ae8fdf 100644
--- a/src/com/android/browser/MostVisitedActivity.java
+++ b/src/com/android/browser/MostVisitedActivity.java
@@ -30,9 +30,7 @@ import android.provider.Browser;
import android.webkit.WebIconDatabase.IconListener;
import android.widget.ListAdapter;
import android.widget.ListView;
-import android.widget.SimpleCursorAdapter;
import android.widget.TextView;
-import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
@@ -56,8 +54,8 @@ public class MostVisitedActivity extends ListActivity {
setListAdapter(mAdapter);
ListView list = getListView();
View v = new ViewStub(this, R.layout.empty_history);
- addContentView(v, new LayoutParams(LayoutParams.FILL_PARENT,
- LayoutParams.FILL_PARENT));
+ addContentView(v, new LayoutParams(LayoutParams.MATCH_PARENT,
+ LayoutParams.MATCH_PARENT));
list.setEmptyView(v);
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-05 04:50:44 +0000