From 41e7c75cb4cef7d6fc96337a1a403a646e485eb8 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Fri, 23 Aug 2013 16:51:34 +0800 Subject: [PATCH] update actionbarsherlock --- build.sbt | 2 +- src/main/scala/com/github/shadowsocks/Shadowsocks.scala | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 8437dd85..e26e8475 100644 --- a/build.sbt +++ b/build.sbt @@ -11,7 +11,7 @@ libraryDependencies ++= Seq( ) libraryDependencies ++= Seq( - "com.actionbarsherlock" % "actionbarsherlock" % "4.2.0" artifacts(Artifact("actionbarsherlock", "apklib", "apklib")), + "com.actionbarsherlock" % "actionbarsherlock" % "4.4.0" artifacts(Artifact("actionbarsherlock", "apklib", "apklib")), "net.saik0.android.unifiedpreference" % "unifiedpreference" % "0.0.2" artifacts(Artifact("unifiedpreference", "apklib", "apklib")), "org.jraf" % "android-switch-backport" % "1.0" artifacts(Artifact("android-switch-backport", "apklib", "apklib")), "de.keyboardsurfer.android.widget" % "crouton" % "1.7" diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala index 1ce67640..5852b46b 100644 --- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala +++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala @@ -368,7 +368,13 @@ class Shadowsocks def initAdView() { if (settings.getString(Key.proxy, "") == "198.199.101.152") { - val adView = new AdView(this, AdSize.SMART_BANNER, "a151becb8068b09") + val adView = { + if (isSinglePane) { + new AdView(this, AdSize.SMART_BANNER, "a151becb8068b09") + } else { + new AdView(this, AdSize.BANNER, "a151becb8068b09") + } + } val layoutView = getLayoutView(getListView.asInstanceOf[ViewParent]) if (layoutView != null) { layoutView.addView(adView, 0)