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

Commit 811266b1 authored by Arne Coucheron's avatar Arne Coucheron
Browse files

Revert "Settings: re-layout Settings menu" 

This reverts commit 77a62a97.

Change-Id: Ib31a240dc3b13d94c101ee76c50c96dadb426e6d
parent 53f73dc1

AndroidManifest.xml

+1 −77
Original line number Diff line number Diff line
@@ -498,18 +498,13 @@ 


        <activity android:name="Settings$TetherSettingsActivity"

                android:label="@string/tether_settings_title_all"

                android:icon="@drawable/ic_settings_tethering"

                android:icon="@drawable/ic_settings_wireless"

                android:taskAffinity="">

            <intent-filter>

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

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

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

            </intent-filter>

            <intent-filter android:priority="1">

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

            </intent-filter>

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

                android:value="com.android.settings.category.wireless" />

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

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

        </activity>
@@ -524,25 +519,6 @@ 
                android:value="com.android.settings.TetherSettings" />

        </activity-alias>



        <activity android:name="Settings$MobileNetworkMainActivity"

                android:label="@string/network_settings_title"

                android:icon="@drawable/ic_settings_mobile_network"

                android:enabled="false"

                android:taskAffinity="">

            <intent-filter>

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

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

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <intent-filter android:priority="1">

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

            </intent-filter>

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

                android:value="com.android.settings.category.wireless" />

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

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

        </activity>



        <activity android:name="Settings$WifiP2pSettingsActivity"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings$WifiSettingsActivity">
@@ -574,30 +550,6 @@ 
                android:value="com.android.settings.vpn2.VpnSettings" />

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

                android:value="true" />

        </activity>



        <activity android:name="Settings$SystemUpdateActivity"

            android:label="@string/system_update_settings_list_item_title"

            android:icon="@drawable/ic_settings_system_update"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings">

            <intent-filter android:priority="1">

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

            </intent-filter>

            <intent-filter>

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

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

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

            </intent-filter>

            <intent-filter android:priority="-1">

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

            </intent-filter>

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

                android:value="com.android.settings.category.system" />

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

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

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

                android:value="android.settings.SystemUpdateActivity" />

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

                android:value="true" />

        </activity>
@@ -1092,34 +1044,6 @@ 
                android:value="true" />

        </activity>



        <activity android:name="Settings$OtherDeviceFunctionsSettingsActivity"

            android:label="@string/radio_controls_title"

            android:icon="@drawable/ic_settings_more"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings">

            <intent-filter android:priority="1">

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

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

            </intent-filter>

            <intent-filter>

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

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

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

            </intent-filter>

            <intent-filter android:priority="-1">

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

            </intent-filter>

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

                android:value="com.android.settings.category.system" />

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

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

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

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

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

                android:value="true" />

        </activity>





        <activity android:name="SettingsLicenseActivity"

                android:label="@string/settings_license_activity_title"

                android:theme="@android:style/Theme.DeviceDefault.Light.Panel"

res/drawable-hdpi/ic_settings_call.png

deleted100755 → 0
−854 B
Loading image diff...

res/drawable-hdpi/ic_settings_mobile_network.png

deleted100755 → 0
−1.67 KiB
Loading image diff...

res/drawable-hdpi/ic_settings_system_update.png

deleted100755 → 0
−584 B
Loading image diff...

res/drawable-hdpi/ic_settings_tethering.png

deleted100755 → 0
−1.07 KiB
Loading image diff...