fix CR and UI glitches

res/layout/toolbar_user_information.xml

@@ -27,6 +27,13 @@
     android:background="@drawable/background"
     android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
+    <android.support.v7.widget.Toolbar
+        android:id="@id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        app:layout_scrollFlags="scroll|enterAlways|snap"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -76,7 +83,6 @@
                     android:shadowDx="0.5"
                     android:shadowDy="0"
                     android:shadowRadius="2"
-                    android:text="@string/app_name"
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/drawer_header_text"
                     android:textStyle="bold"/>
@@ -92,7 +98,6 @@
                     android:shadowDx="0.5"
                     android:shadowDy="0"
                     android:shadowRadius="2"
-                    android:text="@string/app_name"
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/drawer_header_subtext"/>
             </LinearLayout>
@@ -101,18 +106,4 @@
 
     </LinearLayout>
 
-    <android.support.v7.widget.Toolbar
-        android:id="@id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        app:layout_scrollFlags="scroll|enterAlways|snap"
-        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
-
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        app:layout_scrollFlags="scroll|enterAlways|snap"
-        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
-
 </android.support.design.widget.AppBarLayout>

src/com/owncloud/android/ui/activity/UserInfoActivity.java

@@ -73,49 +73,64 @@ public class UserInfoActivity extends FileActivity {
 
     @BindView(R.id.empty_list_view)
     public LinearLayout multiListContainer;
+
     @BindView(R.id.empty_list_view_text)
     public TextView multiListMessage;
+
     @BindView(R.id.empty_list_view_headline)
     public TextView multiListHeadline;
+
     @BindView(R.id.empty_list_icon)
     public ImageView multiListIcon;
+
     @BindView(R.id.user_info_view)
     public LinearLayout userInfoView;
+
     @BindView(R.id.user_icon)
     public ImageView avatar;
+
     @BindView(R.id.drawer_username)
     public TextView userName;
+
     @BindView(R.id.drawer_username_full)
     public TextView fullName;
 
     @BindView(R.id.phone_container)
     public View mPhoneNumberContainer;
+
     @BindView(R.id.phone_number)
     public TextView mPhoneNumberTextView;
+
     @BindView(R.id.phone_icon)
     public ImageView mPhoneNumberIcon;
 
     @BindView(R.id.email_container)
     public View mEmailContainer;
+
     @BindView(R.id.email_address)
     public TextView mEmailAddressTextView;
+
     @BindView(R.id.email_icon)
     public ImageView mEmailIcon;
 
     @BindView(R.id.address_container)
     public View mAddressContainer;
+
     @BindView(R.id.address)
     public TextView mAddressTextView;
+
     @BindView(R.id.address_icon)
     public ImageView mAddressIcon;
 
     @BindView(R.id.website_container)
     public View mWebsiteContainer;
+
     @BindView(R.id.website_address)
     public TextView mWebsiteTextView;
 
     @BindView(R.id.twitter_container)
     public View mTwitterContainer;
+
     @BindView(R.id.twitter_handle)
     public TextView mTwitterHandleTextView;
 

src/main/java/com/owncloud/android/ui/activity/ManageAccountsActivity.java

@@ -348,10 +348,7 @@ public class ManageAccountsActivity extends FileActivity
 
     private void performAccountRemoval(Account account) {
         AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE);
-        am.removeAccount(
-                account,
-                this,
-                this.getHandler());
+        am.removeAccount(account, this, this.getHandler());
     }
 
     /**