Skip to content

Commit

Permalink
Remove superfluous icon and padding that came with sdk 24
Browse files Browse the repository at this point in the history
  • Loading branch information
moxie0 authored and BLeQuerrec committed Feb 15, 2017
1 parent 8c21c86 commit 13e946f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
6 changes: 4 additions & 2 deletions res/layout/contact_selection_activity.xml
Expand Up @@ -3,15 +3,17 @@
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:orientation="vertical"
xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">

<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_height="?attr/actionBarSize"
android:layout_width="match_parent"
android:minHeight="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="?attr/actionBarStyle">
android:theme="?attr/actionBarStyle"
app:contentInsetStartWithNavigation="0dp">

<LinearLayout android:layout_width="match_parent"
android:layout_height="match_parent"
Expand Down
2 changes: 2 additions & 0 deletions src/org/smssecure/smssecure/ContactSelectionActivity.java
Expand Up @@ -93,6 +93,8 @@ private void initializeToolbar() {

getSupportActionBar().setDisplayHomeAsUpEnabled(false);
getSupportActionBar().setDisplayShowTitleEnabled(false);
getSupportActionBar().setIcon(null);
getSupportActionBar().setLogo(null);
}

private void initializeResources() {
Expand Down
1 change: 0 additions & 1 deletion src/org/smssecure/smssecure/NewConversationActivity.java
Expand Up @@ -41,7 +41,6 @@ public class NewConversationActivity extends ContactSelectionActivity {
public void onCreate(Bundle bundle, MasterSecret masterSecret) {
super.onCreate(bundle, masterSecret);

action.setVisibility(View.GONE);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}

Expand Down
2 changes: 2 additions & 0 deletions src/org/smssecure/smssecure/RecipientPreferenceActivity.java
Expand Up @@ -108,6 +108,8 @@ public boolean onOptionsItemSelected(MenuItem item) {

private void initializeToolbar() {
this.toolbar = (Toolbar) findViewById(R.id.toolbar);
this.toolbar.setLogo(null);

setSupportActionBar(toolbar);

getSupportActionBar().setDisplayHomeAsUpEnabled(true);
Expand Down

0 comments on commit 13e946f

Please sign in to comment.