diff options
author | Luis Vidal <lvidal@cyngn.com> | 2016-02-02 11:56:12 -0800 |
---|---|---|
committer | Luis Vidal <lvidal@cyngn.com> | 2016-02-04 15:00:22 -0800 |
commit | 4028c36068d4d9dac12b989e937e5ad3486a1bd3 (patch) | |
tree | 5704942c1d145bc1feafbf74363c9c962d3246a1 /res | |
parent | 73b46248a11d3d5f5aa0e706bef89b65f87b715e (diff) | |
download | packages_apps_ThemeChooser-4028c36068d4d9dac12b989e937e5ad3486a1bd3.tar.gz packages_apps_ThemeChooser-4028c36068d4d9dac12b989e937e5ad3486a1bd3.tar.bz2 packages_apps_ThemeChooser-4028c36068d4d9dac12b989e937e5ad3486a1bd3.zip |
Rebadge 'Live' in theme chooser to 'Animated'
Replaces the static red ribon with a text view so the
label can be translated. Default text is set to 'ANIM'
Change-Id: Ic701d28bfd20568419a4ea2063ee208210037389
TICKET: CYNGNOS-1688
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/ribbon_live_lock_screen.xml | 33 | ||||
-rw-r--r-- | res/layout/wallpaper_component_selection_item.xml | 27 | ||||
-rw-r--r-- | res/values/dimens.xml | 9 | ||||
-rw-r--r-- | res/values/strings.xml | 1 | ||||
-rw-r--r-- | res/values/styles.xml | 10 |
5 files changed, 40 insertions, 40 deletions
diff --git a/res/drawable/ribbon_live_lock_screen.xml b/res/drawable/ribbon_live_lock_screen.xml deleted file mode 100644 index 175e123..0000000 --- a/res/drawable/ribbon_live_lock_screen.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (c) 2015 The CyanogenMod 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. ---> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - - <path - android:fillColor="#f44336" - android:pathData="M0,0h16l8,8v16L0,0z" /> - <path - android:fillColor="#ffffff" - android:pathData="M10.5,5l1.3,1.3l-0.5,0.5L9.4,4.9l3-3L13,2.5L10.5,5z -M12.9,8.4l-0.6-0.6l3-3l0.6,0.6L12.9,8.4z M15.8,9.8 -l3-1.6l0.7,0.7l-4.1,2l-0.6-0.6l2-4.1l0.7,0.7L15.8,9.8z -M20.4,13.2L19.2,12l-0.8,0.8l1.4,1.4l-0.5,0.5l-2-2l3-3l2,2l-0.5,0.5 -l-1.4-1.4l-0.7,0.7l1.2,1.2L20.4,13.2z" /> -</vector> diff --git a/res/layout/wallpaper_component_selection_item.xml b/res/layout/wallpaper_component_selection_item.xml index 365221e..e36ec0a 100644 --- a/res/layout/wallpaper_component_selection_item.xml +++ b/res/layout/wallpaper_component_selection_item.xml @@ -23,13 +23,26 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/wallpaper_border" /> - <ImageView - android:id="@+id/live_lock_screen_ribbon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="top|right" - android:src="@drawable/ribbon_live_lock_screen" - android:visibility="gone" /> + <LinearLayout + android:id="@+id/live_lock_screen_badge" + android:orientation="vertical" + android:layout_width="@dimen/animated_lock_screen_badge_width" + android:layout_height="@dimen/animated_lock_screen_badge_height" + android:background="@android:color/white" + android:layout_gravity="center_horizontal|bottom" + android:visibility="gone"> + <com.cyngn.theme.widget.FittedTextView + android:layout_width="@dimen/animated_lock_screen_text_width" + android:layout_height="@dimen/animated_lock_screen_text_height" + android:includeFontPadding="false" + android:gravity="center" + android:layout_marginLeft="@dimen/animated_lock_screen_text_margin_left" + android:layout_marginRight="@dimen/animated_lock_screen_text_margin_right" + android:layout_marginTop="@dimen/animated_lock_screen_text_margin_top" + android:layout_marginBottom="@dimen/animated_lock_screen_text_margin_bottom" + style="@style/animated_lock_screen_badge_text_style" + android:text="@string/animated_lock_screen_badge_text"/> + </LinearLayout> </FrameLayout> <com.cyngn.theme.widget.LatoTextView diff --git a/res/values/dimens.xml b/res/values/dimens.xml index e5b909b..b5f9465 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -90,4 +90,13 @@ <dimen name="floating_window_drag_delta">2dp</dimen> <dimen name="floating_window_starting_point_y">50dp</dimen> + <!-- Animated Lock Screen badge dimensions --> + <dimen name="animated_lock_screen_badge_width">48dp</dimen> + <dimen name="animated_lock_screen_badge_height">16dp</dimen> + <dimen name="animated_lock_screen_text_height">12dp</dimen> + <dimen name="animated_lock_screen_text_width">42dp</dimen> + <dimen name="animated_lock_screen_text_margin_top">2dp</dimen> + <dimen name="animated_lock_screen_text_margin_right">3dp</dimen> + <dimen name="animated_lock_screen_text_margin_bottom">3dp</dimen> + <dimen name="animated_lock_screen_text_margin_left">3dp</dimen> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index e191128..6256c61 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -89,4 +89,5 @@ <string name="read_external_permission_denied_message">Theme chooser cannot access media and is unable to pick an image at this time.</string> + <string name="animated_lock_screen_badge_text">Anim</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 467e89f..3fca6f9 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -128,4 +128,14 @@ <item name="android:textColor">@color/tag_text_color</item> <item name="android:textAllCaps">true</item> </style> + + <style name="animated_lock_screen_badge_text_style"> + <item name="android:fontFamily">sans-serif</item> + <item name="android:textStyle">bold</item> + <item name="android:alpha">0.54</item> + <item name="android:textSize">12sp</item> + <item name="android:letterSpacing">0.2</item> + <item name="android:textColor">@android:color/black</item> + <item name="android:textAllCaps">true</item> + </style> </resources> |