Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b136425 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Bluetooth: Add Manifest configure to fix settings crash issue."

parents 160629c2 ebd7f22a

AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -328,6 +328,12 @@ 
                       android:value="com.android.settings.ApnSettings" />

        </activity>



        <activity android:name=".SubSettings$BluetoothSubSettings"

                android:taskAffinity="com.android.settings"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:parentActivityName="Settings">

        </activity>



        <activity android:name="Settings$BluetoothSettingsActivity"

                android:label="@string/bluetooth_settings_title"

                android:configChanges="orientation|keyboardHidden|screenSize"

src/com/android/settings/SubSettings.java

+2 −0
Original line number Diff line number Diff line
@@ -35,4 +35,6 @@ public class SubSettings extends SettingsActivity { 
        Log.d("SubSettings", "Launching fragment " + fragmentName);

        return true;

    }



    public static class BluetoothSubSettings extends SubSettings { /* empty */ }

}

src/com/android/settings/Utils.java

+6 −1
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ import android.widget.TabWidget; 
import com.android.internal.util.ImageUtils;

import com.android.internal.util.UserIcons;

import com.android.settings.UserSpinnerAdapter.UserDetails;

import com.android.settings.bluetooth.BluetoothSettings;

import com.android.settings.dashboard.DashboardCategory;

import com.android.settings.dashboard.DashboardTile;

import com.android.settings.drawable.CircleFramedDrawable;
@@ -689,7 +690,11 @@ public final class Utils { 
    public static Intent onBuildStartFragmentIntent(Context context, String fragmentName,

            Bundle args, int titleResId, CharSequence title, boolean isShortcut) {

        Intent intent = new Intent(Intent.ACTION_MAIN);

        if (BluetoothSettings.class.getName().equals(fragmentName)) {

            intent.setClass(context, SubSettings.BluetoothSubSettings.class);

        } 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_RESID, titleResId);