summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--assets/default_holo_theme/holo_boot_anim.jpgbin21211 -> 0 bytes
-rw-r--r--assets/default_holo_theme/holo_homescreen.pngbin1144392 -> 0 bytes
-rw-r--r--assets/default_holo_theme/holo_lockscreen.pngbin1065767 -> 0 bytes
-rw-r--r--assets/default_holo_theme/style.jpgbin110358 -> 0 bytes
-rw-r--r--res/drawable/save_apply_button_selector.xml5
-rw-r--r--res/drawable/save_apply_button_selector_2.xml8
-rw-r--r--res/layout/activity_main.xml2
-rw-r--r--res/layout/save_apply_button.xml25
-rw-r--r--res/layout/save_apply_button_2.xml37
-rw-r--r--res/values/colors.xml4
-rw-r--r--src/com/cyngn/theme/widget/ClickableViewPager.java62
11 files changed, 20 insertions, 123 deletions
diff --git a/assets/default_holo_theme/holo_boot_anim.jpg b/assets/default_holo_theme/holo_boot_anim.jpg
deleted file mode 100644
index b8ebdfe..0000000
--- a/assets/default_holo_theme/holo_boot_anim.jpg
+++ /dev/null
Binary files differ
diff --git a/assets/default_holo_theme/holo_homescreen.png b/assets/default_holo_theme/holo_homescreen.png
deleted file mode 100644
index 41624d6..0000000
--- a/assets/default_holo_theme/holo_homescreen.png
+++ /dev/null
Binary files differ
diff --git a/assets/default_holo_theme/holo_lockscreen.png b/assets/default_holo_theme/holo_lockscreen.png
deleted file mode 100644
index d48e9c5..0000000
--- a/assets/default_holo_theme/holo_lockscreen.png
+++ /dev/null
Binary files differ
diff --git a/assets/default_holo_theme/style.jpg b/assets/default_holo_theme/style.jpg
deleted file mode 100644
index abd397d..0000000
--- a/assets/default_holo_theme/style.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable/save_apply_button_selector.xml b/res/drawable/save_apply_button_selector.xml
index 72bf578..3c8c7d3 100644
--- a/res/drawable/save_apply_button_selector.xml
+++ b/res/drawable/save_apply_button_selector.xml
@@ -3,7 +3,6 @@
Copyright (C) 2014 Cyanogen, Inc.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_focused="true" android:drawable="@drawable/save_apply_button_focused"/>
- <item android:state_pressed="true" android:drawable="@drawable/save_apply_button_pressed"/>
- <item android:drawable="@drawable/save_apply_button_normal"/>
+ <item android:state_pressed="true" android:drawable="@drawable/btn_apply_pressed"/>
+ <item android:drawable="@drawable/btn_apply_normal"/>
</selector> \ No newline at end of file
diff --git a/res/drawable/save_apply_button_selector_2.xml b/res/drawable/save_apply_button_selector_2.xml
deleted file mode 100644
index 3c8c7d3..0000000
--- a/res/drawable/save_apply_button_selector_2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2014 Cyanogen, Inc.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_pressed="true" android:drawable="@drawable/btn_apply_pressed"/>
- <item android:drawable="@drawable/btn_apply_normal"/>
-</selector> \ No newline at end of file
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index 834a525..54d0eb3 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -31,7 +31,7 @@
</LinearLayout>
<include layout="@layout/component_selector"/>
- <include layout="@layout/save_apply_button_2"/>
+ <include layout="@layout/save_apply_button"/>
<include layout="@layout/shop_themes"/>
</FrameLayout>
diff --git a/res/layout/save_apply_button.xml b/res/layout/save_apply_button.xml
index 79a5ff8..70d3b18 100644
--- a/res/layout/save_apply_button.xml
+++ b/res/layout/save_apply_button.xml
@@ -8,18 +8,27 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom|left"
- android:background="#000000"
android:visibility="gone">
- <Button
- android:id="@+id/save_apply_button"
+ <LinearLayout
+ android:orientation="horizontal"
android:layout_width="match_parent"
- android:layout_height="48dp"
- android:text="@string/save_and_apply_title"
- android:textAllCaps="true"
- android:textColor="@android:color/white"
- android:background="@drawable/save_apply_button_selector"/>
+ android:layout_height="wrap_content">
+ <Space
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"/>
+
+ <Button
+ android:id="@+id/save_apply_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="8dp"
+ android:layout_marginBottom="8dp"
+ android:background="@drawable/save_apply_button_selector"/>
+
+ </LinearLayout>
<Space
android:id="@+id/navbar_padding"
android:layout_width="match_parent"
diff --git a/res/layout/save_apply_button_2.xml b/res/layout/save_apply_button_2.xml
deleted file mode 100644
index e255bb1..0000000
--- a/res/layout/save_apply_button_2.xml
+++ /dev/null
@@ -1,37 +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:id="@+id/save_apply_layout"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom|left"
- android:visibility="gone">
-
- <LinearLayout
- android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <Space
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"/>
-
- <Button
- android:id="@+id/save_apply_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:layout_marginBottom="8dp"
- android:background="@drawable/save_apply_button_selector_2"/>
-
- </LinearLayout>
- <Space
- android:id="@+id/navbar_padding"
- android:layout_width="match_parent"
- android:layout_height="@*android:dimen/system_bar_height"/>
-
-</LinearLayout> \ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ccc58c0..c475ea3 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -26,10 +26,6 @@
<color name="component_selection_current_text_color">#50acff</color>
<color name="background">#d6d6d8</color>
- <drawable name="save_apply_button_normal">#cd00b3e6</drawable>
- <drawable name="save_apply_button_focused">#cd1fcdff</drawable>
- <drawable name="save_apply_button_pressed">#cd0093bd</drawable>
-
<color name="apply_progress_background_color">#e0dfe1</color>
<color name="apply_progress_color">#00b3e6</color>
<color name="wallpaper_label">#ffffff</color>
diff --git a/src/com/cyngn/theme/widget/ClickableViewPager.java b/src/com/cyngn/theme/widget/ClickableViewPager.java
deleted file mode 100644
index d1774ba..0000000
--- a/src/com/cyngn/theme/widget/ClickableViewPager.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2014 The CyanogenMod, Inc.
- */
-package com.cyngn.theme.widget;
-
-import android.content.Context;
-import android.support.v4.view.ViewPager;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.ViewConfiguration;
-
-/**
- * Adds click functionality for the view pager since it not normally clickable
- * and focus/clickable attributes have no impact on it.
- */
-public class ClickableViewPager extends ViewPager {
- private boolean mIsDragging = false;
- private float mSlop;
- private float mLastX;
- private float mLastY;
-
- public ClickableViewPager(Context context) {
- super(context);
- initView(context);
- }
-
- public ClickableViewPager(Context context, AttributeSet attrs) {
- super(context, attrs);
- initView(context);
- }
-
- private void initView(Context context) {
- mSlop = ViewConfiguration.get(context).getScaledTouchSlop();
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent ev) {
- switch (ev.getAction()) {
- case MotionEvent.ACTION_DOWN:
- mLastX = ev.getX();
- mLastY = ev.getY();
- break;
- case MotionEvent.ACTION_MOVE:
- float xDist = Math.abs(mLastX - ev.getX());
- float yDist = Math.abs(mLastY - ev.getY());
- if (xDist > mSlop || yDist > mSlop) {
- mIsDragging = true;
- }
- break;
- case MotionEvent.ACTION_CANCEL:
- mIsDragging = false;
- break;
- case MotionEvent.ACTION_UP:
- if (!mIsDragging) {
- performClick();
- }
- mIsDragging = false;
- break;
- }
- return super.onTouchEvent(ev);
- }
-} \ No newline at end of file
generated by cgit v1.1 at 2024-05-29 16:27:35 +0000