Backed out changeset 970698e1bb62 (bug 1361755) for Android bustage at /mobile/android/base/resources/layout/preference_set_homepage.xml:20 (unbound prefix). r=backout

mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java

@@ -169,8 +169,6 @@ public class GeckoPreferences
     public static final String PREFS_DEFAULT_BROWSER = NON_PREF_PREFIX + "default_browser.link";
     public static final String PREFS_SYSTEM_FONT_SIZE = NON_PREF_PREFIX + "font.size.use_system_font_size";
     public static final String PREFS_SET_AS_HOMEPAGE = NON_PREF_PREFIX + "distribution.set_as_homepage";
-    public static final String PREFS_DIST_HOMEPAGE = NON_PREF_PREFIX + "distribution.homepage";
-    public static final String PREFS_DIST_HOMEPAGE_NAME = NON_PREF_PREFIX + "distribution.homepage.name";
 
     private static final String ACTION_STUMBLER_UPLOAD_PREF = "STUMBLER_PREF";
 

mobile/android/base/java/org/mozilla/gecko/preferences/SetHomepagePreference.java

@@ -20,7 +20,6 @@ import android.widget.EditText;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 
-
 public class SetHomepagePreference extends DialogPreference {
     private static final String DEFAULT_HOMEPAGE = AboutPages.HOME;
 
@@ -28,7 +27,6 @@ public class SetHomepagePreference extends DialogPreference {
 
     private RadioGroup homepageLayout;
     private RadioButton defaultRadio;
-    private RadioButton distributionRadio;
     private RadioButton userAddressRadio;
     private EditText homepageEditText;
 
@@ -53,7 +51,6 @@ public class SetHomepagePreference extends DialogPreference {
 
         homepageLayout = (RadioGroup) view.findViewById(R.id.homepage_layout);
         defaultRadio = (RadioButton) view.findViewById(R.id.radio_default);
-        distributionRadio = (RadioButton) view.findViewById(R.id.radio_distribution);
         userAddressRadio = (RadioButton) view.findViewById(R.id.radio_user_address);
         homepageEditText = (EditText) view.findViewById(R.id.edittext_user_address);
 
@@ -74,17 +71,8 @@ public class SetHomepagePreference extends DialogPreference {
     }
 
     private void setUIState(final String url) {
-        if (prefs.contains(GeckoPreferences.PREFS_DIST_HOMEPAGE_NAME) &&
-            prefs.contains(GeckoPreferences.PREFS_DIST_HOMEPAGE)) {
-            distributionRadio.setText(prefs.getString(GeckoPreferences.PREFS_DIST_HOMEPAGE_NAME, ""));
-        } else {
-            distributionRadio.setVisibility(View.GONE);
-        }
         if (isUrlDefaultHomepage(url)) {
             defaultRadio.setChecked(true);
-        } else if (distributionRadio.getVisibility() == View.VISIBLE &&
-                   isUrlDistributionHomepage(url)) {
-            distributionRadio.setChecked(true);
         } else {
             userAddressRadio.setChecked(true);
             homepageEditText.setText(url);
@@ -95,11 +83,6 @@ public class SetHomepagePreference extends DialogPreference {
         return TextUtils.isEmpty(url) || DEFAULT_HOMEPAGE.equals(url);
     }
 
-    private boolean isUrlDistributionHomepage(final String url) {
-        String distributionHomepage = prefs.getString(GeckoPreferences.PREFS_DIST_HOMEPAGE, "");
-        return distributionHomepage.equals(url);
-    }
-
     private static void openKeyboardAndSelectAll(final Context context, final View viewToFocus) {
         viewToFocus.requestFocus();
         viewToFocus.post(new Runnable() {
@@ -123,11 +106,8 @@ public class SetHomepagePreference extends DialogPreference {
             final SharedPreferences.Editor editor = prefs.edit();
             final String homePageEditTextValue = homepageEditText.getText().toString();
             final String newPrefValue;
-            if (homepageLayout.getCheckedRadioButtonId() == R.id.radio_distribution) {
-                newPrefValue = prefs.getString(GeckoPreferences.PREFS_DIST_HOMEPAGE, "");
-                editor.putString(GeckoPreferences.PREFS_HOMEPAGE, newPrefValue);
-            } else if (homepageLayout.getCheckedRadioButtonId() == R.id.radio_default ||
-                       isUrlDefaultHomepage(homePageEditTextValue)) {
+            if (homepageLayout.getCheckedRadioButtonId() == R.id.radio_default ||
+                    isUrlDefaultHomepage(homePageEditTextValue)) {
                 newPrefValue = "";
                 editor.remove(GeckoPreferences.PREFS_HOMEPAGE);
             } else {

mobile/android/base/resources/layout/preference_set_homepage.xml

@@ -17,13 +17,6 @@
                  android:text="@string/home_homepage_radio_default"
                  android:textColor="@color/text_and_tabs_tray_grey"/>
 
-    <RadioButton android:id="@+id/radio_distribution"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_marginTop="8dp"
-                 tools:text="Distribution Homepage"
-                 android:textColor="@color/text_and_tabs_tray_grey"/>
-
     <RadioButton android:id="@+id/radio_user_address"
                  android:layout_width="wrap_content"
                  android:layout_height="wrap_content"