diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportsActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportsActivity.java index f9bb76559..9e75b777d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportsActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportsActivity.java @@ -1,7 +1,10 @@ package org.briarproject.briar.android.navdrawer; +import android.content.Intent; import android.os.Bundle; import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; @@ -21,6 +24,7 @@ import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BriarActivity; +import org.briarproject.briar.android.settings.SettingsActivity; import java.util.ArrayList; import java.util.List; @@ -85,10 +89,20 @@ public class TransportsActivity extends BriarActivity { if (item.getItemId() == android.R.id.home) { onBackPressed(); return true; + } else if (item.getItemId() == R.id.action_open_settings) { + startActivity(new Intent(this, SettingsActivity.class)); + return true; } return false; } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.transports_actions, menu); + return super.onCreateOptionsMenu(menu); + } + private void initializeCards() { transportsAdapter = new BaseAdapter() { diff --git a/briar-android/src/main/res/drawable/ic_settings_black_24dp.xml b/briar-android/src/main/res/drawable/ic_settings_black.xml similarity index 100% rename from briar-android/src/main/res/drawable/ic_settings_black_24dp.xml rename to briar-android/src/main/res/drawable/ic_settings_black.xml diff --git a/briar-android/src/main/res/drawable/ic_settings_white.xml b/briar-android/src/main/res/drawable/ic_settings_white.xml new file mode 100644 index 000000000..a16d2c075 --- /dev/null +++ b/briar-android/src/main/res/drawable/ic_settings_white.xml @@ -0,0 +1,9 @@ + + + diff --git a/briar-android/src/main/res/menu/navigation_drawer.xml b/briar-android/src/main/res/menu/navigation_drawer.xml index c24131755..ccfa71328 100644 --- a/briar-android/src/main/res/menu/navigation_drawer.xml +++ b/briar-android/src/main/res/menu/navigation_drawer.xml @@ -24,7 +24,7 @@ + + + + + \ No newline at end of file