diff options
author | Renard1911 | 2016-04-28 20:38:41 -0300 |
---|---|---|
committer | Renard1911 | 2016-04-28 20:38:41 -0300 |
commit | 19e44b5af8549fe7c45677df967f0d0b9b1f1eb6 (patch) | |
tree | 202affa4d35775b49a4e6b360e83fb26447c8795 /app/src | |
parent | 03b67d0845e0445920d84b77f1b66162acca1490 (diff) | |
parent | e413904f974ef876578338498bf23faf6a2c2ee0 (diff) | |
download | BaiApp-19e44b5af8549fe7c45677df967f0d0b9b1f1eb6.tar.gz BaiApp-19e44b5af8549fe7c45677df967f0d0b9b1f1eb6.tar.xz BaiApp-19e44b5af8549fe7c45677df967f0d0b9b1f1eb6.zip |
Merge pull request #3 from z411/master
Fixing app ID in build.gradle and Lint errors
Diffstat (limited to 'app/src')
-rw-r--r-- | app/src/main/java/org/bienvenidoainternet/app/SettingsActivity.java | 7 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_response.xml | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/src/main/java/org/bienvenidoainternet/app/SettingsActivity.java b/app/src/main/java/org/bienvenidoainternet/app/SettingsActivity.java index 021aed5..1d3e6c9 100644 --- a/app/src/main/java/org/bienvenidoainternet/app/SettingsActivity.java +++ b/app/src/main/java/org/bienvenidoainternet/app/SettingsActivity.java @@ -172,7 +172,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity { * activity is showing a two-pane settings UI. */ @TargetApi(Build.VERSION_CODES.HONEYCOMB) - public class GeneralPreferenceFragment extends PreferenceFragment { + public static class GeneralPreferenceFragment extends PreferenceFragment { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -192,10 +192,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity { int id = item.getItemId(); if (id == android.R.id.home) { // startActivity(new Intent(getActivity(), SettingsActivity.class)); - Intent returnIntent = new Intent(); - returnIntent.putExtra("result",requireReset); - setResult(Activity.RESULT_OK,returnIntent); - finish(); + getActivity().onBackPressed(); return true; } return super.onOptionsItemSelected(item); diff --git a/app/src/main/res/layout/activity_response.xml b/app/src/main/res/layout/activity_response.xml index 2b5b1e0..bd42219 100644 --- a/app/src/main/res/layout/activity_response.xml +++ b/app/src/main/res/layout/activity_response.xml @@ -8,7 +8,8 @@ android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" tools:context="org.bienvenidoainternet.app.ResponseActivity" - android:textAlignment="textEnd"> + android:textAlignment="textEnd" + android:layout_gravity="end"> <RelativeLayout android:layout_width="match_parent" |