mirror of
https://github.com/nextcloud/android.git
synced 2024-11-25 22:55:46 +03:00
Merge e37c1b9b6d
into ece3acb0c4
This commit is contained in:
commit
04f8332295
1 changed files with 6 additions and 3 deletions
|
@ -175,7 +175,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
|
|||
super.onCreate(savedInstanceState);
|
||||
|
||||
if (mAccountSelected) {
|
||||
setAccount((Account) savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT));
|
||||
setAccount(savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT));
|
||||
}
|
||||
|
||||
// Listen for sync messages
|
||||
|
@ -777,12 +777,16 @@ public class ReceiveExternalFilesActivity extends FileActivity
|
|||
getStorageManager(), getAccount());
|
||||
|
||||
mListView.setAdapter(sa);
|
||||
}
|
||||
Button btnChooseFolder = (Button) findViewById(R.id.uploader_choose_folder);
|
||||
btnChooseFolder.setOnClickListener(this);
|
||||
btnChooseFolder.getBackground().setColorFilter(ThemeUtils.primaryColor(getAccount()),
|
||||
PorterDuff.Mode.SRC_ATOP);
|
||||
|
||||
getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ThemeUtils.primaryColor(getAccount())));
|
||||
if (getSupportActionBar() != null) {
|
||||
getSupportActionBar().setBackgroundDrawable(new ColorDrawable(
|
||||
ThemeUtils.primaryColor(getAccount())));
|
||||
}
|
||||
|
||||
ThemeUtils.colorStatusBar(this, ThemeUtils.primaryDarkColor(getAccount()));
|
||||
|
||||
|
@ -794,7 +798,6 @@ public class ReceiveExternalFilesActivity extends FileActivity
|
|||
mListView.setOnItemClickListener(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected void setupEmptyList() {
|
||||
mEmptyListContainer = (LinearLayout) findViewById(R.id.empty_list_view);
|
||||
|
|
Loading…
Reference in a new issue