Fix padding and touch effects in search engine dialog.

chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.preferences;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
@@ skipping 71 matching lines @@
         initEntries();
     }
 
     // Used for testing.
 
     String getValueForTesting() {
         return Integer.toString(mSelectedSearchEnginePosition);
     }
 
     void setValueForTesting(String value) {
-        radioButtonClicked(Integer.parseInt(value));
+        searchEngineSelected(Integer.parseInt(value));
     }
 
     /**
      * Initialize the search engine list.
      */
     private void initEntries() {
         TemplateUrlService templateUrlService = TemplateUrlService.getInstance();
         if (!templateUrlService.isLoaded()) {
             templateUrlService.registerLoadListener(this);
             templateUrlService.load();
@@ skipping 54 matching lines @@
         return position;
     }
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
         View view = convertView;
         if (convertView == null) {
             view = mLayoutInflater.inflate(R.layout.search_engine, null);
         }
 
+        view.setOnClickListener(this);
+        view.setTag(position);
+
         RadioButton radioButton = (RadioButton) view.findViewById(R.id.radiobutton);
+        boolean selected = position == mSelectedSearchEnginePosition;
+        radioButton.setChecked(selected);
+
         TextView description = (TextView) view.findViewById(R.id.description);
-        TextView link = (TextView) view.findViewById(R.id.link);
-
         TemplateUrl templateUrl = mSearchEngines.get(position);
         Resources resources = mContext.getResources();
+        description.setText(getSearchEngineNameAndDomain(resources, templateUrl));
 
-        boolean selected = position == mSelectedSearchEnginePosition;
-        radioButton.setChecked(selected);
-        radioButton.setOnClickListener(this);
-        radioButton.setTag(position);
-
-        description.setText(getSearchEngineNameAndDomain(resources, templateUrl));
-        description.setOnClickListener(this);
-        description.setTag(position);

[Finnur, 2015/04/29 09:55:13]

Just to confirm... clicking on the description still selects the radio-button,
right?

[newt (away), 2015/04/29 17:33:05]

Yes. Click events are first sent to the deepest view in the hierarchy, and as
long as the event hasn't been handled, are slowly propagated up the hierarchy.

-
+        TextView link = (TextView) view.findViewById(R.id.link);
         link.setVisibility(selected ? View.VISIBLE : View.GONE);
         if (selected) {
             ForegroundColorSpan linkSpan = new ForegroundColorSpan(
                     resources.getColor(R.color.pref_accent_color));
             if (LocationSettings.getInstance().isSystemLocationSettingEnabled()) {
                 String message = mContext.getString(
                         locationEnabled(position)
                         ? R.string.search_engine_location_allowed
                         : R.string.search_engine_location_blocked);
                 SpannableString messageWithLink = new SpannableString(message);
@@ skipping 19 matching lines @@
         initEntries();
     }
 
     // OnClickListener:
 
     @Override
     public void onClick(View view) {
         if (view.getTag() == null) {
             onLocationLinkClicked();
         } else {
-            radioButtonClicked((int) view.getTag());
+            searchEngineSelected((int) view.getTag());
         }
     }
 
-    private void radioButtonClicked(int position) {
+    private void searchEngineSelected(int position) {
         // First clean up any automatically added permissions (if any) for the previously selected
         // search engine.
         SharedPreferences sharedPreferences =
                 PreferenceManager.getDefaultSharedPreferences(mContext);
         if (sharedPreferences.getBoolean(PrefServiceBridge.LOCATION_AUTO_ALLOWED, false)) {
             if (locationEnabled(mSelectedSearchEnginePosition)) {
-                TemplateUrl templateUrl = mSearchEngines.get(mSelectedSearchEnginePosition);

[newt (away), 2015/04/29 00:02:25]

dead code

-
                 String url = TemplateUrlService.getInstance().getSearchEngineUrlFromTemplateUrl(
                         toIndex(mSelectedSearchEnginePosition));
                 WebsitePreferenceBridge.nativeSetGeolocationSettingForOrigin(
                         url, url, ContentSetting.DEFAULT.toInt());
             }
             sharedPreferences.edit().remove(PrefServiceBridge.LOCATION_AUTO_ALLOWED).apply();
         }
 
         // Record the change in search engine.
         mSelectedSearchEnginePosition = position;
@@ skipping 32 matching lines @@
     private boolean locationEnabled(int position) {
         if (position == -1) return false;
 
         String url = TemplateUrlService.getInstance().getSearchEngineUrlFromTemplateUrl(
                 toIndex(position));
         GeolocationInfo locationSettings = new GeolocationInfo(url, null);
         ContentSetting locationPermission = locationSettings.getContentSetting();
         return locationPermission == ContentSetting.ALLOW;
     }
 }