wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 7957f2f39615

Browse Source
This commit is contained in:
Doug Turner 2011-12-17 22:39:08 -08:00
parent 7fa169ec37
commit 53a8dcdc2c
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mobile/android/base/AboutHomeContent.java
View File

@ -62,7 +62,6 @@ import android.text.SpannableString;
import android.text.style.UnderlineSpan;
import android.util.AttributeSet;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
@ -162,10 +161,6 @@ public class AboutHomeContent extends ScrollView {
}
void init(final Activity activity) {
LayoutInflater inflater =
(LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
inflater.inflate(R.layout.abouthome_content, this);
GeckoAppShell.getHandler().post(new Runnable() {
public void run() {
if (mCursor != null)

8
mobile/android/base/GeckoApp.java
View File

@ -1000,8 +1000,8 @@ abstract public class GeckoApp
public void run() {
mAutoCompletePopup.hide();
if (mAboutHomeContent == null && mShow) {
mAboutHomeContent = new AboutHomeContent(GeckoApp.mAppContext, null);
if (mAboutHomeContent == null) {
mAboutHomeContent = (AboutHomeContent) findViewById(R.id.abouthome_content);
mAboutHomeContent.init(GeckoApp.mAppContext);
mAboutHomeContent.setUriLoadCallback(new AboutHomeContent.UriLoadCallback() {
public void callback(String url) {
@ -1009,10 +1009,8 @@ abstract public class GeckoApp
loadUrl(url, AwesomeBar.Type.EDIT);
}
});
mGeckoLayout.addView(mAboutHomeContent);
}
if (mAboutHomeContent != null)
mAboutHomeContent.setVisibility(mShow ? View.VISIBLE : View.GONE);
mAboutHomeContent.setVisibility(mShow ? View.VISIBLE : View.GONE);
}
}

12
mobile/android/base/resources/layout/gecko_app.xml
View File

@ -20,6 +20,18 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"/>
<org.mozilla.gecko.AboutHomeContent android:id="@+id/abouthome_content"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#ffffff"
android:isScrollContainer="true"
android:visibility="gone">
<include layout="@layout/abouthome_content"/>
</org.mozilla.gecko.AboutHomeContent>
<org.mozilla.gecko.AutoCompletePopup android:id="@+id/autocomplete_popup"
style="@android:style/Widget.ListView.White"
android:layout_width="fill_parent"