Added App Icon (back) Navigation to settings activity
Change-Id: Ia3ec8893abd52867af2f8c4c4b029103e2dfcdfe Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
This commit is contained in:
@@ -6,6 +6,7 @@
|
|||||||
*/
|
*/
|
||||||
package com.TwentyCode.android.ExaltedDice;
|
package com.TwentyCode.android.ExaltedDice;
|
||||||
|
|
||||||
|
import android.app.ActionBar;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.pm.PackageInfo;
|
import android.content.pm.PackageInfo;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
@@ -15,6 +16,7 @@ import android.os.Bundle;
|
|||||||
import android.preference.Preference;
|
import android.preference.Preference;
|
||||||
import android.preference.Preference.OnPreferenceClickListener;
|
import android.preference.Preference.OnPreferenceClickListener;
|
||||||
import android.preference.PreferenceActivity;
|
import android.preference.PreferenceActivity;
|
||||||
|
import android.view.MenuItem;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This activity will be used to allow the user to fine tune exalted dice
|
* This activity will be used to allow the user to fine tune exalted dice
|
||||||
@@ -28,30 +30,6 @@ public class Settings extends PreferenceActivity implements OnPreferenceClickLis
|
|||||||
public static final String SETTINGS = "settings";
|
public static final String SETTINGS = "settings";
|
||||||
private static final CharSequence EMAIL = "email";
|
private static final CharSequence EMAIL = "email";
|
||||||
|
|
||||||
/**
|
|
||||||
* (non-Javadoc)
|
|
||||||
* @see android.preference.PreferenceActivity#onCreate(android.os.Bundle)
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
//set shared_prefs name
|
|
||||||
getPreferenceManager().setSharedPreferencesName(SETTINGS);
|
|
||||||
|
|
||||||
//load preferences xml. this load relies on only wether the app is full or not. it will show the check license option if full and leave it out if lite
|
|
||||||
addPreferencesFromResource(R.xml.settings);
|
|
||||||
this.findPreference(EMAIL).setOnPreferenceClickListener(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* called when the email preference button is clicked
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public boolean onPreferenceClick(Preference preference) {
|
|
||||||
this.startActivity(generateEmailIntent());
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* generates the exception repost email intent
|
* generates the exception repost email intent
|
||||||
* @param report
|
* @param report
|
||||||
@@ -82,4 +60,54 @@ public class Settings extends PreferenceActivity implements OnPreferenceClickLis
|
|||||||
intent.setType("message/rfc822");
|
intent.setType("message/rfc822");
|
||||||
return intent;
|
return intent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* (non-Javadoc)
|
||||||
|
* @see android.preference.PreferenceActivity#onCreate(android.os.Bundle)
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The following is for api 11 and up
|
||||||
|
*/
|
||||||
|
if(Integer.valueOf(android.os.Build.VERSION.SDK) > 11){
|
||||||
|
ActionBar actionBar = getActionBar();
|
||||||
|
actionBar.setDisplayHomeAsUpEnabled(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
//set shared_prefs name
|
||||||
|
getPreferenceManager().setSharedPreferencesName(SETTINGS);
|
||||||
|
|
||||||
|
//load preferences xml. this load relies on only wether the app is full or not. it will show the check license option if full and leave it out if lite
|
||||||
|
addPreferencesFromResource(R.xml.settings);
|
||||||
|
this.findPreference(EMAIL).setOnPreferenceClickListener(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called when a options item has been selected
|
||||||
|
* (non-Javadoc)
|
||||||
|
* @see android.app.Activity#onOptionsItemSelected(android.view.MenuItem)
|
||||||
|
*/
|
||||||
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
|
switch (item.getItemId()) {
|
||||||
|
case android.R.id.home:
|
||||||
|
Intent intent = new Intent(this, ExaltedDice.class);
|
||||||
|
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||||
|
startActivity(intent);
|
||||||
|
return true;
|
||||||
|
default:
|
||||||
|
return super.onOptionsItemSelected(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* called when the email preference button is clicked
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public boolean onPreferenceClick(Preference preference) {
|
||||||
|
this.startActivity(generateEmailIntent());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user