From 26c574bdf92bfed671d7b4c8d494445a96db7824 Mon Sep 17 00:00:00 2001
From: jrizzoli <joey@cyanogenmoditalia.it>
Date: Thu, 7 Jan 2016 21:07:51 +0100
Subject: Snap: initial materialization

Just for initial ship

Change-Id: I8d6c0d71d1b94e6eb2f43ab962fb92de0e6c7093
Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
---
 res/values/arrays.xml    | 20 +++++------
 res/values/cm_colors.xml | 36 +++++++++++++++++++
 res/values/colors.xml    | 94 ++++++++++++++++++++++++------------------------
 res/values/dimens.xml    |  1 +
 res/values/styles.xml    |  2 +-
 5 files changed, 95 insertions(+), 58 deletions(-)
 create mode 100644 res/values/cm_colors.xml

(limited to 'res/values')

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 7e61633aa..1bf6f1450 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -401,16 +401,16 @@
     </string-array>
 
     <array name="camera_flashmode_icons" translatable="false">
-        <item>@drawable/ic_flash_off_holo_light</item>
-        <item>@drawable/ic_flash_auto_holo_light</item>
-        <item>@drawable/ic_flash_on_holo_light</item>
+        <item>@drawable/ic_flash_off</item>
+        <item>@drawable/ic_flash_auto</item>
+        <item>@drawable/ic_flash_on</item>
         <item>@drawable/ic_flash_redeye_holo_light</item>
     </array>
 
     <array name="camera_flashmode_largeicons" translatable="false">
-        <item>@drawable/ic_flash_off_holo_light</item>
-        <item>@drawable/ic_flash_auto_holo_light</item>
-        <item>@drawable/ic_flash_on_holo_light</item>
+        <item>@drawable/ic_flash_off</item>
+        <item>@drawable/ic_flash_auto</item>
+        <item>@drawable/ic_flash_on</item>
         <item>@drawable/ic_flash_redeye_holo_light</item>
     </array>
 
@@ -431,13 +431,13 @@
     </string-array>
 
     <array name="video_flashmode_icons" translatable="false">
-        <item>@drawable/ic_flash_off_holo_light</item>
-        <item>@drawable/ic_flash_on_holo_light</item>
+        <item>@drawable/ic_flash_off</item>
+        <item>@drawable/ic_flash_on</item>
     </array>
 
     <array name="video_flashmode_largeicons" translatable="false">
-        <item>@drawable/ic_flash_off_holo_light</item>
-        <item>@drawable/ic_flash_on_holo_light</item>
+        <item>@drawable/ic_flash_off</item>
+        <item>@drawable/ic_flash_on</item>
     </array>
 
     <string-array name="pref_camera_recordlocation_entryvalues" translatable="false">
diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml
new file mode 100644
index 000000000..371a3db51
--- /dev/null
+++ b/res/values/cm_colors.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <color name="white">#fafafa</color>
+    <color name="black">#212121</color>
+    <color name="grey">#e0e0e0</color>
+    <color name="transparent">@android:color/transparent</color>
+
+    <color name="red">#F44336</color>
+    <color name="green">#4CAF50</color>
+    <color name="blue">#3F51B5</color>
+
+    <color name="pic">@color/white</color>
+    <color name="pic_pressed">@color/grey</color>
+
+    <color name="video">@color/red</color>
+    <color name="video_pressed">#D32F2F</color>
+    <color name="video_stop">#E57373</color>
+
+    <color name="pano">@color/green</color>
+    <color name="pano_pressed">#388E3C</color>
+    <color name="pano_stop">#81C784</color>
+</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index b289cafd8..82e061168 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -14,68 +14,68 @@
      limitations under the License.
 -->
 <resources>
-    <color name="default_background">#000</color>
+    <color name="default_background">@color/black</color>
 
     <!-- configuration for album set page -->
-    <color name="albumset_background">#1A1A1A</color>
-    <color name="albumset_placeholder">#333</color>
-    <color name="albumset_label_background">#EE414143</color>
-    <color name="albumset_label_title">#FBFBFB</color>
-    <color name="albumset_label_count">#A9ABAD</color>
+    <color name="albumset_background">@color/black</color>
+    <color name="albumset_placeholder">@color/black</color>
+    <color name="albumset_label_background">@color/black</color>
+    <color name="albumset_label_title">@color/white</color>
+    <color name="albumset_label_count">@color/grey</color>
 
     <!-- configuration for album page -->
-    <color name="album_background">#1A1A1A</color>
-    <color name="album_placeholder">#333</color>
+    <color name="album_background">@color/black</color>
+    <color name="album_placeholder">@color/black</color>
 
     <!-- configuration for photo page -->
-    <color name="photo_background">#1A1A1A</color>
-    <color name="photo_placeholder">#333</color>
+    <color name="photo_background">@color/black</color>
+    <color name="photo_placeholder">@color/black</color>
 
     <!-- configuration for manage cache page -->
-    <color name="cache_background">#1A1A1A</color>
-    <color name="cache_placeholder">#333</color>
+    <color name="cache_background">@color/black</color>
+    <color name="cache_placeholder">@color/black</color>
 
-    <color name="bitmap_screennail_placeholder">#333</color>
+    <color name="bitmap_screennail_placeholder">@color/black</color>
 
-    <color name="slideshow_background">#1A1A1A</color>
+    <color name="slideshow_background">@color/black</color>
 
-    <color name="button_dark_transparent_background">#6000</color>
+    <color name="button_dark_transparent_background">@color/black</color>
 
-    <color name="ingest_highlight_semitransparent">#8833b5e5</color>
-    <color name="ingest_date_tile_text">#33b5e5</color>
+    <color name="ingest_highlight_semitransparent">@color/blue</color>
+    <color name="ingest_date_tile_text">@color/blue</color>
 
     <!-- Camera resources below -->
 
-    <color name="recording_time_elapsed_text">#FFFFFFFF</color>
-    <color name="recording_time_remaining_text">#FFFF0033</color>
-    <color name="on_viewfinder_label_background_color">#77333333</color>
-    <color name="review_control_pressed_color">#FF33B5E5</color>
-    <color name="review_control_pressed_fan_color">#3F33B5E5</color>
-    <color name="review_background">#FF000000</color>
-    <color name="icon_disabled_color">#DD777777</color>
-    <color name="time_lapse_arc">#FFC5C5C5</color>
-    <color name="indicator_background">#40000000</color>
-    <color name="popup_title_color">#ff33b5e5</color>
-    <color name="popup_background">#ff282828</color>
-    <color name="pano_progress_empty">#FF2E2E2E</color>
-    <color name="pano_progress_done">#FF33525E</color>
-    <color name="pano_progress_indication">#FF0099CC</color>
-    <color name="pano_progress_indication_fast">#FFFF2222</color>
-    <color name="mode_selection_border">#33B5E5</color>
-    <color name="holo_blue_light">#ff33b5e5</color>
-    <color name="bright_foreground_disabled_holo_dark">#ff4c4c4c</color>
-    <color name="bright_foreground_holo_dark">#fff3f3f3</color>
-    <color name="face_detect_start">#80ffffff</color>
-    <color name="face_detect_success">#8050d060</color>
-    <color name="face_detect_fail">#80d05060</color>
-    <color name="gray">#FFAAAAAA</color>
-
-    <color name="setting_color">#ff10aadc</color>
-    <color name="setting_color_light">#ffade9fd</color>
-    <color name="list_divider_color">#d8ababab</color>
-
-    <color name="camera_control_bg_opaque">#ff191919</color>
-    <color name="camera_control_bg_transparent">#4d191919</color>
+    <color name="recording_time_elapsed_text">@color/white</color>
+    <color name="recording_time_remaining_text">@color/red</color>
+    <color name="on_viewfinder_label_background_color">@color/black</color>
+    <color name="review_control_pressed_color">@color/blue</color>
+    <color name="review_control_pressed_fan_color">@color/blue</color>
+    <color name="review_background">@color/black</color>
+    <color name="icon_disabled_color">@color/grey</color>
+    <color name="time_lapse_arc">@color/grey</color>
+    <color name="indicator_background">@color/black</color>
+    <color name="popup_title_color">@color/blue</color>
+    <color name="popup_background">@color/black</color>
+    <color name="pano_progress_empty">@color/black</color>
+    <color name="pano_progress_done">#33525E</color>
+    <color name="pano_progress_indication">@color/blue</color>
+    <color name="pano_progress_indication_fast">@color/red</color>
+    <color name="mode_selection_border">@color/blue</color>
+    <color name="holo_blue_light">@color/blue</color>
+    <color name="bright_foreground_disabled_holo_dark">@color/black</color>
+    <color name="bright_foreground_holo_dark">@color/white</color>
+    <color name="face_detect_start">@color/white</color>
+    <color name="face_detect_success">@color/green</color>
+    <color name="face_detect_fail">@color/red</color>
+    <color name="gray">@color/grey</color>
+
+    <color name="setting_color">@color/black</color>
+    <color name="setting_color_light">@color/white</color>
+    <color name="list_divider_color">@color/black</color>
+
+    <color name="camera_control_bg_opaque">@color/black</color>
+    <color name="camera_control_bg_transparent">@color/black</color>
 
     <color name="refocus_indicator_1">#a0ffffff</color>
     <color name="refocus_indicator_2">#ff29b6f6</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 96394ad66..88379e8da 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -100,6 +100,7 @@
     <dimen name="face_circle_stroke">2dip</dimen>
     <dimen name="zoom_font_size">14pt</dimen>
     <dimen name="shutter_offset">11dp</dimen>
+    <dimen name="shutter_offset_top">2dp</dimen>
     <dimen name="size_thumbnail">200dip</dimen>
     <dimen name="size_preview">400dip</dimen>
     <dimen name="navigation_bar_height">48dip</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index fd44bb289..ebb9e0f19 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -103,7 +103,7 @@
         <item name="android:layout_gravity">center_vertical</item>
         <item name="android:gravity">center</item>
         <item name="android:singleLine">true</item>
-        <item name="android:textColor">@color/primary_text</item>
+        <item name="android:textColor">@color/white</item>
         <item name="android:textSize">@dimen/setting_item_text_size</item>
     </style>
     <style name="SettingRow">
-- 
cgit v1.2.3