commit dacf2ef9f503ffb672b31c849265c098a1cdfb68 Author: Nathan Freitas <nathan@freitas.net> Date: Sat Oct 29 11:42:27 2016 -0400 cleanup resources and unused drawables --- orbotservice/src/main/res/drawable/button.xml | 37 --------------------- orbotservice/src/main/res/drawable/button_off.xml | 37 --------------------- orbotservice/src/main/res/drawable/button_on.xml | 35 ------------------- .../src/main/res/drawable/classyfabric.png | Bin 8856 -> 0 bytes orbotservice/src/main/res/drawable/error.png | Bin 2922 -> 0 bytes .../src/main/res/drawable/ic_chatsecure.png | Bin 4013 -> 0 bytes .../src/main/res/drawable/ic_duckduckgo.png | Bin 5042 -> 0 bytes orbotservice/src/main/res/drawable/ic_launcher.png | Bin 6055 -> 0 bytes .../src/main/res/drawable/ic_menu_about.png | Bin 1771 -> 0 bytes .../src/main/res/drawable/ic_menu_exit.png | Bin 2693 -> 0 bytes .../src/main/res/drawable/ic_menu_goto.png | Bin 1636 -> 0 bytes orbotservice/src/main/res/drawable/ic_play.png | Bin 3560 -> 0 bytes .../src/main/res/drawable/ic_stat_tor_off.png | Bin 744 -> 0 bytes .../src/main/res/drawable/ic_stat_tor_xfer.png | Bin 600 -> 0 bytes orbotservice/src/main/res/drawable/ic_twitter.png | Bin 2797 -> 0 bytes orbotservice/src/main/res/drawable/icon_martus.png | Bin 6763 -> 0 bytes orbotservice/src/main/res/drawable/icon_orfox.png | Bin 7617 -> 0 bytes .../src/main/res/drawable/icon_story_maker.png | Bin 4290 -> 0 bytes orbotservice/src/main/res/drawable/inverse.png | Bin 1027 -> 0 bytes orbotservice/src/main/res/drawable/n8fr8.jpg | Bin 18062 -> 0 bytes orbotservice/src/main/res/drawable/oldtoroff.png | Bin 63700 -> 0 bytes orbotservice/src/main/res/drawable/oldtoron.png | Bin 121036 -> 0 bytes .../src/main/res/drawable/oldtorstarting.png | Bin 111753 -> 0 bytes orbotservice/src/main/res/drawable/onion32.png | Bin 1599 -> 0 bytes orbotservice/src/main/res/drawable/tilebg.xml | 4 --- orbotservice/src/main/res/drawable/toggle.xml | 8 ----- orbotservice/src/main/res/drawable/tor.png | Bin 4766 -> 0 bytes orbotservice/src/main/res/drawable/tor25.png | Bin 2227 -> 0 bytes orbotservice/src/main/res/drawable/toroff.png | Bin 39556 -> 0 bytes orbotservice/src/main/res/drawable/toron.png | Bin 47022 -> 0 bytes orbotservice/src/main/res/drawable/torstarting.png | Bin 41700 -> 0 bytes orbotservice/src/main/res/values/styles.xml | 5 +++ 32 files changed, 5 insertions(+), 121 deletions(-) diff --git a/orbotservice/src/main/res/drawable/button.xml b/orbotservice/src/main/res/drawable/button.xml deleted file mode 100644 index 9f44d24..0000000 --- a/orbotservice/src/main/res/drawable/button.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" > - <shape> - <solid - android:color="@color/panel_background" /> - <stroke - android:width="1dp" - android:color="#ffffff" /> - <corners - android:radius="6dp" /> - <padding - android:left="10dp" - android:top="10dp" - android:right="10dp" - android:bottom="10dp" /> - </shape> - </item> - <item> - <shape> - <gradient - android:startColor="@color/panel_background_dark" - android:endColor="@color/panel_background_main" - android:angle="270" /> - <stroke - android:width="2dp" - android:color="#aaaaaa" /> - <corners - android:radius="6dp" /> - <padding - android:left="10dp" - android:top="10dp" - android:right="10dp" - android:bottom="10dp" /> - </shape> - </item> -</selector> \ No newline at end of file diff --git a/orbotservice/src/main/res/drawable/button_off.xml b/orbotservice/src/main/res/drawable/button_off.xml deleted file mode 100644 index 1304d1b..0000000 --- a/orbotservice/src/main/res/drawable/button_off.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" > - <shape> - <solid - android:color="@color/panel_background" /> - <stroke - android:width="1dp" - android:color="#ffffff" /> - <corners - android:radius="6dp" /> - <padding - android:left="10dp" - android:top="10dp" - android:right="10dp" - android:bottom="10dp" /> - </shape> - </item> - <item> - <shape> - <gradient - android:startColor="@color/panel_background_dark" - android:endColor="@color/panel_background_main" - android:angle="270" /> - <stroke - android:width="2dp" - android:color="#555555" /> - <corners - android:radius="6dp" /> - <padding - android:left="10dp" - android:top="10dp" - android:right="10dp" - android:bottom="10dp" /> - </shape> - </item> -</selector> \ No newline at end of file diff --git a/orbotservice/src/main/res/drawable/button_on.xml b/orbotservice/src/main/res/drawable/button_on.xml deleted file mode 100644 index 27dc092..0000000 --- a/orbotservice/src/main/res/drawable/button_on.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" > - <shape> - <solid - android:color="@color/bright_green" /> - <stroke - android:width="1dp" - android:color="#ffffff" /> - <corners - android:radius="6dp" /> - <padding - android:left="10dp" - android:top="10dp" - android:right="10dp" - android:bottom="10dp" /> - </shape> - </item> - <item> - <shape> - <solid - android:color="@color/dark_green" /> - <stroke - android:width="1dp" - android:color="#ffffff" /> - <corners - android:radius="6dp" /> - <padding - android:left="10dp" - android:top="10dp" - android:right="10dp" - android:bottom="10dp" /> - </shape> - </item> -</selector> \ No newline at end of file diff --git a/orbotservice/src/main/res/drawable/classyfabric.png b/orbotservice/src/main/res/drawable/classyfabric.png deleted file mode 100644 index ca3d267..0000000 Binary files a/orbotservice/src/main/res/drawable/classyfabric.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/error.png b/orbotservice/src/main/res/drawable/error.png deleted file mode 100644 index 42dc6d6..0000000 Binary files a/orbotservice/src/main/res/drawable/error.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/ic_chatsecure.png b/orbotservice/src/main/res/drawable/ic_chatsecure.png deleted file mode 100644 index aaddd88..0000000 Binary files a/orbotservice/src/main/res/drawable/ic_chatsecure.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/ic_duckduckgo.png b/orbotservice/src/main/res/drawable/ic_duckduckgo.png deleted file mode 100644 index 696dcd6..0000000 Binary files a/orbotservice/src/main/res/drawable/ic_duckduckgo.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/ic_launcher.png b/orbotservice/src/main/res/drawable/ic_launcher.png deleted file mode 100644 index ea47373..0000000 Binary files a/orbotservice/src/main/res/drawable/ic_launcher.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/ic_menu_about.png b/orbotservice/src/main/res/drawable/ic_menu_about.png deleted file mode 100644 index 866d4e0..0000000 Binary files a/orbotservice/src/main/res/drawable/ic_menu_about.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/ic_menu_exit.png b/orbotservice/src/main/res/drawable/ic_menu_exit.png deleted file mode 100644 index d301ea6..0000000 Binary files a/orbotservice/src/main/res/drawable/ic_menu_exit.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/ic_menu_goto.png b/orbotservice/src/main/res/drawable/ic_menu_goto.png deleted file mode 100644 index 40183eb..0000000 Binary files a/orbotservice/src/main/res/drawable/ic_menu_goto.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/ic_play.png b/orbotservice/src/main/res/drawable/ic_play.png deleted file mode 100644 index a919794..0000000 Binary files a/orbotservice/src/main/res/drawable/ic_play.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/ic_stat_tor_off.png b/orbotservice/src/main/res/drawable/ic_stat_tor_off.png deleted file mode 100644 index 6df646e..0000000 Binary files a/orbotservice/src/main/res/drawable/ic_stat_tor_off.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/ic_stat_tor_xfer.png b/orbotservice/src/main/res/drawable/ic_stat_tor_xfer.png deleted file mode 100644 index 73ab233..0000000 Binary files a/orbotservice/src/main/res/drawable/ic_stat_tor_xfer.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/ic_twitter.png b/orbotservice/src/main/res/drawable/ic_twitter.png deleted file mode 100644 index 1e61c0a..0000000 Binary files a/orbotservice/src/main/res/drawable/ic_twitter.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/icon_martus.png b/orbotservice/src/main/res/drawable/icon_martus.png deleted file mode 100644 index e72db19..0000000 Binary files a/orbotservice/src/main/res/drawable/icon_martus.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/icon_orfox.png b/orbotservice/src/main/res/drawable/icon_orfox.png deleted file mode 100644 index 57ed1f0..0000000 Binary files a/orbotservice/src/main/res/drawable/icon_orfox.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/icon_story_maker.png b/orbotservice/src/main/res/drawable/icon_story_maker.png deleted file mode 100644 index 9c54ca5..0000000 Binary files a/orbotservice/src/main/res/drawable/icon_story_maker.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/inverse.png b/orbotservice/src/main/res/drawable/inverse.png deleted file mode 100644 index 65eff2c..0000000 Binary files a/orbotservice/src/main/res/drawable/inverse.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/n8fr8.jpg b/orbotservice/src/main/res/drawable/n8fr8.jpg deleted file mode 100644 index 4939d5c..0000000 Binary files a/orbotservice/src/main/res/drawable/n8fr8.jpg and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/oldtoroff.png b/orbotservice/src/main/res/drawable/oldtoroff.png deleted file mode 100644 index 4b23e0b..0000000 Binary files a/orbotservice/src/main/res/drawable/oldtoroff.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/oldtoron.png b/orbotservice/src/main/res/drawable/oldtoron.png deleted file mode 100644 index a99bec1..0000000 Binary files a/orbotservice/src/main/res/drawable/oldtoron.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/oldtorstarting.png b/orbotservice/src/main/res/drawable/oldtorstarting.png deleted file mode 100644 index a56844a..0000000 Binary files a/orbotservice/src/main/res/drawable/oldtorstarting.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/onion32.png b/orbotservice/src/main/res/drawable/onion32.png deleted file mode 100644 index 7846760..0000000 Binary files a/orbotservice/src/main/res/drawable/onion32.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/tilebg.xml b/orbotservice/src/main/res/drawable/tilebg.xml deleted file mode 100644 index 6f0d2a3..0000000 --- a/orbotservice/src/main/res/drawable/tilebg.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/classyfabric" - android:tileMode="repeat" /> \ No newline at end of file diff --git a/orbotservice/src/main/res/drawable/toggle.xml b/orbotservice/src/main/res/drawable/toggle.xml deleted file mode 100644 index 0f9a36e..0000000 --- a/orbotservice/src/main/res/drawable/toggle.xml +++ /dev/null @@ -1,8 +0,0 @@ -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item - android:state_checked="false" - android:drawable="@drawable/button_off" /> - <item - android:state_checked="true" - android:drawable="@drawable/button_on" /> -</selector> \ No newline at end of file diff --git a/orbotservice/src/main/res/drawable/tor.png b/orbotservice/src/main/res/drawable/tor.png deleted file mode 100644 index 0d63dd9..0000000 Binary files a/orbotservice/src/main/res/drawable/tor.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/tor25.png b/orbotservice/src/main/res/drawable/tor25.png deleted file mode 100644 index 20b7666..0000000 Binary files a/orbotservice/src/main/res/drawable/tor25.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/toroff.png b/orbotservice/src/main/res/drawable/toroff.png deleted file mode 100644 index a72790b..0000000 Binary files a/orbotservice/src/main/res/drawable/toroff.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/toron.png b/orbotservice/src/main/res/drawable/toron.png deleted file mode 100644 index e3592b1..0000000 Binary files a/orbotservice/src/main/res/drawable/toron.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/torstarting.png b/orbotservice/src/main/res/drawable/torstarting.png deleted file mode 100644 index 6e84a6f..0000000 Binary files a/orbotservice/src/main/res/drawable/torstarting.png and /dev/null differ diff --git a/orbotservice/src/main/res/values/styles.xml b/orbotservice/src/main/res/values/styles.xml new file mode 100644 index 0000000..b3fe8af --- /dev/null +++ b/orbotservice/src/main/res/values/styles.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <style name="NotificationText" parent="android:TextAppearance.StatusBar.EventContent" /> + <style name="NotificationTitle" parent="android:TextAppearance.StatusBar.EventContent.Title" /> +</resources>