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

Commit d74703d6 authored by Samuel Fufa's avatar Samuel Fufa Committed by Android (Google) Code Review
Browse files

Merge "Remove HotseatEduActivity from AOSP" into sc-v2-dev

parents fb624f85 0115d738
Loading
Loading
Loading
Loading
+0 −20
Original line number Diff line number Diff line
@@ -22,11 +22,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.android.launcher3">

     <permission
        android:name="${packageName}.permission.HOTSEAT_EDU"
        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
        android:protectionLevel="signatureOrSystem" />

    <uses-permission android:name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS" />
    <uses-permission android:name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/>
    <uses-permission android:name="android.permission.VIBRATE"/>
@@ -41,7 +36,6 @@
    <uses-permission android:name="android.permission.MANAGE_ACCESSIBILITY"/>
    <uses-permission android:name="android.permission.MONITOR_INPUT"/>

    <uses-permission android:name="${packageName}.permission.HOTSEAT_EDU" />
    <uses-permission android:name="android.permission.SYSTEM_APPLICATION_OVERLAY" />

    <application android:backupAgent="com.android.launcher3.LauncherBackupAgent"
@@ -133,20 +127,6 @@
            </intent-filter>
        </activity>

        <activity
            android:name=".hybridhotseat.HotseatEduActivity"
            android:theme="@android:style/Theme.NoDisplay"
            android:noHistory="true"
            android:launchMode="singleTask"
            android:clearTaskOnLaunch="true"
            android:permission="${packageName}.permission.HOTSEAT_EDU"
            android:exported="true">
            <intent-filter>
                <action android:name="com.android.launcher3.action.SHOW_HYBRID_HOTSEAT_EDU"/>
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>

    </application>

</manifest>
+0 −60
Original line number Diff line number Diff line
/*
 * Copyright (C) 2020 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.android.launcher3.hybridhotseat;

import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;

import com.android.launcher3.BaseActivity;
import com.android.launcher3.Launcher;
import com.android.launcher3.uioverrides.QuickstepLauncher;
import com.android.launcher3.util.ActivityTracker;

/**
 * Proxy activity to return user to home screen and show halfsheet education
 */
public class HotseatEduActivity extends Activity {

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

        Intent homeIntent = new Intent(Intent.ACTION_MAIN)
                .addCategory(Intent.CATEGORY_HOME)
                .setPackage(getPackageName())
                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        Launcher.ACTIVITY_TRACKER.registerCallback(new HotseatActivityTracker());
        startActivity(homeIntent);
        finish();
    }

    static class HotseatActivityTracker<T extends QuickstepLauncher> implements
            ActivityTracker.SchedulerCallback {

        @Override
        public boolean init(BaseActivity activity, boolean alreadyOnHome) {
            QuickstepLauncher launcher = (QuickstepLauncher) activity;
            if (launcher != null) {
                launcher.getHotseatPredictionController().showEdu();
            }
            return false;
        }

    }
}