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

Commit bf94d09d authored by Ricky Wai's avatar Ricky Wai
Browse files

Change "Long pressing work mode in quick settings" to managed profile settings

Test: Long pressing work mode can go to managed profile settings now.

Bug: 34189626
Change-Id: I84820b1ce0a5693f36236c1bb512c99db3c6e9df
parent 6dc17f83
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -2306,6 +2306,18 @@
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                android:value="true" />
        </activity>
        <activity android:name="Settings$ManagedProfileSettingsActivity"
            android:label="@string/managed_profile_settings_title"
            android:taskAffinity=""
            android:parentActivityName="Settings"
            android:permission="android.permission.MANAGE_USERS">
            <intent-filter android:priority="1">
                <action android:name="android.settings.MANAGED_PROFILE_SETTINGS" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.accounts.ManagedProfileSettings" />
        </activity>

        <activity android:name="com.android.settings.accounts.AddAccountSettings"
            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+3 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.util.Log;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;

@@ -97,7 +98,8 @@ public class ManagedProfileSettings extends SettingsPreferenceFragment
                }
            }
        }
        return null;
        // Return default managed profile for the current user.
        return Utils.getManagedProfile(mUserManager);
    }

    private void loadDataAndPopulateUi() {