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

Commit 990fb52e authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Fixes to parent fragment names and other manifest issues. 

Bug: 5324865

Also, when jumping into a second+ level setting, make sure the header list
item is scrolled into view.

Change-Id: I714c1f80c8b20e23208763f1c30449a49f2a4082
parent 9fe945b8

AndroidManifest.xml

+4 −2
Original line number Diff line number Diff line
@@ -153,6 +153,10 @@ 
                android:value="com.android.settings.wifi.AdvancedWifiSettings" />

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

                android:resource="@id/wifi_settings" />

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

                android:resource="@string/wifi_settings" />

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

                android:value="com.android.settings.Settings$WifiSettingsActivity" />

        </activity>



        <activity android:name=".wifi.WifiInfo"
@@ -354,7 +358,6 @@ 
                android:clearTaskOnLaunch="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="com.android.settings.VOICE_INPUT_OUTPUT_SETTINGS" />

                <action android:name="android.settings.INPUT_METHOD_SETTINGS" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -370,7 +373,6 @@ 
                android:clearTaskOnLaunch="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="com.android.settings.VOICE_INPUT_OUTPUT_SETTINGS" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

src/com/android/settings/Settings.java

+2 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler { 
                mCurrentHeader = parentHeader;



                switchToHeaderLocal(parentHeader);

                highlightHeader();



                mParentHeader = new Header();

                mParentHeader.fragment
@@ -217,6 +218,7 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler { 
            Integer index = mHeaderIndexMap.get(mTopLevelHeaderId);

            if (index != null) {

                getListView().setItemChecked(index, true);

                getListView().smoothScrollToPosition(index);

            }

        }

    }