Themes: Expose and separate hard coded colors for themes
Change-Id: I970a854d0fa7c569dc876337a23959fbbc011e16
Signed-off-by: Bryan Owens <djbryan3540@gmail.com>
diff --git a/res/layout-sw600dp/snapshot_item.xml b/res/layout-sw600dp/snapshot_item.xml
index 7fc1782..f760479 100644
--- a/res/layout-sw600dp/snapshot_item.xml
+++ b/res/layout-sw600dp/snapshot_item.xml
@@ -21,12 +21,12 @@
android:padding="@dimen/combo_snapshot_item_padding">
<ImageView
android:id="@+id/thumb"
- android:src="@color/white"
+ android:src="@color/thumb_src_color"
android:layout_width="@dimen/bookmarkThumbnailWidth"
android:layout_height="@dimen/bookmarkThumbnailHeight"
android:scaleType="centerCrop"
android:cropToPadding="true"
- android:background="@color/white" />
+ android:background="@color/white_background_color" />
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
@@ -38,7 +38,7 @@
android:ellipsize="end"
android:textSize="14sp"
android:typeface="sans"
- android:textColor="#AAAAAA"
+ android:textColor="@color/snapshot_item_date_text_color"
android:paddingStart="6dip"
android:paddingEnd="2dip"
android:gravity="center_vertical" />
diff --git a/res/layout/anim_screen.xml b/res/layout/anim_screen.xml
index 9dc91d5..b00f25b 100644
--- a/res/layout/anim_screen.xml
+++ b/res/layout/anim_screen.xml
@@ -31,7 +31,7 @@
android:id="@+id/anim_screen_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@color/white" />
+ android:background="@color/white_background_color" />
<!-- block the size of the menu (to protect touch during animations) -->
<!-- View
diff --git a/res/layout/bookmark_sync_wizard.xml b/res/layout/bookmark_sync_wizard.xml
index 3a3d9da..a224025 100644
--- a/res/layout/bookmark_sync_wizard.xml
+++ b/res/layout/bookmark_sync_wizard.xml
@@ -22,7 +22,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="@android:color/black">
+ android:background="@color/bookmark_sync_wizard_background_color">
<TextView
android:layout_width="match_parent"
@@ -47,7 +47,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="@android:color/black">
+ android:background="@color/bookmark_sync_wizard_background_color">
<TextView
android:id="@+id/select_account_description"
@@ -72,7 +72,7 @@
android:id="@+id/confirm"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@android:color/black"
+ android:background="@color/bookmark_sync_wizard_background_color"
android:textAppearance="?android:attr/textAppearanceMedium" />
</view>
diff --git a/res/layout/bookmarkthumbnailwidget.xml b/res/layout/bookmarkthumbnailwidget.xml
index 8cecd98..d6303ac 100644
--- a/res/layout/bookmarkthumbnailwidget.xml
+++ b/res/layout/bookmarkthumbnailwidget.xml
@@ -28,7 +28,7 @@
android:verticalSpacing="@dimen/widgetVerticalSpacing"
android:drawSelectorOnTop="true"
android:listSelector="@drawable/bookmark_widget_thumb_selector"
- android:background="@color/white" />
+ android:background="@color/bookmarks_list_background_color" />
<ImageButton
android:id="@+id/app_shortcut"
diff --git a/res/layout/bookmarkthumbnailwidget_item.xml b/res/layout/bookmarkthumbnailwidget_item.xml
index 755153b..9b4b84f 100644
--- a/res/layout/bookmarkthumbnailwidget_item.xml
+++ b/res/layout/bookmarkthumbnailwidget_item.xml
@@ -21,12 +21,12 @@
android:layout_height="wrap_content">
<ImageView
android:id="@+id/thumb"
- android:src="@color/white"
+ android:src="@color/thumb_src_color"
android:layout_width="match_parent"
android:layout_height="@dimen/widgetThumbnailHeight"
android:scaleType="centerCrop"
android:cropToPadding="true"
- android:background="@color/white" />
+ android:background="@color/bookmarks_list_background_color" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -54,6 +54,6 @@
android:ellipsize="end"
android:textSize="12sp"
android:typeface="sans"
- android:textColor="@android:color/white" />
+ android:textColor="@color/bookmarkthumbnailwidget_item_label_text_color" />
</LinearLayout>
</RelativeLayout>
diff --git a/res/layout/bookmarkthumbnailwidget_item_folder.xml b/res/layout/bookmarkthumbnailwidget_item_folder.xml
index 2d3f453..9c63a79 100644
--- a/res/layout/bookmarkthumbnailwidget_item_folder.xml
+++ b/res/layout/bookmarkthumbnailwidget_item_folder.xml
@@ -21,12 +21,12 @@
android:layout_height="wrap_content">
<ImageView
android:id="@+id/thumb"
- android:src="@color/white"
+ android:src="@color/thumb_src_color"
android:layout_width="match_parent"
android:layout_height="@dimen/widgetThumbnailHeight"
android:scaleType="fitEnd"
android:cropToPadding="true"
- android:background="@color/white" />
+ android:background="@color/bookmarks_list_background_color" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -54,6 +54,6 @@
android:ellipsize="end"
android:textSize="12sp"
android:typeface="sans"
- android:textColor="@android:color/white" />
+ android:textColor="@color/bookmarkthumbnailwidget_item_label_text_color" />
</LinearLayout>
</RelativeLayout>
diff --git a/res/layout/browser_add_bookmark_content.xml b/res/layout/browser_add_bookmark_content.xml
index cb51cca..fd64c3f 100644
--- a/res/layout/browser_add_bookmark_content.xml
+++ b/res/layout/browser_add_bookmark_content.xml
@@ -56,7 +56,7 @@
<LinearLayout android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="@color/white"
+ android:background="@color/white_background_color"
android:elevation="0dp" >
<LinearLayout android:layout_width="match_parent"
@@ -153,7 +153,7 @@
android:layout_alignParentEnd="true"
android:hint="@string/http"
android:inputType="textUri"
- android:textColor="@color/black"
+ android:textColor="@color/black_text_color"
android:paddingStart="16dp"
android:paddingBottom="16dp"
android:textSize="18sp" />
diff --git a/res/layout/browser_tab_crash.xml b/res/layout/browser_tab_crash.xml
index 86f8928..98e3c30 100644
--- a/res/layout/browser_tab_crash.xml
+++ b/res/layout/browser_tab_crash.xml
@@ -31,7 +31,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="@color/white">
+ android:background="@color/white_background_color">
<TextView
android:layout_width="wrap_content"
@@ -40,7 +40,7 @@
android:paddingTop="20dp"
android:paddingBottom="20dp"
android:textSize="20dp"
- android:textColor="@color/black"
+ android:textColor="@color/black_text_color"
android:text="@string/browser_tab_crash_snap" />
<Button
@@ -48,7 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:background="@android:color/holo_green_dark"
+ android:background="@color/browser_crash_reload_btn_color"
android:text="@string/browser_tab_crash_reload"/>
<TextView android:layout_width="wrap_content"
@@ -58,7 +58,7 @@
android:paddingEnd="10dp"
android:paddingTop="20dp"
android:textSize="15dp"
- android:textColor="@color/black"
+ android:textColor="@color/black_text_color"
android:text="@string/browser_tab_crash_message" />
</LinearLayout>
diff --git a/res/layout/combo_view.xml b/res/layout/combo_view.xml
index 81e08c9..dbd0c1d 100644
--- a/res/layout/combo_view.xml
+++ b/res/layout/combo_view.xml
@@ -33,7 +33,7 @@
<com.android.browser.ComboView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/white"
+ android:background="@color/white_background_color"
android:orientation="vertical">
<android.support.v4.view.ViewPager
diff --git a/res/layout/download_settings.xml b/res/layout/download_settings.xml
index 374f51c..45e1de8 100644
--- a/res/layout/download_settings.xml
+++ b/res/layout/download_settings.xml
@@ -22,7 +22,7 @@
<LinearLayout android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="@color/white"
+ android:background="@color/white_background_color"
android:elevation="0dp" >
<LinearLayout android:layout_width="match_parent"
@@ -107,7 +107,7 @@
android:layout_alignParentEnd="true"
android:editable="false"
android:focusableInTouchMode="false"
- android:textColor="@color/black"
+ android:textColor="@color/black_text_color"
android:paddingStart="16dp"
android:paddingBottom="16dp"
android:textSize="18sp" />
@@ -131,7 +131,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textColor="@color/black"
+ android:textColor="@color/black_text_color"
android:text="@string/download_size_hint"
android:textSize="18sp" />
<TextView
@@ -164,7 +164,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/download_eta_hint"
- android:textColor="@color/black"
+ android:textColor="@color/black_text_color"
android:textSize="18sp" />
<TextView
android:id="@+id/download_estimate_time_content"
diff --git a/res/layout/my_navigation_add_page.xml b/res/layout/my_navigation_add_page.xml
index 46943c6..5954ae4 100755
--- a/res/layout/my_navigation_add_page.xml
+++ b/res/layout/my_navigation_add_page.xml
@@ -49,7 +49,7 @@
android:gravity="center_vertical"
android:text="@string/my_navigation_edit_label"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="@android:color/white" />
+ android:textColor="@color/dialog_title_text_color" />
</LinearLayout>
<ScrollView
diff --git a/res/layout/snapshot_item.xml b/res/layout/snapshot_item.xml
index 7fc1782..f760479 100644
--- a/res/layout/snapshot_item.xml
+++ b/res/layout/snapshot_item.xml
@@ -21,12 +21,12 @@
android:padding="@dimen/combo_snapshot_item_padding">
<ImageView
android:id="@+id/thumb"
- android:src="@color/white"
+ android:src="@color/thumb_src_color"
android:layout_width="@dimen/bookmarkThumbnailWidth"
android:layout_height="@dimen/bookmarkThumbnailHeight"
android:scaleType="centerCrop"
android:cropToPadding="true"
- android:background="@color/white" />
+ android:background="@color/white_background_color" />
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
@@ -38,7 +38,7 @@
android:ellipsize="end"
android:textSize="14sp"
android:typeface="sans"
- android:textColor="#AAAAAA"
+ android:textColor="@color/snapshot_item_date_text_color"
android:paddingStart="6dip"
android:paddingEnd="2dip"
android:gravity="center_vertical" />
diff --git a/res/layout/swe_menu_item.xml b/res/layout/swe_menu_item.xml
index 9be47cd..0e84123 100644
--- a/res/layout/swe_menu_item.xml
+++ b/res/layout/swe_menu_item.xml
@@ -35,7 +35,7 @@
android:id="@+id/menu_item_checkbox"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:tint="@color/black"
+ android:tint="@color/menu_item_checkbox_tint_color"
android:visibility="gone"
android:clickable="true" />
</LinearLayout>
diff --git a/res/layout/tab.xml b/res/layout/tab.xml
index 68eeaf6..c58959f 100755
--- a/res/layout/tab.xml
+++ b/res/layout/tab.xml
@@ -28,7 +28,7 @@
<ImageView android:id="@+id/navview_opacity"
android:layout_gravity="top"
android:scaleType="fitStart"
- android:background="@color/black"
+ android:background="@color/navview_opacity_background_color"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent" />
diff --git a/res/layout/webview_preview.xml b/res/layout/webview_preview.xml
index 57a904d..9d4c5ac 100644
--- a/res/layout/webview_preview.xml
+++ b/res/layout/webview_preview.xml
@@ -78,8 +78,8 @@
android:layout_below="@android:id/summary"
android:layout_toEndOf="@android:id/widget_frame"
android:layout_alignParentEnd="true"
- android:textColor="@color/black"
- android:background="@color/white"/>
+ android:textColor="@color/black_text_color"
+ android:background="@color/white_background_color"/>
</RelativeLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index b782dfc..2d73f1c 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -85,4 +85,18 @@
<!-- location infobar color -->
<color name="infobar_accent_blue">@color/accent</color>
+
+
+ <!-- Exposed colors for themes -->
+ <color name="bookmark_sync_wizard_background_color">@android:color/black</color>
+ <color name="bookmarkthumbnailwidget_item_label_text_color">@android:color/white</color>
+ <color name="white_background_color">@color/white</color>
+ <color name="black_text_color">@color/black</color>
+ <color name="bookmarks_list_background_color">@color/white</color>
+ <color name="snapshot_item_date_text_color">#AAAAAA</color>
+ <color name="browser_crash_reload_btn_color">@android:color/holo_green_dark</color>
+ <color name="dialog_title_text_color">@android:color/white</color>
+ <color name="thumb_src_color">@color/white</color>
+ <color name="menu_item_checkbox_tint_color">@color/black</color>
+ <color name="navview_opacity_background_color">@color/black</color>
</resources>