Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 278e7d33 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #3783 from ByteHamster/drawer-above 

Switch to Toolbar
parents 4a342435 3c16d2ca

app/ui/src/main/java/com/fsck/k9/activity/AccountList.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ public abstract class AccountList extends K9ListActivity implements OnItemClickL 


        setResult(RESULT_CANCELED);



        setContentView(R.layout.account_list);

        setLayout(R.layout.account_list);



        ListView listView = getListView();

        listView.setOnItemClickListener(this);

app/ui/src/main/java/com/fsck/k9/activity/Accounts.java

+2 −2
Original line number Diff line number Diff line
@@ -385,9 +385,8 @@ public class Accounts extends K9ListActivity implements OnItemClickListener { 
        }



        requestWindowFeature(Window.FEATURE_PROGRESS);

        actionBar = getSupportActionBar();

        setLayout(R.layout.accounts);

        initializeActionBar();

        setContentView(R.layout.accounts);

        ListView listView = getListView();

        listView.setOnItemClickListener(this);

        listView.setItemsCanFocus(false);
@@ -416,6 +415,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener { 
    }



    private void initializeActionBar() {

        actionBar = getSupportActionBar();

        actionBar.setDisplayHomeAsUpEnabled(false);

    }

app/ui/src/main/java/com/fsck/k9/activity/ChooseFolder.java

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public class ChooseFolder extends K9ListActivity { 
        super.onCreate(savedInstanceState);



        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);

        setContentView(R.layout.list_content_simple);

        setLayout(R.layout.list_content_simple);



        getListView().setFastScrollEnabled(true);

        getListView().setItemsCanFocus(false);

app/ui/src/main/java/com/fsck/k9/activity/ChooseIdentity.java

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ public class ChooseIdentity extends K9ListActivity { 
        super.onCreate(savedInstanceState);



        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);

        setContentView(R.layout.list_content_simple);

        setLayout(R.layout.list_content_simple);



        getListView().setTextFilterEnabled(true);

        getListView().setItemsCanFocus(false);

app/ui/src/main/java/com/fsck/k9/activity/EditIdentity.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ public class EditIdentity extends K9Activity { 
            mIdentity = new Identity();

        }



        setContentView(R.layout.edit_identity);

        setLayout(R.layout.edit_identity);



        /*

         * If we're being reloaded we override the original account with the one