diff options
author | d34d <clark@cyngn.com> | 2016-08-29 15:41:02 -0700 |
---|---|---|
committer | d34d <clark@cyngn.com> | 2016-08-31 09:44:52 -0700 |
commit | 550e88b1e62228124f22b2d70ce3bf45fe9a1314 (patch) | |
tree | 91efd4126034e8b91c463da8bd02a00cf7ff9751 /res/layout/fragment_pager_list.xml | |
parent | bcd90a38b28f7c57bce8057d855e4c276aab2776 (diff) | |
download | packages_apps_ThemeChooser-550e88b1e62228124f22b2d70ce3bf45fe9a1314.tar.gz packages_apps_ThemeChooser-550e88b1e62228124f22b2d70ce3bf45fe9a1314.tar.bz2 packages_apps_ThemeChooser-550e88b1e62228124f22b2d70ce3bf45fe9a1314.zip |
Fall cleaning
* Change package name to org.cyanogenmod.theme.chooser2
to avoid theme collisions with old OSS chooser
* Change parent theme to Theme.Material.Light
* Change minSdkVersion to 21 since we are going material
* Add selectors for bottom action buttons (app themer, shop themes)
* Add selector, using app themer color, for app themer list view
* Add selector for actions in theme cards
* Bring back OSS app icon
* Reduce log spam in ThemedTypefaceHelper
* Localize "new" tag using a TextView instead of an image
* Other random stuff
Change-Id: I73ef0b9c9370284e29ee00add87273cf54c83e0e
Diffstat (limited to 'res/layout/fragment_pager_list.xml')
-rw-r--r-- | res/layout/fragment_pager_list.xml | 89 |
1 files changed, 3 insertions, 86 deletions
diff --git a/res/layout/fragment_pager_list.xml b/res/layout/fragment_pager_list.xml index ca1d092..609dbaa 100644 --- a/res/layout/fragment_pager_list.xml +++ b/res/layout/fragment_pager_list.xml @@ -77,90 +77,7 @@ </FrameLayout> <!-- Title card --> - <FrameLayout - android:id="@+id/title_card" - android:layout_width="@dimen/theme_preview_width" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:background="@drawable/card_themepreview_bg"> - <LinearLayout - android:id="@+id/title_layout" - android:layout_width="match_parent" - android:layout_height="@dimen/title_card_height" - android:alpha="0"> - <LinearLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_gravity="center_vertical" - android:layout_marginStart="16dp" - android:orientation="vertical"> - <org.cyanogenmod.theme.widget.LatoTextView - android:id="@+id/title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:textColor="@color/theme_title_text_color"/> - <org.cyanogenmod.theme.widget.LatoTextView - android:id="@+id/author" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:textColor="@color/theme_author_text_color" - android:textSize="14dp" /> - </LinearLayout> - <ImageView - android:id="@+id/customize" - android:layout_width="47dp" - android:layout_height="match_parent" - android:scaleType="center" - android:src="@drawable/ic_theme_customize"/> - - <ImageView - android:id="@+id/overflow" - android:layout_width="36dp" - android:layout_height="match_parent" - android:layout_marginStart="1dp" - android:layout_marginEnd="8dp" - android:scaleType="center" - android:src="@drawable/ic_overflow_dark" - android:visibility="gone"/> - - <ImageView - android:id="@+id/delete" - android:layout_width="36dp" - android:layout_height="match_parent" - android:layout_marginStart="1dp" - android:layout_marginEnd="8dp" - android:scaleType="center" - android:src="@drawable/ic_theme_delete"/> - - <ImageView - android:id="@+id/reset" - android:layout_width="36dp" - android:layout_height="match_parent" - android:layout_marginStart="1dp" - android:layout_marginEnd="8dp" - android:scaleType="center" - android:src="@drawable/ic_theme_reset" - android:visibility="gone"/> - </LinearLayout> - <ProgressBar - android:id="@+id/apply_progress" - android:layout_width="match_parent" - android:layout_height="@dimen/apply_progress_height" - android:layout_gravity="center_vertical|right" - android:paddingStart="@dimen/apply_progress_padding" - android:paddingEnd="@dimen/apply_progress_padding" - android:indeterminate="false" - android:max="100" - android:progress="0" - android:progressDrawable="@drawable/apply_progress_bar" - android:visibility="gone" - style="@android:style/Widget.ProgressBar.Horizontal"/> - </FrameLayout> + <include layout="@layout/title_card"/> <!-- Each card in this layout should have a Space below it with one final Space for devices that have a navbar --> @@ -171,7 +88,7 @@ android:orientation="vertical" android:layout_marginTop="@dimen/additional_cards_margin_top" android:visibility="invisible"> - <org.cyanogenmod.theme.chooser.WallpaperCardView + <org.cyanogenmod.theme.chooser2.WallpaperCardView android:id="@+id/wallpaper_card" android:layout_width="match_parent" android:layout_height="@dimen/wallpaper_card_height" @@ -179,7 +96,7 @@ /> <Space android:layout_width="match_parent" android:layout_height="@dimen/expanded_card_margin_top" /> - <org.cyanogenmod.theme.chooser.WallpaperCardView + <org.cyanogenmod.theme.chooser2.WallpaperCardView android:id="@+id/lockscreen_card" android:visibility="gone" android:layout_width="match_parent" |