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

Commit 8c4ccb87 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

Code cleaning for removing dual pane meta data as it is no more used 

- remove META_DATA_KEY_PARENT_TITLE and META_DATA_KEY_PARENT_FRAGMENT_CLASS

Change-Id: Ied38e9a26e3c47edec56437818bb6f2daa7f8621
parent d954e2cc

AndroidManifest.xml

+0 −48
Original line number Diff line number Diff line
@@ -206,10 +206,6 @@ 
                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"
@@ -331,10 +327,6 @@ 
                android:value="com.android.settings.TetherSettings" />

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

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

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

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

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

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

        </activity>



        <!-- Keep compatibility with old shortcuts. -->
@@ -347,10 +339,6 @@ 
                android:value="com.android.settings.TetherSettings" />

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

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

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

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

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

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

        </activity-alias>



        <activity android:name="Settings$WifiP2pSettingsActivity"
@@ -366,10 +354,6 @@ 
                android:value="com.android.settings.wifi.p2p.WifiP2pSettings" />

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

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

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

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

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

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

        </activity>
@@ -388,10 +372,6 @@ 
                android:value="com.android.settings.vpn2.VpnSettings" />

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

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

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

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

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

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

        </activity>



        <activity android:name="Settings$DateTimeSettingsActivity"
@@ -490,10 +470,6 @@ 
                android:value="com.android.settings.inputmethod.SpellCheckersSettings" />

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

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

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

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

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

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

        </activity>



        <activity android:name=".inputmethod.InputMethodAndSubtypeEnablerActivity"
@@ -528,10 +504,6 @@ 
                android:value="com.android.settings.inputmethod.UserDictionaryList" />

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

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

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

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

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

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

        </activity>



        <activity android:name=".inputmethod.UserDictionaryAddWordActivity"
@@ -557,10 +529,6 @@ 
                android:value="com.android.settings.UserDictionarySettings" />

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

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

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

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

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

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

        </activity-alias>



        <activity android:name="Settings$SoundSettingsActivity"
@@ -944,10 +912,6 @@ 
                android:value="com.android.settings.DeviceAdminSettings" />

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

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

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

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

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

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

        </activity>



        <!-- Keep compatibility with old shortcuts. -->
@@ -959,10 +923,6 @@ 
                android:value="com.android.settings.DeviceAdminSettings" />

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

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

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

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

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

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

        </activity-alias>



        <activity android:name="DeviceAdminAdd"
@@ -1253,10 +1213,6 @@ 
                android:value="com.android.settings.deviceinfo.UsbSettings" />

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

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

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

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

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

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

        </activity>



        <!-- Keep compatibility with old shortcuts. -->
@@ -1268,10 +1224,6 @@ 
                android:value="com.android.settings.deviceinfo.UsbSettings" />

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

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

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

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

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

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

        </activity-alias>



        <!-- Bluetooth stuff -->

src/com/android/settings/Settings.java

+0 −35
Original line number Diff line number Diff line
@@ -111,10 +111,6 @@ public class Settings extends PreferenceActivity 
        "com.android.settings.TOP_LEVEL_HEADER_ID";

    private static final String META_DATA_KEY_FRAGMENT_CLASS =

        "com.android.settings.FRAGMENT_CLASS";

    private static final String META_DATA_KEY_PARENT_TITLE =

        "com.android.settings.PARENT_FRAGMENT_TITLE";

    private static final String META_DATA_KEY_PARENT_FRAGMENT_CLASS =

        "com.android.settings.PARENT_FRAGMENT_CLASS";



    private static final String EXTRA_UI_OPTIONS = "settings:ui_options";
@@ -129,7 +125,6 @@ public class Settings extends PreferenceActivity 
    private int mTopLevelHeaderId;

    private Header mFirstHeader;

    private Header mCurrentHeader;

    private Header mParentHeader;

    private boolean mInLocalHeaderSwitch;



    // Show only these settings for restricted users
@@ -217,7 +212,6 @@ public class Settings extends PreferenceActivity 
        // Retrieve any saved state

        if (savedInstanceState != null) {

            mCurrentHeader = savedInstanceState.getParcelable(SAVE_KEY_CURRENT_HEADER);

            mParentHeader = savedInstanceState.getParcelable(SAVE_KEY_PARENT_HEADER);

        }



        // If the current header was saved, switch to it
@@ -226,15 +220,6 @@ public class Settings extends PreferenceActivity 
            showBreadCrumbs(mCurrentHeader.title, null);

        }



        if (mParentHeader != null) {

            setParentTitle(mParentHeader.title, null, new OnClickListener() {

                @Override

                public void onClick(View v) {

                    switchToParent(mParentHeader.fragment);

                }

            });

        }



        // Override up navigation for multi-pane, since we handle it in the fragment breadcrumbs

        if (onIsMultiPane()) {

            getActionBar().setDisplayHomeAsUpEnabled(false);
@@ -250,9 +235,6 @@ public class Settings extends PreferenceActivity 
        if (mCurrentHeader != null) {

            outState.putParcelable(SAVE_KEY_CURRENT_HEADER, mCurrentHeader);

        }

        if (mParentHeader != null) {

            outState.putParcelable(SAVE_KEY_PARENT_HEADER, mParentHeader);

        }

    }



    @Override
@@ -376,7 +358,6 @@ public class Settings extends PreferenceActivity 
    public void switchToHeader(Header header) {

        if (!mInLocalHeaderSwitch) {

            mCurrentHeader = null;

            mParentHeader = null;

        }

        super.switchToHeader(header);

    }
@@ -401,11 +382,6 @@ public class Settings extends PreferenceActivity 


                switchToHeaderLocal(parentHeader);

                highlightHeader(mTopLevelHeaderId);



                mParentHeader = new Header();

                mParentHeader.fragment

                        = parentInfo.metaData.getString(META_DATA_KEY_PARENT_FRAGMENT_CLASS);

                mParentHeader.title = parentInfo.metaData.getString(META_DATA_KEY_PARENT_TITLE);

            }

        } catch (NameNotFoundException nnfe) {

            Log.w(LOG_TAG, "Could not find parent activity : " + className);
@@ -733,17 +709,6 @@ public class Settings extends PreferenceActivity 
            if (ai == null || ai.metaData == null) return;

            mTopLevelHeaderId = ai.metaData.getInt(META_DATA_KEY_HEADER_ID);

            mFragmentClass = ai.metaData.getString(META_DATA_KEY_FRAGMENT_CLASS);



            // Check if it has a parent specified and create a Header object

            final int parentHeaderTitleRes = ai.metaData.getInt(META_DATA_KEY_PARENT_TITLE);

            String parentFragmentClass = ai.metaData.getString(META_DATA_KEY_PARENT_FRAGMENT_CLASS);

            if (parentFragmentClass != null) {

                mParentHeader = new Header();

                mParentHeader.fragment = parentFragmentClass;

                if (parentHeaderTitleRes != 0) {

                    mParentHeader.title = getResources().getString(parentHeaderTitleRes);

                }

            }

        } catch (NameNotFoundException nnfe) {

            // No recovery

        }