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

Commit a1167c14 authored by Florian Mayer's avatar Florian Mayer Committed by Android (Google) Code Review
Browse files

Merge "Add intent to open MemtagPage"

parents b1a21505 ce174931

AndroidManifest.xml

+19 −0
Original line number Diff line number Diff line
@@ -340,6 +340,25 @@ 
            </intent-filter>

        </receiver>



        <activity

            android:name="Settings$MemtagPageActivity"

            android:label="@string/memtag_title"

            android:icon="@drawable/ic_homepage_security"

            android:exported="true"

            android:configChanges="orientation|keyboardHidden|screenSize">

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

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

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

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

            </intent-filter>

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

                       android:value="com.android.settings.security.MemtagPage"/>

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

                       android:value="@string/menu_key_security"/>

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

                       android:value="true"/>

        </activity>



        <activity

            android:name="Settings$WifiSettingsActivity"

            android:label="@string/wifi_settings"

src/com/android/settings/Settings.java

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ public class Settings extends SettingsActivity { 
    /*

    * Settings subclasses for launching independently.

    */



    public static class MemtagPageActivity extends SettingsActivity { /* empty */}

    public static class AssistGestureSettingsActivity extends SettingsActivity { /* empty */}

    public static class BluetoothSettingsActivity extends SettingsActivity { /* empty */ }

    public static class CreateShortcutActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/core/gateway/SettingsGateway.java

+3 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ import com.android.settings.print.PrintSettingsFragment; 
import com.android.settings.privacy.PrivacyControlsFragment;

import com.android.settings.privacy.PrivacyDashboardFragment;

import com.android.settings.security.LockscreenDashboardFragment;

import com.android.settings.security.MemtagPage;

import com.android.settings.security.SecurityAdvancedSettings;

import com.android.settings.security.SecuritySettings;

import com.android.settings.shortcut.CreateShortcut;
@@ -328,6 +329,7 @@ public class SettingsGateway { 
            EnterprisePrivacySettings.class.getName(),

            WebViewAppPicker.class.getName(),

            LockscreenDashboardFragment.class.getName(),

            MemtagPage.class.getName(),

            BluetoothDeviceDetailsFragment.class.getName(),

            BluetoothBroadcastDialog.class.getName(),

            BluetoothFindBroadcastsFragment.class.getName(),
@@ -400,5 +402,6 @@ public class SettingsGateway { 
            Settings.MyDeviceInfoActivity.class.getName(),

            Settings.ModuleLicensesActivity.class.getName(),

            UserBackupSettingsActivity.class.getName(),

            Settings.MemtagPageActivity.class.getName(),

    };

}