diff options
author | cyberta <cyberta@riseup.net> | 2018-03-06 10:08:49 -0800 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2018-03-06 10:08:49 -0800 |
commit | a95567b4bbb2319636a79cc5e8d6a7921df9f4d1 (patch) | |
tree | 7d5c7c36b141aa98e909f6b99baed769de5cf923 /app/src/main/java/se/leap/bitmaskclient/MainActivity.java | |
parent | fda23fc8c5aa916bce4ce985fcdf0aa08b21f1e6 (diff) | |
parent | 54e95a61bc553d985f6c55823da20985b6103aa0 (diff) |
Merge branch 'cleanup' into 'master'
cleanup - rename layout files
See merge request leap/bitmask_android!64
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/MainActivity.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/MainActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java index 19294618..4d57b6bc 100644 --- a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java @@ -113,7 +113,7 @@ public class MainActivity extends AppCompatActivity implements Observer { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); + setContentView(R.layout.a_main); setSupportActionBar((Toolbar) findViewById(R.id.toolbar)); mainActivityBroadcastReceiver = new MainActivityBroadcastReceiver(); |