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

Commit f89dcdd5 authored by jianhuac's avatar jianhuac Committed by Linux Build Service Account
Browse files

Settings: Fix for crashed in saved networks popup when rotate. 

Don't create new activity when rotate device.

Change-Id: Id514d2b22ed77d075f18e7e62ffaf82a4be24704
parent a6e054c3

AndroidManifest.xml

+5 −1
Original line number Original line Diff line number Diff line
@@ -306,7 +306,11 @@ 
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

                android:value="true" />

        </activity>

        </activity>



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

            android:taskAffinity="com.android.settings"

            android:configChanges="orientation|keyboardHidden|screenSize"

            android:parentActivityName="Settings">

        </activity>

        <activity android:name="Settings$SavedAccessPointsSettingsActivity"

        <activity android:name="Settings$SavedAccessPointsSettingsActivity"

                android:taskAffinity="com.android.settings"

                android:taskAffinity="com.android.settings"

                android:label="@string/wifi_saved_access_points_label"

                android:label="@string/wifi_saved_access_points_label"

src/com/android/settings/SubSettings.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -36,4 +36,5 @@ public class SubSettings extends SettingsActivity { 
        return true;

        return true;

    }

    }

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

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

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

}
 
}

src/com/android/settings/Utils.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -93,6 +93,7 @@ import com.android.internal.app.UnlaunchableAppActivity; 
import com.android.internal.util.ArrayUtils;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.UserIcons;

import com.android.internal.util.UserIcons;

import com.android.settings.bluetooth.BluetoothSettings;

import com.android.settings.bluetooth.BluetoothSettings;

import com.android.settings.wifi.SavedAccessPointsWifiSettings;





import java.io.IOException;

import java.io.IOException;

import java.io.InputStream;

import java.io.InputStream;
@@ -586,6 +587,9 @@ public final class Utils extends com.android.settingslib.Utils { 
        if (BluetoothSettings.class.getName().equals(fragmentName)) {

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

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

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

            intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_AS_SUBSETTING, true);

            intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_AS_SUBSETTING, true);

         } else if(SavedAccessPointsWifiSettings.class.getName().equals(fragmentName)) {

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

            intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_AS_SUBSETTING, true);

        }else {

        }else {

             intent.setClass(context, SubSettings.class);

             intent.setClass(context, SubSettings.class);

         }

         }