From 223292e382a9158c503460824f23cccc78def12a Mon Sep 17 00:00:00 2001 From: Michael Comella Date: Mon, 23 Nov 2015 15:12:20 -0800 Subject: [PATCH] Bug 1224214 - Remove "Set current tab" checkbox from homepage setting. r=margaret --HG-- extra : commitid : GGpqSg1W8WY extra : rebase_source : 863cd72a4abe48485bedb8de7a92ee032d0deb8d --- .../preferences/SetHomepagePreference.java | 22 ------------------- .../layout/preference_set_homepage.xml | 21 ------------------ 2 files changed, 43 deletions(-) diff --git a/mobile/android/base/preferences/SetHomepagePreference.java b/mobile/android/base/preferences/SetHomepagePreference.java index faa12e47fe07..192553d01e47 100644 --- a/mobile/android/base/preferences/SetHomepagePreference.java +++ b/mobile/android/base/preferences/SetHomepagePreference.java @@ -24,7 +24,6 @@ import android.widget.EditText; public class SetHomepagePreference extends DialogPreference { SharedPreferences prefs; EditText homepageTextEdit; - CheckBox useCurrentTabCheck; public SetHomepagePreference(final Context context, final AttributeSet attrs) { super(context, attrs); @@ -61,27 +60,6 @@ public class SetHomepagePreference extends DialogPreference { if (!AboutPages.HOME.equals(url)) { homepageTextEdit.setText(url); } - - useCurrentTabCheck = (CheckBox) view.findViewById(R.id.use_current_checkbox); - - view.findViewById(R.id.use_current_title).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(final View v) { - useCurrentTabCheck.toggle(); - } - }); - - useCurrentTabCheck.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(final CompoundButton buttonView, final boolean isChecked) { - homepageTextEdit.setEnabled(!isChecked); - if (isChecked) { - homepageTextEdit.setText(Tabs.getInstance().getSelectedTab().getURL()); - } else { - homepageTextEdit.selectAll(); - } - } - }); } @Override diff --git a/mobile/android/base/resources/layout/preference_set_homepage.xml b/mobile/android/base/resources/layout/preference_set_homepage.xml index 2301afbcefd0..aa9d6cf7924a 100644 --- a/mobile/android/base/resources/layout/preference_set_homepage.xml +++ b/mobile/android/base/resources/layout/preference_set_homepage.xml @@ -3,7 +3,6 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - - - - - - -