Change mode drawer text weight to light, change camera mode color

Bug: 11996762
Bug: 11996767
Change-Id: I51ca31795856b91bc78f6d579dd33ec527c1f57b

diff --git a/assets/fonts/Roboto-Light.ttf b/assets/fonts/Roboto-Light.ttf
new file mode 100644 (file)
index 0000000..13bf13a
Binary files /dev/null and b/assets/fonts/Roboto-Light.ttf differ

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 02c8cd2..9edd892 100644 (file)
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -76,7 +76,7 @@
     <color name="mode_selector_background_dark">#e7e7e7</color>
     <color name="mode_list_background">#00000000</color>
 
-    <color name="camera_mode_color">#547dbe</color>
+    <color name="camera_mode_color">#76a7fa</color>
     <color name="video_mode_color">#e57368</color>
     <color name="craft_mode_color">#8bc474</color>
     <color name="photosphere_mode_color">#f1c938</color>

diff --git a/src/com/android/camera/ui/ModeSelectorItem.java b/src/com/android/camera/ui/ModeSelectorItem.java
index 5b6b1a2..eb7433e 100644 (file)
--- a/src/com/android/camera/ui/ModeSelectorItem.java
+++ b/src/com/android/camera/ui/ModeSelectorItem.java
@@ -19,12 +19,14 @@ package com.android.camera.ui;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
+import android.graphics.Typeface;
 import android.graphics.drawable.GradientDrawable;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.android.camera.util.ApiHelper;
 import com.android.camera2.R;
 
 /**
@@ -66,6 +68,15 @@ class ModeSelectorItem extends FrameLayout {
     public void onFinishInflate() {
         mIcon = (ImageView) findViewById(R.id.selector_icon);
         mText = (TextView) findViewById(R.id.selector_text);
+        Typeface typeface;
+        if (ApiHelper.HAS_ROBOTO_LIGHT_FONT) {
+            typeface = Typeface.create("sans-serif-light", Typeface.NORMAL);
+        } else {
+            // Load roboto_light typeface from assets.
+            typeface = Typeface.createFromAsset(getResources().getAssets(),
+                    "Roboto-Light.ttf");
+        }
+        mText.setTypeface(typeface);
         mMinVisibleWidth = getResources()
                 .getDimensionPixelSize(R.dimen.mode_selector_icon_block_width);
     }

diff --git a/src/com/android/camera/util/ApiHelper.java b/src/com/android/camera/util/ApiHelper.java
index dd5208c..3b8cea6 100644 (file)
--- a/src/com/android/camera/util/ApiHelper.java
+++ b/src/com/android/camera/util/ApiHelper.java
@@ -38,6 +38,8 @@ public class ApiHelper {
             Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN;
     public static final boolean HAS_SURFACE_TEXTURE_RECORDING =
             Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN;
+    public static final boolean HAS_ROBOTO_LIGHT_FONT =
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN;
 
     public static final boolean HAS_CAMERA_HDR_PLUS = isKitKatOrHigher();
     public static final boolean HAS_CAMERA_HDR =