diff --git a/build-ndk.sh b/build-ndk.sh index 2f95588d..11e61b44 100755 --- a/build-ndk.sh +++ b/build-ndk.sh @@ -1,5 +1,6 @@ #!/bin/bash cd src/main +ndk-build clean ndk-build mkdir -p assets/arm mkdir -p assets/x86 diff --git a/src/main/res/drawable-hdpi-v11/ic_stat_shadowsocks.png b/src/main/res/drawable-hdpi-v11/ic_stat_shadowsocks.png deleted file mode 100755 index 58590365..00000000 Binary files a/src/main/res/drawable-hdpi-v11/ic_stat_shadowsocks.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi-v9/ic_stat_shadowsocks.png b/src/main/res/drawable-hdpi-v9/ic_stat_shadowsocks.png deleted file mode 100755 index f553bc74..00000000 Binary files a/src/main/res/drawable-hdpi-v9/ic_stat_shadowsocks.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_stat_shadowsocks.png b/src/main/res/drawable-hdpi/ic_stat_shadowsocks.png index cdb8b7f7..58590365 100755 Binary files a/src/main/res/drawable-hdpi/ic_stat_shadowsocks.png and b/src/main/res/drawable-hdpi/ic_stat_shadowsocks.png differ diff --git a/src/main/res/drawable-ldpi-v11/ic_stat_shadowsocks.png b/src/main/res/drawable-ldpi-v11/ic_stat_shadowsocks.png deleted file mode 100755 index 70b582d7..00000000 Binary files a/src/main/res/drawable-ldpi-v11/ic_stat_shadowsocks.png and /dev/null differ diff --git a/src/main/res/drawable-ldpi-v9/ic_stat_shadowsocks.png b/src/main/res/drawable-ldpi-v9/ic_stat_shadowsocks.png deleted file mode 100755 index 6b5857d7..00000000 Binary files a/src/main/res/drawable-ldpi-v9/ic_stat_shadowsocks.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi-v11/ic_stat_shadowsocks.png b/src/main/res/drawable-mdpi-v11/ic_stat_shadowsocks.png deleted file mode 100755 index 455a6417..00000000 Binary files a/src/main/res/drawable-mdpi-v11/ic_stat_shadowsocks.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi-v9/ic_stat_shadowsocks.png b/src/main/res/drawable-mdpi-v9/ic_stat_shadowsocks.png deleted file mode 100755 index 1da0cbf9..00000000 Binary files a/src/main/res/drawable-mdpi-v9/ic_stat_shadowsocks.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_stat_shadowsocks.png b/src/main/res/drawable-mdpi/ic_stat_shadowsocks.png index f38943be..455a6417 100755 Binary files a/src/main/res/drawable-mdpi/ic_stat_shadowsocks.png and b/src/main/res/drawable-mdpi/ic_stat_shadowsocks.png differ diff --git a/src/main/res/drawable-xhdpi-v11/ic_stat_shadowsocks.png b/src/main/res/drawable-xhdpi-v11/ic_stat_shadowsocks.png deleted file mode 100755 index 271e2d62..00000000 Binary files a/src/main/res/drawable-xhdpi-v11/ic_stat_shadowsocks.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi-v9/ic_stat_shadowsocks.png b/src/main/res/drawable-xhdpi-v9/ic_stat_shadowsocks.png deleted file mode 100755 index ffe91993..00000000 Binary files a/src/main/res/drawable-xhdpi-v9/ic_stat_shadowsocks.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_stat_shadowsocks.png b/src/main/res/drawable-xhdpi/ic_stat_shadowsocks.png index 3557be9a..271e2d62 100755 Binary files a/src/main/res/drawable-xhdpi/ic_stat_shadowsocks.png and b/src/main/res/drawable-xhdpi/ic_stat_shadowsocks.png differ diff --git a/src/main/res/drawable-xxhdpi-v11 b/src/main/res/drawable-xxhdpi-v11 deleted file mode 100755 index dd6cc3db..00000000 Binary files a/src/main/res/drawable-xxhdpi-v11 and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_stat_shadowsocks.png b/src/main/res/drawable-xxhdpi/ic_stat_shadowsocks.png index 78e5f33b..dd6cc3db 100755 Binary files a/src/main/res/drawable-xxhdpi/ic_stat_shadowsocks.png and b/src/main/res/drawable-xxhdpi/ic_stat_shadowsocks.png differ diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala index 793b3efc..3b0d446c 100644 --- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala +++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala @@ -470,7 +470,7 @@ class Shadowsocks if (Build.VERSION.SDK_INT > 10) { drawer.getContentContainer.asInstanceOf[ViewGroup].getChildAt(0) } else { - drawer.getContentContainer.getParent + getLayoutView(drawer.getContentContainer.getParent) } } if (layoutView != null) {