diff --git a/app/src/main/java/com/philliphsu/clock2/BaseActivity.java b/app/src/main/java/com/philliphsu/clock2/BaseActivity.java index a64a90e..f898541 100644 --- a/app/src/main/java/com/philliphsu/clock2/BaseActivity.java +++ b/app/src/main/java/com/philliphsu/clock2/BaseActivity.java @@ -20,7 +20,10 @@ import butterknife.ButterKnife; */ public abstract class BaseActivity extends AppCompatActivity { - @Nullable @Bind(R.id.toolbar) Toolbar mToolbar; + @Nullable + @Bind(R.id.toolbar) + Toolbar mToolbar; + private Menu mMenu; @LayoutRes protected abstract int layoutResId(); diff --git a/app/src/main/java/com/philliphsu/clock2/ringtone/RingtoneActivity.java b/app/src/main/java/com/philliphsu/clock2/ringtone/RingtoneActivity.java index eb681aa..fb29545 100644 --- a/app/src/main/java/com/philliphsu/clock2/ringtone/RingtoneActivity.java +++ b/app/src/main/java/com/philliphsu/clock2/ringtone/RingtoneActivity.java @@ -7,7 +7,6 @@ import android.os.Bundle; import android.os.Parcelable; import android.support.annotation.DrawableRes; import android.support.annotation.StringRes; -import android.support.v7.app.AppCompatActivity; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; @@ -15,6 +14,7 @@ import android.widget.Button; import android.widget.LinearLayout; import android.widget.TextView; +import com.philliphsu.clock2.BaseActivity; import com.philliphsu.clock2.R; import com.philliphsu.clock2.util.LocalBroadcastHelper; @@ -26,7 +26,7 @@ import butterknife.OnClick; * An example full-screen activity that shows and hides the system UI (i.e. * status bar and navigation/system bar) with user interaction. */ -public abstract class RingtoneActivity extends AppCompatActivity { +public abstract class RingtoneActivity extends BaseActivity { private static final String TAG = "RingtoneActivity"; // Shared with RingtoneService @@ -84,7 +84,6 @@ public abstract class RingtoneActivity extends AppCompatAc @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_ringtone); ButterKnife.bind(this); if ((mRingingObject = getIntent().getParcelableExtra(EXTRA_RINGING_OBJECT)) == null) @@ -179,6 +178,21 @@ public abstract class RingtoneActivity extends AppCompatAc super.finish(); } + @Override + protected final int layoutResId() { + return R.layout.activity_ringtone; + } + + @Override + protected final int menuResId() { + return 0; + } + + @Override + protected final boolean isDisplayHomeUpEnabled() { + return false; + } + public static boolean isAlive() { return sIsAlive; }