diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2014-06-29 16:14:25 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2014-06-29 16:14:25 +0200 |
| commit | 9f39b088e3d15622e06c9c075ffd52bb128afc9d (patch) | |
| tree | 08a3f14d5b125ea7515c170e0723ad24ec842102 /main/src/cgeo/geocaching/AboutActivity.java | |
| parent | 14a6f46b170c2e37835c478b05c05acea87607a1 (diff) | |
| download | cgeo-9f39b088e3d15622e06c9c075ffd52bb128afc9d.zip cgeo-9f39b088e3d15622e06c9c075ffd52bb128afc9d.tar.gz cgeo-9f39b088e3d15622e06c9c075ffd52bb128afc9d.tar.bz2 | |
fix lint warning: layout inflation root
Diffstat (limited to 'main/src/cgeo/geocaching/AboutActivity.java')
| -rw-r--r-- | main/src/cgeo/geocaching/AboutActivity.java | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/main/src/cgeo/geocaching/AboutActivity.java b/main/src/cgeo/geocaching/AboutActivity.java index 5bf0f06..8c4de40 100644 --- a/main/src/cgeo/geocaching/AboutActivity.java +++ b/main/src/cgeo/geocaching/AboutActivity.java @@ -19,6 +19,7 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; import android.view.View; +import android.view.ViewGroup; import android.widget.ScrollView; import android.widget.TextView; @@ -37,8 +38,8 @@ public class AboutActivity extends AbstractViewPagerActivity<AboutActivity.Page> @InjectView(R.id.license_text) protected TextView licenseText; @Override - public ScrollView getDispatchedView() { - final ScrollView view = (ScrollView) getLayoutInflater().inflate(R.layout.about_license_page, null); + public ScrollView getDispatchedView(final ViewGroup parentView) { + final ScrollView view = (ScrollView) getLayoutInflater().inflate(R.layout.about_license_page, parentView, false); ButterKnife.inject(this, view); setClickListener(licenseLink, "http://www.apache.org/licenses/LICENSE-2.0.html"); licenseText.setText(getRawResourceString(R.raw.license)); @@ -51,8 +52,8 @@ public class AboutActivity extends AbstractViewPagerActivity<AboutActivity.Page> @InjectView(R.id.contributors) protected TextView contributors; @Override - public ScrollView getDispatchedView() { - final ScrollView view = (ScrollView) getLayoutInflater().inflate(R.layout.about_contributors_page, null); + public ScrollView getDispatchedView(final ViewGroup parentView) { + final ScrollView view = (ScrollView) getLayoutInflater().inflate(R.layout.about_contributors_page, parentView, false); ButterKnife.inject(this, view); contributors.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance()); return view; @@ -66,8 +67,8 @@ public class AboutActivity extends AbstractViewPagerActivity<AboutActivity.Page> @InjectView(R.id.changelog_release) protected TextView changeLogRelease; @Override - public ScrollView getDispatchedView() { - final ScrollView view = (ScrollView) getLayoutInflater().inflate(R.layout.about_changes_page, null); + public ScrollView getDispatchedView(final ViewGroup parentView) { + final ScrollView view = (ScrollView) getLayoutInflater().inflate(R.layout.about_changes_page, parentView, false); ButterKnife.inject(this, view); changeLogRelease.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance()); final String changeLogMasterString = getString(R.string.changelog_master); @@ -91,8 +92,8 @@ public class AboutActivity extends AbstractViewPagerActivity<AboutActivity.Page> @InjectView(R.id.faq) protected TextView faq; @Override - public ScrollView getDispatchedView() { - final ScrollView view = (ScrollView) getLayoutInflater().inflate(R.layout.about_help_page, null); + public ScrollView getDispatchedView(final ViewGroup parentView) { + final ScrollView view = (ScrollView) getLayoutInflater().inflate(R.layout.about_help_page, parentView, false); ButterKnife.inject(this, view); setClickListener(support, "mailto:support@cgeo.org"); setClickListener(website, "http://www.cgeo.org/"); @@ -117,8 +118,8 @@ public class AboutActivity extends AbstractViewPagerActivity<AboutActivity.Page> @InjectView(R.id.donate) protected TextView donateButton; @Override - public ScrollView getDispatchedView() { - final ScrollView view = (ScrollView) getLayoutInflater().inflate(R.layout.about_version_page, null); + public ScrollView getDispatchedView(final ViewGroup parentView) { + final ScrollView view = (ScrollView) getLayoutInflater().inflate(R.layout.about_version_page, parentView, false); ButterKnife.inject(this, view); version.setText(Version.getVersionName(AboutActivity.this)); setClickListener(donateButton, "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=AQBS7UP76CXW2"); @@ -145,7 +146,7 @@ public class AboutActivity extends AbstractViewPagerActivity<AboutActivity.Page> super.onCreate(savedInstanceState, R.layout.viewpager_activity); int startPage = Page.VERSION.ordinal(); - Bundle extras = getIntent().getExtras(); + final Bundle extras = getIntent().getExtras(); if (extras != null) { startPage = extras.getInt(EXTRA_ABOUT_STARTPAGE, startPage); } @@ -217,7 +218,7 @@ public class AboutActivity extends AbstractViewPagerActivity<AboutActivity.Page> return result; } - public static void showChangeLog(Context fromActivity) { + public static void showChangeLog(final Context fromActivity) { final Intent intent = new Intent(fromActivity, AboutActivity.class); intent.putExtra(EXTRA_ABOUT_STARTPAGE, Page.CHANGELOG.ordinal()); fromActivity.startActivity(intent); |
