Merge branch 'raphaelm-account_activity_title'

app/src/main/java/com/keylesspalace/tusky/AccountActivity.java

@@ -125,8 +125,23 @@ public class AccountActivity extends BaseActivity implements SFragment.OnUserRem
                 @AttrRes int attribute;
                 if (collapsingToolbar.getHeight() + verticalOffset
                         < 2 * ViewCompat.getMinimumHeight(collapsingToolbar)) {
+                    if (getSupportActionBar() != null && loadedAccount != null) {
+                        getSupportActionBar().setTitle(loadedAccount.getDisplayName());
+                        toolbar.setTitleTextColor(ThemeUtils.getColor(toolbar.getContext(),
+                                android.R.attr.textColorPrimary));
+
+                        String subtitle = String.format(getString(R.string.status_username_format),
+                                loadedAccount.username);
+                        getSupportActionBar().setSubtitle(subtitle);
+                        toolbar.setSubtitleTextColor(ThemeUtils.getColor(toolbar.getContext(),
+                                android.R.attr.textColorSecondary));
+                    }
                     attribute = R.attr.account_toolbar_icon_tint_collapsed;
                 } else {
+                    if (getSupportActionBar() != null) {
+                        getSupportActionBar().setTitle("");
+                        getSupportActionBar().setSubtitle("");
+                    }
                     attribute = R.attr.account_toolbar_icon_tint_uncollapsed;
                 }
                 if (attribute != priorAttribute) {

app/src/main/res/layout/activity_account.xml

@@ -103,7 +103,7 @@
                                     app:srcCompat="@drawable/reblog_disabled_light"
                                     android:tint="?android:textColorSecondary"
                                     android:layout_toRightOf="@id/account_username"
-                                    android:contentDescription="@string/description_account_locked"/>
+                                    android:contentDescription="@string/description_account_locked" />
                             </RelativeLayout>
                         </LinearLayout>
 
@@ -115,7 +115,7 @@
                         android:id="@+id/account_note"
                         android:textColor="?android:textColorTertiary"
                         android:padding="16dp"
-                        android:paddingTop="10dp"/>
+                        android:paddingTop="10dp" />
 
                 </LinearLayout>