diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-27 20:51:28 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-27 20:51:28 +0200 |
| commit | 9730c5e1cdfa7a380dd70419c84ef9e201233f1e (patch) | |
| tree | 5fe4a1e1e37a7b71e931bf49696cea9ec201e953 /src | |
| parent | 25547747b37770b6ca8227c784488dd4deb5436f (diff) | |
rename share/show location layout files
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java | 2 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java | 2 | ||||
| -rw-r--r-- | src/main/res/layout/activity_share_locaction.xml (renamed from src/main/res/layout/share_locaction_activity.xml) | 0 | ||||
| -rw-r--r-- | src/main/res/layout/activity_show_locaction.xml (renamed from src/main/res/layout/show_locaction_activity.xml) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java index 38d94f8c6..c7cb4fe7d 100644 --- a/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java @@ -55,7 +55,7 @@ public class ShareLocationActivity extends Activity implements OnMapReadyCallbac @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.share_locaction_activity); + setContentView(R.layout.activity_share_locaction); MapFragment fragment = (MapFragment) getFragmentManager().findFragmentById(R.id.map_fragment); fragment.getMapAsync(this); mGoogleApiClient = new GoogleApiClient.Builder(this) diff --git a/src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java b/src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java index d5103de9b..f8f760aa3 100644 --- a/src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java @@ -64,7 +64,7 @@ public class ShowLocationActivity extends Activity implements OnMapReadyCallback actionBar.setDisplayHomeAsUpEnabled(true); } - setContentView(R.layout.show_locaction_activity); + setContentView(R.layout.activity_show_locaction); MapFragment fragment = (MapFragment) getFragmentManager().findFragmentById(R.id.map_fragment); fragment.getMapAsync(this); } diff --git a/src/main/res/layout/share_locaction_activity.xml b/src/main/res/layout/activity_share_locaction.xml index b360b649c..b360b649c 100644 --- a/src/main/res/layout/share_locaction_activity.xml +++ b/src/main/res/layout/activity_share_locaction.xml diff --git a/src/main/res/layout/show_locaction_activity.xml b/src/main/res/layout/activity_show_locaction.xml index d22422015..d22422015 100644 --- a/src/main/res/layout/show_locaction_activity.xml +++ b/src/main/res/layout/activity_show_locaction.xml |