Merge "Add intent to open MemtagPage"
This commit is contained in:
committed by
Android (Google) Code Review
commit
a1167c1432
@@ -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 */ }
|
||||
|
@@ -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(),
|
||||
};
|
||||
}
|
||||
|
Reference in New Issue
Block a user