Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(175)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1750963002: Update demo with features from support lib 23.2.0 (Closed) Base URL: https://chromium.googlesource.com/external/github.com/GoogleChrome/custom-tabs-client@master
Patch Set: Fix comment on decoding Bitmpa on UI thread Created 4 years, 10 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 | « demos/src/main/java/org/chromium/customtabsdemos/ShareBroadcastReceiver.java ('k') | demos/src/main/res/layout/activity_main.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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..b3795b936eead40889feab98b0e2254ce6bc45b3 100644
--- a/demos/src/main/res/layout/activity_custom_ui.xml
+++ b/demos/src/main/res/layout/activity_custom_ui.xml
@@ -13,154 +13,219 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView
+ xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin"
- android:paddingBottom="@dimen/activity_vertical_margin"
- android:orientation="vertical"
- tools:context=".CustomUIActivity">
-
- <TextView
- android:layout_width="match_parent"
- android:textSize="@dimen/abc_text_size_medium_material"
- android:layout_height="wrap_content"
- android:text="@string/label_url" />
-
- <EditText
- android:id="@+id/url"
- android:text="@string/default_test_url"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:inputType="textUri" />
-
+ android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingTop="@dimen/view_vertical_margin"
- android:orientation="vertical">
+ android:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
+ android:paddingTop="@dimen/activity_vertical_margin"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ android:orientation="vertical"
+ tools:context=".CustomUIActivity">
<TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="match_parent"
android:textSize="@dimen/abc_text_size_medium_material"
- android:text="@string/label_toobar_color"/>
+ android:layout_height="wrap_content"
+ android:text="@string/label_url" />
<EditText
- android:id="@+id/custom_toolbar_color"
+ android:id="@+id/url"
+ android:text="@string/default_test_url"
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"/>
+ android:inputType="textUri" />
- </LinearLayout>
+ <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: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_secondary_color"/>
+
+ <EditText
+ android:id="@+id/custom_toolbar_secondary_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">
- <LinearLayout
- android:layout_width="match_parent"
- android:paddingTop="@dimen/view_vertical_margin"
- android:orientation="horizontal"
- android:layout_height="wrap_content">
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textSize="@dimen/abc_text_size_medium_material"
+ android:text="@string/label_add_action_button"/>
- <TextView
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:textSize="@dimen/abc_text_size_medium_material"
- android:text="@string/label_add_action_button"/>
+ <CheckBox
+ android:id="@+id/custom_show_action_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
- <CheckBox
- android:id="@+id/custom_show_action_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
+ </LinearLayout>
- </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:paddingTop="@dimen/view_vertical_margin"
+ android:layout_height="wrap_content">
- <LinearLayout
- android:layout_width="match_parent"
- android:paddingTop="@dimen/view_vertical_margin"
- android:layout_height="wrap_content">
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textSize="@dimen/abc_text_size_medium_material"
+ android:text="@string/label_add_menus"/>
- <TextView
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:textSize="@dimen/abc_text_size_medium_material"
- android:text="@string/label_add_menus"/>
+ <CheckBox
+ android:id="@+id/custom_add_menus"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
- <CheckBox
- android:id="@+id/custom_add_menus"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
+ </LinearLayout>
- </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:paddingTop="@dimen/view_vertical_margin"
+ android:layout_height="wrap_content">
- <LinearLayout
- android:layout_width="match_parent"
- android:paddingTop="@dimen/view_vertical_margin"
- android:layout_height="wrap_content">
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textSize="@dimen/abc_text_size_medium_material"
+ android:text="@string/label_add_default_share"/>
- <TextView
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:textSize="@dimen/abc_text_size_medium_material"
- android:text="@string/label_show_title"/>
+ <CheckBox
+ android:id="@+id/add_default_share"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
- <CheckBox
- android:id="@+id/show_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
+ </LinearLayout>
- </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:paddingTop="@dimen/view_vertical_margin"
+ android:layout_height="wrap_content">
- <LinearLayout
- android:layout_width="match_parent"
- android:paddingTop="@dimen/view_vertical_margin"
- android:layout_height="wrap_content">
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textSize="@dimen/abc_text_size_medium_material"
+ android:text="@string/label_add_toolbar_item"/>
- <TextView
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:textSize="@dimen/abc_text_size_medium_material"
- android:text="@string/label_custom_back_button"/>
+ <CheckBox
+ android:id="@+id/add_toolbar_item"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
- <CheckBox
- android:id="@+id/custom_back_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
+ </LinearLayout>
- </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:paddingTop="@dimen/view_vertical_margin"
+ android:layout_height="wrap_content">
- <LinearLayout
- android:layout_width="match_parent"
- android:paddingTop="@dimen/view_vertical_margin"
- android:layout_height="wrap_content">
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textSize="@dimen/abc_text_size_medium_material"
+ android:text="@string/label_show_title"/>
- <TextView
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:textSize="@dimen/abc_text_size_medium_material"
- android:text="@string/label_auto_hide_appbar"/>
+ <CheckBox
+ android:id="@+id/show_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
- <CheckBox
- android:id="@+id/auto_hide_checkbox"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
+ </LinearLayout>
- </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:paddingTop="@dimen/view_vertical_margin"
+ android:layout_height="wrap_content">
- <Button
- android:id="@+id/start_custom_tab"
- android:layout_gravity="center_horizontal"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/label_start_custom_tab" />
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textSize="@dimen/abc_text_size_medium_material"
+ android:text="@string/label_custom_back_button"/>
+
+ <CheckBox
+ android:id="@+id/custom_back_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:paddingTop="@dimen/view_vertical_margin"
+ android:layout_height="wrap_content">
+
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textSize="@dimen/abc_text_size_medium_material"
+ android:text="@string/label_auto_hide_appbar"/>
+
+ <CheckBox
+ android:id="@+id/auto_hide_checkbox"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+
+ </LinearLayout>
+
+ <Button
+ android:id="@+id/start_custom_tab"
+ android:layout_gravity="center_horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/label_start_custom_tab" />
-</LinearLayout>
+ </LinearLayout>
+</ScrollView>
« no previous file with comments | « demos/src/main/java/org/chromium/customtabsdemos/ShareBroadcastReceiver.java ('k') | demos/src/main/res/layout/activity_main.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698