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

Commit b7e4380c authored by Jason Monk's avatar Jason Monk
Browse files

Remove PreferenceActivity 

Its broken and isn't worth maintaining, instead port the few things
using it over to SettingsPreferenceActivity with wrapping blank
Activities like the rest of Settings.

Change-Id: Ic82f0dcb63ed9b4078f7da6a79c0c52f0130e8d1
Fixes: 28779941
parent f8c64089

AndroidManifest.xml

+29 −10
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ 
                android:value="true" />

        </activity>



        <activity android:name=".wifi.WifiInfo"

        <activity android:name=".Settings$WifiInfoActivity"

                android:theme="@style/Theme.SubSettingsDialogWhenLarge"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings$WifiSettingsActivity">
@@ -336,6 +336,8 @@ 
                <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />

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

            </intent-filter>

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

                       android:value="com.android.settings.wifi.WifiInfo" />

        </activity>



        <activity android:name=".wifi.WifiConfigInfo"
@@ -349,13 +351,15 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".wifi.WifiAPITest"

        <activity android:name=".Settings$WifiAPITestActivity"

                android:theme="@style/Theme.SubSettingsDialogWhenLarge">

            <intent-filter>

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

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

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

            </intent-filter>

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

                       android:value="com.android.settings.wifi.WifiAPITest" />

        </activity>



        <activity android:name=".wifi.WifiStatusTest"
@@ -1448,7 +1452,7 @@ 
            </intent-filter>

        </activity-alias>



        <activity android:name="IccLockSettings"

        <activity android:name="Settings$IccLockSettingsActivity"

                android:label="@string/sim_lock_settings"

                android:theme="@style/Theme.SubSettingsDialogWhenLarge"

                android:process="com.android.phone">
@@ -1457,6 +1461,8 @@ 
                <category android:name="android.intent.category.DEFAULT" />

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

            </intent-filter>

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

                android:value="com.android.settings.IccLockSettings" />

        </activity>



        <activity android:name="Settings$AccessibilitySettingsActivity"
@@ -1739,7 +1745,7 @@ 
        <activity android:name=".EncryptionInterstitial"/>



        <!-- Runs in the phone process since it needs access to the Phone object -->

        <activity android:name=".deviceinfo.Status"

        <activity android:name=".Settings$StatusActivity"

                android:label="@string/device_status_activity_title"

                android:theme="@style/Theme.SubSettingsDialogWhenLarge"

                android:process="com.android.phone">
@@ -1748,10 +1754,12 @@ 
                <category android:name="android.intent.category.DEFAULT" />

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

            </intent-filter>

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

                android:value="com.android.settings.deviceinfo.Status" />

        </activity>



        <!-- Runs in the phone process since it needs access to the Phone object -->

        <activity android:name=".deviceinfo.SimStatus"

        <activity android:name=".Settings$SimStatusActivity"

                android:label="@string/sim_status_title"

                android:theme="@style/Theme.SubSettingsDialogWhenLarge"

                android:process="com.android.phone">
@@ -1760,10 +1768,12 @@ 
                <category android:name="android.intent.category.DEFAULT" />

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

            </intent-filter>

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

                android:value="com.android.settings.deviceinfo.SimStatus" />

        </activity>



        <!-- Runs in the phone process since it needs access to the Phone object -->

        <activity android:name=".deviceinfo.ImeiInformation"

        <activity android:name=".Settings$ImeiInformationActivity"

                android:label="@string/imei_information_title"

                android:theme="@style/Theme.SubSettingsDialogWhenLarge"

                android:process="com.android.phone">
@@ -1772,6 +1782,8 @@ 
                <category android:name="android.intent.category.DEFAULT" />

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

            </intent-filter>

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

                android:value="com.android.settings.deviceinfo.ImeiInformation" />

        </activity>



        <activity android:name="Settings$StorageSettingsActivity"
@@ -1876,7 +1888,7 @@ 
                android:exported="true"

                android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />



        <activity android:name="ApnEditor"

        <activity android:name="Settings$ApnEditorActivity"

                android:label="@string/apn_edit">

            <intent-filter>

                <action android:name="android.intent.action.VIEW" />
@@ -1890,6 +1902,8 @@ 
                <category android:name="android.intent.category.DEFAULT" />

                <data android:mimeType="vnd.android.cursor.dir/telephony-carrier" />

            </intent-filter>

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

                       android:value="com.android.settings.ApnEditor" />

        </activity>



        <activity android:name="Settings$DevelopmentSettingsActivity"
@@ -2154,11 +2168,13 @@ 
            </intent-filter>

        </activity>



        <activity android:name="TestingSettings" android:label="@string/testing">

        <activity android:name="Settings$TestingSettingsActivity" android:label="@string/testing">

            <intent-filter>

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

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

            </intent-filter>

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

                android:value="com.android.settings.TestingSettings" />

        </activity>



        <receiver android:name="TestingSettingsBroadcastReceiver">
@@ -2319,10 +2335,13 @@ 
                android:value="true" />

        </activity>



        <activity android:name="com.android.settings.accounts.ChooseAccountActivity"

        <activity android:name="Settings$ChooseAccountActivity"

            android:label="@string/header_add_an_account"

            android:configChanges="orientation|keyboardHidden|screenSize"

            android:theme="@style/Theme.SubSettingsDialogWhenLarge"/>

            android:theme="@style/Theme.SubSettingsDialogWhenLarge">

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

                       android:value="com.android.settings.accounts.ChooseAccountActivity" />

        </activity>



        <activity android:name=".CryptKeeper"

                  androidprv:systemUserOnly="true"

res/layout/icc_lock_tabs.xml

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
            android:layout_height="0dip" />



        <FrameLayout

            android:id="@+id/main_content"

            android:id="@+id/prefs_container"

            android:layout_width="match_parent"

            android:layout_height="0dip"

            android:layout_weight="1"

res/xml/device_info_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
                android:summary="@string/device_status_summary">

            <intent android:action="android.intent.action.MAIN"

                    android:targetPackage="com.android.settings"

                    android:targetClass="com.android.settings.deviceinfo.Status" />

                    android:targetClass="com.android.settings.Settings$StatusActivity" />

        </PreferenceScreen>



        <!-- Manual -->

res/xml/device_info_status.xml

+2 −2
Original line number Diff line number Diff line
@@ -33,13 +33,13 @@ 
        android:title="@string/sim_status_title"

        android:persistent="false">

        <intent android:targetPackage="com.android.settings"

            android:targetClass="com.android.settings.deviceinfo.SimStatus" />

            android:targetClass="com.android.settings.Settings$SimStatusActivity" />

    </PreferenceScreen>

    <PreferenceScreen android:key="imei_info"

        android:title="@string/imei_information_title"

        android:persistent="false">

        <intent android:targetPackage="com.android.settings"

            android:targetClass="com.android.settings.deviceinfo.ImeiInformation" />

            android:targetClass="com.android.settings.Settings$ImeiInformationActivity" />

    </PreferenceScreen>

    <com.android.settings.CopyablePreference android:key="wifi_ip_address"

        android:enabled="false"

res/xml/security_settings_misc.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 


            <intent android:action="android.intent.action.MAIN"

                    android:targetPackage="com.android.settings"

                    android:targetClass="com.android.settings.IccLockSettings"/>

                    android:targetClass="com.android.settings.Settings$IccLockSettingsActivity"/>



        </Preference>