mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix back button issue

Browse source
This commit is contained in:
misaochan 2016-09-01 18:48:26 +12:00
parent dbeeaa0aa8
commit ee5df7d35c
3 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/AndroidManifest.xml
View file

@ -84,7 +84,8 @@
android:label="@string/title_activity_signup"/> android:label="@string/title_activity_signup"/>
<activity <activity
android:name=".nearby.NearbyActivity" android:name=".nearby.NearbyActivity"
android:label="@string/title_activity_nearby" /> android:label="@string/title_activity_nearby"
android:parentActivityName=".contributions.ContributionsActivity"/>
<service android:name=".upload.UploadService" > <service android:name=".upload.UploadService" >
</service> </service>

14
app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
View file

@ -30,7 +30,9 @@ public class NearbyActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_nearby); setContentView(R.layout.activity_nearby);
if (getSupportActionBar() != null) {
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
registerLocationManager(); registerLocationManager();
// Begin the transaction // Begin the transaction
@ -38,23 +40,11 @@ public class NearbyActivity extends AppCompatActivity {
NearbyListFragment fragment = new NearbyListFragment(); NearbyListFragment fragment = new NearbyListFragment();
ft.add(R.id.container, fragment); ft.add(R.id.container, fragment);
ft.commit(); ft.commit();
/*
if (savedInstanceState == null) {
getSupportFragmentManager().beginTransaction()
.add(R.id.container, new NearbyListFragment())
.commit();
}
*/
} }
@Override @Override
protected void onResume(){ protected void onResume(){
super.onResume(); super.onResume();
//TODO: Check if we need String or double coords, and in what format
//gpsCoords = String.valueOf(currentLatitude) + "|" + String.valueOf(currentLongitude);
} }
protected LatLng getmLatestLocation() { protected LatLng getmLatestLocation() {