diff options
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java | 19 |
2 files changed, 19 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e7407ac2..4972533f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -83,7 +83,6 @@ <activity android:name="CellBroadcastSettings" android:theme="@style/CellBroadcastSettingsTheme" android:label="@string/sms_cb_settings" - android:launchMode="singleTask" android:exported="true" /> <activity android:name="CellBroadcastAlertDialog" diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java index 7a19febe..c843cf16 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java @@ -16,6 +16,7 @@ package com.android.cellbroadcastreceiver; +import android.app.ActionBar; import android.app.Activity; import android.app.Fragment; import android.app.backup.BackupManager; @@ -35,6 +36,7 @@ import android.support.v7.preference.TwoStatePreference; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; import android.util.Log; +import android.view.MenuItem; /** * Settings activity for the cell broadcast receiver. @@ -101,6 +103,12 @@ public class CellBroadcastSettings extends Activity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + ActionBar actionBar = getActionBar(); + if (actionBar != null) { + // android.R.id.home will be triggered in onOptionsItemSelected() + actionBar.setDisplayHomeAsUpEnabled(true); + } + UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE); if (userManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_CELL_BROADCASTS)) { setContentView(R.layout.cell_broadcast_disallowed_preference_screen); @@ -115,6 +123,17 @@ public class CellBroadcastSettings extends Activity { } } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + // Respond to the action bar's Up/Home button + case android.R.id.home: + finish(); + return true; + } + return super.onOptionsItemSelected(item); + } + /** * New fragment-style implementation of preferences. */ |