diff options
author | Luis Vidal <lvidal@cyngn.com> | 2015-12-23 22:17:38 -0600 |
---|---|---|
committer | Luis Vidal <lvidal@cyngn.com> | 2016-01-08 11:32:32 -0800 |
commit | ffd1eaea0b78df32f0bf7d4e4c691dd3dd57290e (patch) | |
tree | a5a9d8fab58757b2926d08a4b8c3678c6499e18a /res | |
parent | 98a98fca3ed0249f00d9d28e2997f4d240e813e4 (diff) | |
download | packages_apps_ThemeChooser-ffd1eaea0b78df32f0bf7d4e4c691dd3dd57290e.tar.gz packages_apps_ThemeChooser-ffd1eaea0b78df32f0bf7d4e4c691dd3dd57290e.tar.bz2 packages_apps_ThemeChooser-ffd1eaea0b78df32f0bf7d4e4c691dd3dd57290e.zip |
Show lock screen wallpapers & live lock screens in the same selector
Change-Id: I86e016d139da4adcec3191d982968b7a37f48c19
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/ribbon_live_lock_screen.xml | 33 | ||||
-rw-r--r-- | res/layout/fragment_pager_list.xml | 3 | ||||
-rw-r--r-- | res/layout/live_lock_component_selection_item.xml | 35 | ||||
-rw-r--r-- | res/layout/live_lock_screen_card.xml | 43 | ||||
-rw-r--r-- | res/layout/wallpaper_component_selection_item.xml | 9 | ||||
-rw-r--r-- | res/values/dimens.xml | 3 | ||||
-rw-r--r-- | res/values/ids.xml | 1 | ||||
-rw-r--r-- | res/values/integers.xml | 1 |
8 files changed, 42 insertions, 86 deletions
diff --git a/res/drawable/ribbon_live_lock_screen.xml b/res/drawable/ribbon_live_lock_screen.xml new file mode 100644 index 0000000..175e123 --- /dev/null +++ b/res/drawable/ribbon_live_lock_screen.xml @@ -0,0 +1,33 @@ +<?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/fragment_pager_list.xml b/res/layout/fragment_pager_list.xml index 9a635b4..ff76c80 100644 --- a/res/layout/fragment_pager_list.xml +++ b/res/layout/fragment_pager_list.xml @@ -174,9 +174,6 @@ /> <Space android:layout_width="match_parent" android:layout_height="@dimen/expanded_card_margin_top" /> - <include layout="@layout/live_lock_screen_card" /> - <Space android:layout_width="match_parent" - android:layout_height="@dimen/expanded_card_margin_top" /> <include layout="@layout/style_card" /> <Space android:layout_width="match_parent" android:layout_height="@dimen/expanded_card_margin_top" /> diff --git a/res/layout/live_lock_component_selection_item.xml b/res/layout/live_lock_component_selection_item.xml deleted file mode 100644 index d9414ba..0000000 --- a/res/layout/live_lock_component_selection_item.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 Cyanogen, Inc. ---> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="wrap_content" - android:layout_height="@dimen/component_selection_cell_height_live_lock" - android:background="@drawable/component_selection_selector"> - - <FrameLayout - android:id="@+id/wp_content" - android:layout_width="@dimen/component_selection_live_lock_screen_content_width" - android:layout_height="@dimen/component_selection_live_lock_screen_content_height" - android:layout_marginTop="@dimen/component_margin_top" - android:layout_gravity="center_horizontal"> - <ImageView - android:id="@+id/icon" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scaleType="fitCenter"/> - <View - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@drawable/wallpaper_border" /> - </FrameLayout> - - <com.cyngn.theme.widget.LatoTextView - android:id="@+id/title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - style="@style/component_title"/> - -</LinearLayout>
\ No newline at end of file diff --git a/res/layout/live_lock_screen_card.xml b/res/layout/live_lock_screen_card.xml deleted file mode 100644 index 33cd847..0000000 --- a/res/layout/live_lock_screen_card.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 Cyanogen, Inc. ---> -<com.cyngn.theme.chooser.ComponentCardView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/live_lock_screen_preview_container" - android:layout_width="match_parent" - android:layout_height="320dp" - android:orientation="vertical" - android:background="@drawable/card_bootanim_bg"> - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent"> - <!-- Need to set a valid source so this view can generate a valid bitmap - from drawing cache, otherwise it's size is 0x0 and a null bitmap is returned --> - <ImageView - android:id="@+id/live_lock_screen_preview" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/expanded_card_margin_top" - android:adjustViewBounds="true" - android:layout_gravity="center" - android:src="@drawable/card_bootanim_bg"/> - <com.cyngn.theme.widget.LatoTextView - android:id="@+id/label" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/live_lock_screen_label" - style="@style/card_label"/> - <LinearLayout - android:id="@+id/empty" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:visibility="gone"> - <ImageView - android:layout_width="20dp" - android:layout_height="20dp" - android:src="@drawable/ic_addcomponent"/> - </LinearLayout> - </FrameLayout> -</com.cyngn.theme.chooser.ComponentCardView> diff --git a/res/layout/wallpaper_component_selection_item.xml b/res/layout/wallpaper_component_selection_item.xml index 3fa99a9..365221e 100644 --- a/res/layout/wallpaper_component_selection_item.xml +++ b/res/layout/wallpaper_component_selection_item.xml @@ -18,11 +18,18 @@ android:id="@+id/icon" android:layout_width="match_parent" android:layout_height="match_parent" - android:scaleType="fitCenter"/> + android:scaleType="centerCrop"/> <View 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" /> </FrameLayout> <com.cyngn.theme.widget.LatoTextView diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 4c77bae..e5b909b 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -14,14 +14,11 @@ <dimen name="component_selection_cell_width">80dp</dimen> <dimen name="component_selection_cell_height">112dp</dimen> <dimen name="component_selection_cell_height_boot_anim">203dp</dimen> - <dimen name="component_selection_cell_height_live_lock">203dp</dimen> <dimen name="component_selection_cell_height_sounds">120dp</dimen> <dimen name="component_selection_content_width">48dp</dimen> <dimen name="component_selection_content_height">@dimen/component_selection_content_width</dimen> <dimen name="component_selection_bootani_content_width">80dp</dimen> <dimen name="component_selection_bootani_content_height">142dp</dimen> - <dimen name="component_selection_live_lock_screen_content_width">80dp</dimen> - <dimen name="component_selection_live_lock_screen_content_height">142dp</dimen> <dimen name="component_margin_top">12dp</dimen> <dimen name="card_padding_top">4dp</dimen> diff --git a/res/values/ids.xml b/res/values/ids.xml index e191df6..0e6acd1 100644 --- a/res/values/ids.xml +++ b/res/values/ids.xml @@ -4,4 +4,5 @@ <item type="id" name="tag_key_name"/> <item type="id" name="tag_key_package_name"/> <item type="id" name="tag_key_component_id"/> + <item type="id" name="tag_key_live_lock_screen"/> </resources>
\ No newline at end of file diff --git a/res/values/integers.xml b/res/values/integers.xml index 30146dd..b2d17f3 100644 --- a/res/values/integers.xml +++ b/res/values/integers.xml @@ -5,5 +5,4 @@ <resources> <integer name="default_items_per_page">4</integer> <integer name="bootani_items_per_page">3</integer> - <integer name="live_lock_screen_items_per_page">3</integer> </resources>
\ No newline at end of file |