[Android] Simplify code, ensure non nullity

Geoffrey Métais git at videolan.org
Thu May 7 16:29:25 CEST 2015


vlc-ports/android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Thu May  7 14:16:50 2015 +0200| [7502fa8f8b7d332f781757bceeea9e6777da4bb0] | committer: Geoffrey Métais

Simplify code, ensure non nullity

CID #1297073

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=7502fa8f8b7d332f781757bceeea9e6777da4bb0
---

 vlc-android/src/com/android/widget/SlidingTabLayout.java |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/vlc-android/src/com/android/widget/SlidingTabLayout.java b/vlc-android/src/com/android/widget/SlidingTabLayout.java
index eae7044..dbf9e95 100644
--- a/vlc-android/src/com/android/widget/SlidingTabLayout.java
+++ b/vlc-android/src/com/android/widget/SlidingTabLayout.java
@@ -180,11 +180,8 @@ public class SlidingTabLayout extends HorizontalScrollView {
                 tabView = LayoutInflater.from(getContext()).inflate(mTabViewLayoutId, mTabStrip,
                         false);
                 tabTitleView = (TextView) tabView.findViewById(mTabViewTextViewId);
-            }
-            if (tabView == null) {
+            } else {
                 tabView = createDefaultTabView(getContext());
-            }
-            if (tabTitleView == null && tabView instanceof TextView) {
                 tabTitleView = (TextView) tabView;
             }
             if (mDistributeEvenly) {



More information about the Android mailing list