demos/src/main/res/layout/activity_custom_ui.xml - Issue 1603383003: color, package and action bar configuration.

Unified Diff: demos/src/main/res/layout/activity_custom_ui.xml

Issue 1603383003: color, package and action bar configuration. (Closed) Base URL: https://github.com/GoogleChrome/custom-tabs-client.git@master

Patch Set: fixes Created 4 years, 9 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

« demos/src/main/java/org/chromium/customtabsdemos/CustomUIActivity.java ('K') | « demos/src/main/res/drawable-xxhdpi/ic_action_name.png ('k') | demos/src/main/res/layout/advanced_ui_setting.xml » ('j') | demos/src/main/res/layout/advanced_ui_setting.xml » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: demos/src/main/res/layout/activity_custom_ui.xml

diff --git a/demos/src/main/res/layout/activity_custom_ui.xml b/demos/src/main/res/layout/activity_custom_ui.xml

index 4513424d44922a31112e88ec1eb7327845f1edba..e60195200a28d4ef83b15243bd85ffa4d52c4edb 100644

--- a/demos/src/main/res/layout/activity_custom_ui.xml

+++ b/demos/src/main/res/layout/activity_custom_ui.xml

@@ -40,31 +40,9 @@

<LinearLayout

android:layout_width="match_parent"

- android:layout_height="wrap_content"

- android:paddingTop="@dimen/view_vertical_margin"

- android:orientation="vertical">

- <TextView

- android:layout_width="wrap_content"

- android:layout_height="wrap_content"

- android:textSize="@dimen/abc_text_size_medium_material"

- android:text="@string/label_toobar_color"/>

- <EditText

- android:id="@+id/custom_toolbar_color"

- android:layout_width="match_parent"

- android:layout_height="wrap_content"

- android:singleLine="true"

- android:hint="@string/default_toolbar_color"

- android:text="@string/default_toolbar_color"/>

- </LinearLayout>

- <LinearLayout

- android:layout_width="match_parent"

android:paddingTop="@dimen/view_vertical_margin"

android:orientation="horizontal"

- android:layout_height="wrap_content">

+ android:layout_height="@dimen/view_height">

Ian Wen 2016/03/16 01:35:30 Setting height on textview is potentially dangerou

BigBossZhiling 2016/03/18 00:59:07 Done.

<TextView

android:layout_width="0dp"

@@ -83,7 +61,7 @@

<LinearLayout

android:layout_width="match_parent"

android:paddingTop="@dimen/view_vertical_margin"

- android:layout_height="wrap_content">

+ android:layout_height="@dimen/view_height">

<TextView

android:layout_width="0dp"

@@ -102,7 +80,7 @@

<LinearLayout

android:layout_width="match_parent"

android:paddingTop="@dimen/view_vertical_margin"

- android:layout_height="wrap_content">

+ android:layout_height="@dimen/view_height">

<TextView

android:layout_width="0dp"

@@ -121,7 +99,7 @@

<LinearLayout

android:layout_width="match_parent"

android:paddingTop="@dimen/view_vertical_margin"

- android:layout_height="wrap_content">

+ android:layout_height="@dimen/view_height">

<TextView

android:layout_width="0dp"

@@ -140,7 +118,7 @@

<LinearLayout

android:layout_width="match_parent"

android:paddingTop="@dimen/view_vertical_margin"

- android:layout_height="wrap_content">

+ android:layout_height="@dimen/view_height">

<TextView

android:layout_width="0dp"

@@ -157,10 +135,21 @@

</LinearLayout>

<Button

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

+ android:layout_gravity="center_horizontal"

+ android:paddingTop="@dimen/button_padding_top"

+ android:layout_width="@dimen/button_width"

+ android:layout_height="@dimen/button_height"

+ android:textSize="@dimen/abc_text_size_medium_material"

+ android:text="@string/label_advanced_ui_setting" />

+ <Button

android:id="@+id/start_custom_tab"

android:layout_gravity="center_horizontal"

- android:layout_width="wrap_content"

- android:layout_height="wrap_content"

+ android:paddingTop="@dimen/button_padding_top"

+ android:layout_width="@dimen/button_width"

+ android:layout_height="@dimen/button_height"

+ android:textSize="@dimen/abc_text_size_medium_material"

android:text="@string/label_start_custom_tab" />

</LinearLayout>