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

Unified Diff: ui/android/java/res/layout/color_picker_dialog_content.xml

Issue 62203014: Move WindowOpenDisposition.template to ui/base/android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix ui.gyp Created 7 years, 1 month 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
Index: ui/android/java/res/layout/color_picker_dialog_content.xml
diff --git a/ui/android/java/res/layout/color_picker_dialog_content.xml b/ui/android/java/res/layout/color_picker_dialog_content.xml
deleted file mode 100644
index 8aa4dbaeffd0dc88f6c72ec0169aa02da10c7422..0000000000000000000000000000000000000000
--- a/ui/android/java/res/layout/color_picker_dialog_content.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2013 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.
--->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:padding="15dp">
-
- <org.chromium.ui.ColorPickerAdvanced
- android:id="@+id/color_picker_advanced"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
-
- <FrameLayout
- android:id="@+id/color_picker_simple_border"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/color_picker_border"
- android:paddingStart="1px"
- android:paddingEnd="1px"
- android:paddingTop="1px">
-
- <org.chromium.ui.ColorPickerSimple
- android:id="@+id/color_picker_simple"
- android:layout_width="match_parent"
- android:layout_height="100dp"/>
- </FrameLayout>
-
- <FrameLayout
- android:id="@+id/more_colors_button_border"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@+id/color_picker_simple_border"
- android:background="@drawable/color_picker_border"
- android:padding="1px">
-
- <org.chromium.ui.ColorPickerMoreButton
- android:id="@+id/more_colors_button"
- style="?android:attr/buttonBarButtonStyle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="48dp"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:text="@string/color_picker_button_more" />
- </FrameLayout>
-
- </RelativeLayout>
-</ScrollView>

Powered by Google App Engine
This is Rietveld 408576698