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

Commit c73079d1 authored by Ravindra's avatar Ravindra Committed by Steve Kondik
Browse files

Settings: Removal of DSDS menu in SSSS mode 

Add new intent filter
"codeaurora.intent.filter.settings.multisim.SHORTCUT"
to de-couple MSIM setting menu in non-DSDS mode.

Change-Id: Ie7df65570095fd570ab48736072b03ac5b1b0027
CRs-fixed: 539932
parent ce95a675

AndroidManifest.xml

+16 −1
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

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

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

                <category android:name="codeaurora.intent.filter.settings.multisim.SHORTCUT" />

            </intent-filter>

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

                android:value="com.android.settings.wifi.WifiSettings" />
@@ -382,6 +383,7 @@ 
                <action android:name="android.settings.BLUETOOTH_SETTINGS" />

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

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

                <category android:name="codeaurora.intent.filter.settings.multisim.SHORTCUT" />

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

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -423,6 +425,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

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

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

                <category android:name="codeaurora.intent.filter.settings.multisim.SHORTCUT" />

            </intent-filter>

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

                android:value="com.android.settings.TetherSettings" />
@@ -480,6 +483,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

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

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

                <category android:name="codeaurora.intent.filter.settings.multisim.SHORTCUT" />

            </intent-filter>

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

                android:value="com.android.settings.vpn2.VpnSettings" />
@@ -671,6 +675,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

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

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

                <category android:name="codeaurora.intent.filter.settings.multisim.SHORTCUT" />

            </intent-filter>

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

                android:value="com.android.settings.SoundSettings" />
@@ -700,6 +705,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

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

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

                <category android:name="codeaurora.intent.filter.settings.multisim.SHORTCUT" />

            </intent-filter>

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

                android:value="com.android.settings.DisplaySettings" />
@@ -728,7 +734,7 @@ 
                <action android:name="com.android.settings.MULTI_SIM_SETTINGS" />

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

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

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

                <category android:name="codeaurora.intent.filter.settings.multisim.SHORTCUT" />

            </intent-filter>

        </activity>
@@ -792,6 +798,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

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

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

                <category android:name="codeaurora.intent.filter.settings.multisim.SHORTCUT" />

            </intent-filter>

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

                android:value="com.android.settings.applications.ManageApplications" />
@@ -916,6 +923,7 @@ 
                <action android:name="android.intent.action.MAIN" />

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

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

                <category android:name="codeaurora.intent.filter.settings.multisim.SHORTCUT" />

            </intent-filter>

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

                android:value="com.android.settings.NotificationStation" />
@@ -931,6 +939,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

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

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

                <category android:name="codeaurora.intent.filter.settings.multisim.SHORTCUT" />

            </intent-filter>

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

                android:value="com.android.settings.applications.AppOpsSummary" />
@@ -951,6 +960,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

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

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

                <category android:name="codeaurora.intent.filter.settings.multisim.SHORTCUT" />

            </intent-filter>

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

                android:value="com.android.settings.location.LocationSettings" />
@@ -998,6 +1008,7 @@ 
                <action android:name="com.android.settings.TRUSTED_CREDENTIALS_USER" />

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

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

                <category android:name="codeaurora.intent.filter.settings.multisim.SHORTCUT" />

            </intent-filter>

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

                android:value="com.android.settings.TrustedCredentialsSettings" />
@@ -1118,6 +1129,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

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

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

                <category android:name="codeaurora.intent.filter.settings.multisim.SHORTCUT" />

            </intent-filter>

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

                android:value="com.android.settings.accessibility.AccessibilitySettings" />
@@ -1639,6 +1651,7 @@ 
                <action android:name="android.intent.action.POWER_USAGE_SUMMARY" />

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

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

                <category android:name="codeaurora.intent.filter.settings.multisim.SHORTCUT" />

            </intent-filter>

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

                android:value="com.android.settings.fuelgauge.PowerUsageSummary" />
@@ -1883,6 +1896,7 @@ 
                <action android:name="android.intent.action.MAIN" />

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

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

                <category android:name="codeaurora.intent.filter.settings.multisim.SHORTCUT" />

            </intent-filter>

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

                android:value="com.android.settings.DataUsageSummary" />
@@ -1911,6 +1925,7 @@ 
                <action android:name="android.settings.DREAM_SETTINGS" />

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

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

                <category android:name="codeaurora.intent.filter.settings.multisim.SHORTCUT" />

            </intent-filter>

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

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

src/com/android/settings/CreateShortcut.java

+7 −1
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import android.app.LauncherActivity; 
import android.content.Intent;

import android.content.pm.ResolveInfo;

import android.os.Bundle;

import android.os.SystemProperties;

import android.telephony.MSimTelephonyManager;

import android.view.View;

import android.widget.ListView;
@@ -32,7 +34,11 @@ public class CreateShortcut extends LauncherActivity { 
    @Override

    protected Intent getTargetIntent() {

        Intent targetIntent = new Intent(Intent.ACTION_MAIN, null);

        if (MSimTelephonyManager.getDefault().isMultiSimEnabled()) {

            targetIntent.addCategory("codeaurora.intent.filter.settings.multisim.SHORTCUT");

        } else {

            targetIntent.addCategory("com.android.settings.SHORTCUT");

        }

        targetIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        return targetIntent;

    }