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

Commit fc2ad1f7 authored by Olivier Nshimiye's avatar Olivier Nshimiye Committed by Android (Google) Code Review
Browse files

Merge "Fix delete private space page overlap issue" into main

parents 84b2a24b 6144d04e

AndroidManifest.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -5530,6 +5530,7 @@ 




        <activity android:name=".privatespace.delete.PrivateSpaceDeleteActivity"

        <activity android:name=".privatespace.delete.PrivateSpaceDeleteActivity"

                  android:label="@string/private_space_delete_header"

                  android:label="@string/private_space_delete_header"

                  android:theme="@style/GlifV3Theme.Light"

                  android:exported="false">

                  android:exported="false">

        </activity>

        </activity>

src/com/android/settings/privatespace/delete/PrivateSpaceDeleteActivity.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -19,15 +19,16 @@ package com.android.settings.privatespace.delete; 
import android.app.settings.SettingsEnums;

import android.app.settings.SettingsEnums;

import android.os.Bundle;

import android.os.Bundle;





import androidx.fragment.app.FragmentActivity;

import androidx.navigation.fragment.NavHostFragment;

import androidx.navigation.fragment.NavHostFragment;





import com.android.settings.R;

import com.android.settings.R;

import com.android.settings.SetupWizardUtils;

import com.android.settings.SetupWizardUtils;

import com.android.settings.core.InstrumentedActivity;

import com.android.settingslib.core.instrumentation.Instrumentable;





import com.google.android.setupdesign.util.ThemeHelper;

import com.google.android.setupdesign.util.ThemeHelper;





public class PrivateSpaceDeleteActivity extends InstrumentedActivity {

public class PrivateSpaceDeleteActivity extends FragmentActivity implements Instrumentable {

    @Override

    @Override

    public int getMetricsCategory() {

    public int getMetricsCategory() {

        return SettingsEnums.PRIVATE_SPACE_SETTINGS;

        return SettingsEnums.PRIVATE_SPACE_SETTINGS;