chrome/android/java/res/layout/website_settings.xml - Issue 2359363004: Add a button to OIB to launch an instant app if it exists.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/res/layout/website_settings.xml

Issue 2359363004: Add a button to OIB to launch an instant app if it exists. (Closed)

Patch Set: Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/res/layout/website_settings.xml

diff --git a/chrome/android/java/res/layout/website_settings.xml b/chrome/android/java/res/layout/website_settings.xml

index 063f53c87db308ae917b5c8adcdfbb323b4b4bd7..9f4e42a979e17b430a775acaccd8dabe386089a0 100644

--- a/chrome/android/java/res/layout/website_settings.xml

+++ b/chrome/android/java/res/layout/website_settings.xml

@@ -5,7 +5,9 @@

Use of this source code is governed by a BSD-style license that can be

found in the LICENSE file.

-->

-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

+<LinearLayout

+ xmlns:android="http://schemas.android.com/apk/res/android"

+ xmlns:chrome="http://schemas.android.com/apk/res-auto"

android:layout_width="match_parent"

android:layout_height="match_parent"

android:paddingBottom="8dp"

@@ -58,6 +60,23 @@

android:textSize="14sp" />

</LinearLayout>

+ <org.chromium.ui.widget.ButtonCompat

+ android:id="@+id/website_settings_instant_app_button"

+ android:layout_width="wrap_content"

+ android:layout_height="wrap_content"

+ android:layout_gravity="start"

+ android:layout_marginEnd="@dimen/website_settings_popup_padding_sides"

+ android:layout_marginStart="@dimen/website_settings_popup_padding_sides"

+ android:layout_marginTop="12dp"

+ android:layout_marginBottom="4dp"

Maria 2016/09/26 17:36:25 I wish I understood when @dimen is used and when i

Ted C 2016/09/26 18:05:04 For me, @dimen is for sharing, otherwise inline an

+ android:paddingEnd="@dimen/website_settings_popup_button_padding_sides"

+ android:paddingStart="@dimen/website_settings_popup_button_padding_sides"

+ android:text="@string/page_info_instant_app_button"

+ android:textSize="14sp"

+ android:textColor="#fff"

Maria 2016/09/26 17:36:25 @color?

Ted C 2016/09/26 18:05:04 switched to @android:color/white

+ chrome:buttonRaised="false"

+ chrome:buttonColor="@color/app_banner_install_button_bg" />

<LinearLayout

android:id="@+id/website_settings_permissions_list"

android:layout_width="match_parent"