diff options
| author | Clark Scheff <clark@cyngn.com> | 2014-09-16 17:37:56 -0700 |
|---|---|---|
| committer | Clark Scheff <clark@cyngn.com> | 2014-09-18 10:10:10 -0700 |
| commit | 1b26a0a42de901f80b124927aa3c2b8ada8cce29 (patch) | |
| tree | 33ecfa69b2d84546a1acde6490c7787f277a4041 /res/layout | |
| parent | e4c78144fecf4ec635b1b40b4f1c9949e0d25880 (diff) | |
| download | packages_apps_ThemeChooser-1b26a0a42de901f80b124927aa3c2b8ada8cce29.tar.gz packages_apps_ThemeChooser-1b26a0a42de901f80b124927aa3c2b8ada8cce29.tar.bz2 packages_apps_ThemeChooser-1b26a0a42de901f80b124927aa3c2b8ada8cce29.zip | |
Use linear layout inside scrollview for component selector
Change-Id: I9ad30111c8c3fbaabcf5748ec6cf1d7a9fc2eaa9
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/component_divider.xml | 10 | ||||
| -rw-r--r-- | res/layout/component_selector.xml | 29 |
2 files changed, 11 insertions, 28 deletions
diff --git a/res/layout/component_divider.xml b/res/layout/component_divider.xml deleted file mode 100644 index 997ec24..0000000 --- a/res/layout/component_divider.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 Cyanogen, Inc. ---> -<View xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="2dp" - android:layout_height="@dimen/component_divider_height" - android:layout_marginTop="32dp" - android:background="@color/component_divider_color"/> diff --git a/res/layout/component_selector.xml b/res/layout/component_selector.xml index ef54a89..64c1dde 100644 --- a/res/layout/component_selector.xml +++ b/res/layout/component_selector.xml @@ -4,7 +4,6 @@ --> <com.cyngn.theme.chooser.ComponentSelector xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:themes="http://schemas.android.com/apk/res-auto" android:id="@+id/component_selector" android:orientation="vertical" android:layout_width="match_parent" @@ -13,28 +12,22 @@ android:visibility="gone" android:background="@color/component_selection_background"> - <FrameLayout - android:id="@+id/selection_layout" + <com.cyngn.theme.widget.AutoSnapHorizontalScrollView + android:id="@+id/scroll_view" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:scrollbars="none"> - <au.com.glassechidna.velocityviewpager.VelocityViewPager - android:id="@+id/pager" - android:layout_width="match_parent" - android:layout_height="@dimen/component_selection_cell_height" - themes:itemsPerPage="4"/> - - <com.viewpagerindicator.CirclePageIndicator - android:id="@+id/page_indicator" + <android.widget.ComponentSelectorLinearLayout + android:id="@+id/content" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="8dp" - themes:radius="4dp" - themes:spacing="16dp" - themes:pageColor="@android:color/transparent" - themes:fillColor="@android:color/white"/> + android:layout_gravity="center_vertical" + android:divider="@drawable/component_selector_divider" + android:showDividers="middle" /> + + </com.cyngn.theme.widget.AutoSnapHorizontalScrollView> - </FrameLayout> <com.cyngn.theme.widget.NavBarSpace android:layout_width="match_parent" android:layout_height="@*android:dimen/system_bar_height"/> |