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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/android/java_staging/res/layout/eb_detail.xml

Issue 1182083005: Re-engineer edit screen in enhanced bookmark (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Respond to comments. Lots of comments... Created 5 years, 6 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 | « chrome/android/java_staging/AndroidManifest.xml ('k') | chrome/android/java_staging/res/layout/eb_edit.xml » ('j') | chrome/android/java_staging/res/layout/eb_edit.xml » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java_staging/res/layout/eb_detail.xml
diff --git a/chrome/android/java_staging/res/layout/eb_detail.xml b/chrome/android/java_staging/res/layout/eb_detail.xml
deleted file mode 100644
index 478f763308d86033eceb90ca279d041436114806..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/res/layout/eb_detail.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:chrome="http://schemas.android.com/apk/res-auto"
- android:id="@+id/eb_detail_root_layout"
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
-
- <org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkDetailScrollView
- android:id="@+id/eb_detail_scroll_view"
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
-
- <LinearLayout
- android:id="@+id/eb_detail_content"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:contentDescription="@string/accessibility_enhanced_bookmark_detail_view"
- android:focusable="true"
- android:focusableInTouchMode="true"
- android:orientation="vertical"
- android:paddingBottom="20dp" >
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content" >
-
- <ImageView
- android:id="@+id/eb_detail_image_view"
- android:layout_width="match_parent"
- android:layout_height="@dimen/enhanced_bookmark_detail_image_height"
- android:contentDescription="@null"
- android:scaleType="centerCrop"
- android:transitionName="@string/enhanced_bookmark_detail_transition_name" />
-
- <org.chromium.chrome.browser.widget.FadingShadowView
- android:id="@+id/eb_detail_top_shadow"
- android:layout_width="match_parent"
- android:layout_height="@dimen/toolbar_height_no_shadow" />
-
- <View
- android:id="@+id/eb_detail_image_mask"
- android:layout_width="match_parent"
- android:layout_height="@dimen/enhanced_bookmark_detail_image_height" />
- </FrameLayout>
-
- <EditText
- android:id="@+id/eb_detail_title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginEnd="12dp"
- android:layout_marginStart="12dp"
- android:layout_marginTop="24dp"
- android:focusable="false"
- android:imeOptions="flagNoExtractUi"
- android:inputType="textCapSentences|textAutoCorrect"
- android:lineSpacingExtra="2dp"
- android:singleLine="true"
- android:textAlignment="viewStart"
- android:textColor="@color/enhanced_bookmark_detail_text"
- android:textSize="24sp" />
-
- <EditText
- android:id="@+id/eb_detail_url"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginEnd="12dp"
- android:layout_marginStart="12dp"
- android:layout_marginTop="8dp"
- android:focusable="false"
- android:imeOptions="flagNoExtractUi"
- android:inputType="textUri"
- android:lineSpacingExtra="2dp"
- android:singleLine="true"
- android:textAlignment="viewStart"
- android:textColor="@color/enhanced_bookmark_detail_text"
- android:textSize="16sp" />
-
- <LinearLayout
- android:id="@+id/eb_detail_folder_box"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="24dp"
- android:orientation="vertical" >
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="16dp"
- android:layout_marginStart="16dp"
- android:fontFamily="sans-serif-medium"
- android:text="@string/bookmark_folder"
- android:textColor="@color/enhanced_bookmark_detail_section"
- android:textSize="14sp"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/eb_detail_folder_textview"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="16dp"
- android:layout_marginStart="16dp"
- android:layout_marginTop="8dp"
- android:textColor="@color/dark_mode_tint"
- android:textSize="16sp" />
- </LinearLayout>
-
- <TextView
- android:id="@+id/eb_detail_auto_folder_label"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="16dp"
- android:layout_marginStart="16dp"
- android:layout_marginTop="24dp"
- android:layout_marginBottom="4dp"
- android:fontFamily="sans-serif-medium"
- android:text="@string/enhanced_bookmark_auto_folders"
- android:textColor="@color/enhanced_bookmark_detail_section"
- android:textSize="14sp"
- android:textStyle="bold" />
-
- <org.chromium.chrome.browser.widget.FlowLayout
- android:id="@+id/eb_detail_flow_layout"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="16dp"
- android:layout_marginStart="16dp" />
-
- <EditText
- android:id="@+id/eb_detail_description"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginEnd="12dp"
- android:layout_marginStart="12dp"
- android:layout_marginTop="12dp"
- android:focusable="false"
- android:hint="@string/enhanced_bookmark_description_hint"
- android:imeOptions="flagNoExtractUi"
- android:inputType="textCapSentences|textAutoCorrect|textMultiLine"
- android:minLines="1"
- android:textAlignment="viewStart"
- android:textColor="@color/enhanced_bookmark_detail_text"
- android:textSize="14sp" />
-
- <Space
- android:id="@+id/bottom_spacer"
- android:layout_width="0dp"
- android:layout_height="0dp" />
-
- </LinearLayout>
- </org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkDetailScrollView>
-
- <LinearLayout
- android:id="@+id/eb_detail_action_bar_layout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
-
- <RelativeLayout
- android:id="@+id/eb_detail_action_bar"
- android:layout_width="match_parent"
- android:layout_height="@dimen/toolbar_height_no_shadow" >
-
- <org.chromium.chrome.browser.widget.TintedImageButton
- android:id="@+id/eb_detail_actionbar_close_button"
- android:layout_width="@dimen/toolbar_height_no_shadow"
- android:layout_height="@dimen/toolbar_height_no_shadow"
- android:layout_alignParentStart="true"
- android:background="@null"
- android:contentDescription="@string/accessibility_enhanced_bookmark_detail_close_btn"
- android:src="@drawable/eb_cancel_active"
- chrome:tint="@color/light_mode_tint" />
-
- <org.chromium.chrome.browser.widget.TintedImageButton
- android:id="@+id/eb_detail_actionbar_save_button"
- android:layout_width="@dimen/toolbar_height_no_shadow"
- android:layout_height="@dimen/toolbar_height_no_shadow"
- android:layout_alignParentEnd="true"
- android:background="@null"
- android:contentDescription="@string/accessibility_enhanced_bookmark_detail_save_btn"
- android:src="@drawable/eb_check_white"
- chrome:tint="@color/light_mode_tint" />
-
- <org.chromium.chrome.browser.widget.TintedImageButton
- android:id="@+id/eb_detail_actionbar_delete_button"
- android:layout_width="@dimen/toolbar_height_no_shadow"
- android:layout_height="@dimen/toolbar_height_no_shadow"
- android:layout_toStartOf="@+id/eb_detail_actionbar_save_button"
- android:background="@null"
- android:contentDescription="@string/accessibility_enhanced_bookmark_detail_delete_btn"
- android:src="@drawable/eb_delete_white"
- chrome:tint="@color/light_mode_tint" />
- </RelativeLayout>
-
- <org.chromium.chrome.browser.widget.FadingShadowView
- android:id="@+id/eb_detail_shadow"
- android:layout_width="match_parent"
- android:layout_height="4dp" />
- </LinearLayout>
-
-</merge>
« no previous file with comments | « chrome/android/java_staging/AndroidManifest.xml ('k') | chrome/android/java_staging/res/layout/eb_edit.xml » ('j') | chrome/android/java_staging/res/layout/eb_edit.xml » ('J')

Powered by Google App Engine
This is Rietveld 408576698