diff options
| author | tsergeant <tsergeant@chromium.org> | 2015-06-25 18:35:46 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-26 01:36:19 +0000 |
| commit | 08b933acddddddb89f1e6d0d5652af2788ab1b1d (patch) | |
| tree | 82c11302f246ba13d10f7977d530f594c7bad9cf | |
| parent | f304536e0dcdd521cde51606e24359f8bafe134d (diff) | |
| download | chromium_src-08b933acddddddb89f1e6d0d5652af2788ab1b1d.zip chromium_src-08b933acddddddb89f1e6d0d5652af2788ab1b1d.tar.gz chromium_src-08b933acddddddb89f1e6d0d5652af2788ab1b1d.tar.bz2 | |
Android Page info: Hide Site Settings button on non-HTTP(s) pages.
BUG=503266
Review URL: https://codereview.chromium.org/1211683002
Cr-Commit-Position: refs/heads/master@{#336317}
| -rw-r--r-- | chrome/android/java/res/layout/website_settings.xml | 2 | ||||
| -rw-r--r-- | chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/android/java/res/layout/website_settings.xml b/chrome/android/java/res/layout/website_settings.xml index be0c34d..f409891 100644 --- a/chrome/android/java/res/layout/website_settings.xml +++ b/chrome/android/java/res/layout/website_settings.xml @@ -8,6 +8,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" + android:paddingBottom="8dp" android:background="#ffffff" android:orientation="vertical" > @@ -53,7 +54,6 @@ android:layout_width="wrap_content" android:layout_height="@dimen/website_settings_popup_button_height" android:layout_gravity="end" - android:layout_marginBottom="8dp" android:layout_marginEnd="@dimen/website_settings_popup_padding_sides" android:layout_marginStart="@dimen/website_settings_popup_padding_sides" android:layout_marginTop="8dp" diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java index 83a56d1..a577bb4 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java @@ -421,7 +421,7 @@ public class WebsiteSettingsPopup implements OnClickListener, OnItemSelectedList if (mParsedUrl == null || mParsedUrl.getScheme() == null || !(mParsedUrl.getScheme().equals("http") || mParsedUrl.getScheme().equals("https"))) { - mSiteSettingsButton.setEnabled(false); + mSiteSettingsButton.setVisibility(View.GONE); } } |