diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-10-12 04:20:21 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-12 04:20:21 -0700 |
| commit | b17d7c45fc19ef4c694dd8df999d41a5ce49052c (patch) | |
| tree | 97cac7ce6106a4c76777905a0563c4e883918efe /src/com/android/settings/Utils.java | |
| parent | e8a9d3dcd0c71be29cca739201ef1e699683a291 (diff) | |
| parent | bf51c8b4d63658986ff6c43befb38dfcb0ea3a2d (diff) | |
| download | packages_apps_Settings-b17d7c45fc19ef4c694dd8df999d41a5ce49052c.tar.gz packages_apps_Settings-b17d7c45fc19ef4c694dd8df999d41a5ce49052c.tar.bz2 packages_apps_Settings-b17d7c45fc19ef4c694dd8df999d41a5ce49052c.zip | |
Merge "Bluetooth: Add Manifest configure to fix settings crash issue."
Diffstat (limited to 'src/com/android/settings/Utils.java')
| -rw-r--r-- | src/com/android/settings/Utils.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index 1122591e9..b6d941458 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -92,6 +92,7 @@ import com.android.settings.UserAdapter.UserDetails; import com.android.settings.dashboard.DashboardTile; import com.android.settings.drawable.CircleFramedDrawable; import com.android.settingslib.applications.ApplicationsState; +import com.android.settings.bluetooth.BluetoothSettings; import java.io.IOException; import java.io.InputStream; @@ -717,7 +718,12 @@ public final class Utils { Bundle args, String titleResPackageName, int titleResId, CharSequence title, boolean isShortcut) { Intent intent = new Intent(Intent.ACTION_MAIN); - intent.setClass(context, SubSettings.class); + if (BluetoothSettings.class.getName().equals(fragmentName)) { + intent.setClass(context, SubSettings.BluetoothSubSettings.class); + intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_AS_SUBSETTING, true); + } else { + intent.setClass(context, SubSettings.class); + } intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT, fragmentName); intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS, args); intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RES_PACKAGE_NAME, |