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

Commit 361915c7 authored by Jason Monk's avatar Jason Monk
Browse files

Move global actions to sysui and add plugin interface 

 - Move default global actions ui to sysui
 - Add fallback legacy interface in case sysui breaks
 - Switch to fallback if sysui dies or isn't responding

Test: Long-press power
Change-Id: I943522611de5dbbee61e66c67cf3a56379091e97
parent c0e002b4

core/java/com/android/internal/statusbar/IStatusBar.aidl

+5 −0
Original line number Diff line number Diff line
@@ -106,6 +106,11 @@ oneway interface IStatusBar 
     */

    void showTvPictureInPictureMenu();



    /**

     * Shows the global actions menu.

     */

    void showGlobalActionsMenu();



    void addQsTile(in ComponentName tile);

    void remQsTile(in ComponentName tile);

    void clickQsTile(in ComponentName tile);

core/java/com/android/internal/statusbar/IStatusBarService.aidl

+9 −0
Original line number Diff line number Diff line
@@ -63,6 +63,15 @@ interface IStatusBarService 
    void onNotificationExpansionChanged(in String key, in boolean userAction, in boolean expanded);

    void setSystemUiVisibility(int vis, int mask, String cause);



    void onGlobalActionsShown();

    void onGlobalActionsHidden();



    /**

     * These methods are needed for global actions control which the UI is shown in sysui.

     */

    void shutdown();

    void reboot(boolean safeMode);



    void addTile(in ComponentName tile);

    void remTile(in ComponentName tile);

    void clickTile(in ComponentName tile);

core/java/com/android/internal/policy/EmergencyAffordanceManager.java→core/java/com/android/internal/util/EmergencyAffordanceManager.java

+8 −10
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 * Copyright (C) 2017 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

 * 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

 * 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.internal.policy;

package com.android.internal.util;



import android.content.Context;

import android.content.Intent;

packages/SystemUI/plugin/src/com/android/systemui/plugins/GlobalActions.java

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 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.systemui.plugins;



import com.android.systemui.plugins.GlobalActions.GlobalActionsManager;

import com.android.systemui.plugins.annotations.DependsOn;

import com.android.systemui.plugins.annotations.ProvidesInterface;



@ProvidesInterface(action = GlobalActions.ACTION, version = GlobalActions.VERSION)

@DependsOn(target = GlobalActionsManager.class)

public interface GlobalActions extends Plugin {



    String ACTION = "com.android.systemui.action.PLUGIN_GLOBAL_ACTIONS";

    int VERSION = 1;



    void showGlobalActions(GlobalActionsManager manager);



    @ProvidesInterface(version = GlobalActionsManager.VERSION)

    public interface GlobalActionsManager {

        int VERSION = 1;



        void onGlobalActionsShown();

        void onGlobalActionsHidden();



        void shutdown();

        void reboot(boolean safeMode);

    }

}

packages/SystemUI/src/com/android/keyguard/EmergencyButton.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import com.android.internal.logging.MetricsLogger; 
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.telephony.IccCardConstants.State;

import com.android.internal.widget.LockPatternUtils;

import com.android.internal.policy.EmergencyAffordanceManager;

import com.android.internal.util.EmergencyAffordanceManager;



/**

 * This class implements a smart emergency button that updates itself based