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

Commit 190fe3bf authored by Winson's avatar Winson
Browse files

Refactoring secondary user recents logic. 

- Removing old broadcasts in favor of direct aidl interface between
  system and secondary users.  Also moving user specific implementation
  into RecentsImpl, allowing Recents to handle proxying between users.

Change-Id: I4bd5ef1d1ee47309b7c754f50a5e8b2e2aab988f
parent 78c5faff

packages/SystemUI/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ include $(CLEAR_VARS) 


LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-proto-files-under,src) \

LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-proto-files-under,src) $(call all-Iaidl-files-under, src) \

    src/com/android/systemui/EventLogTags.logtags



LOCAL_STATIC_JAVA_LIBRARIES := Keyguard

packages/SystemUI/AndroidManifest.xml

+5 −11
Original line number Diff line number Diff line
@@ -199,6 +199,11 @@ 
                    android:value="com.android.settings.category.system" />

        </activity>



        <!-- Service used by secondary users to register themselves with the system user. -->

        <service android:name=".recents.RecentsSystemUserService"

            android:exported="false"

            android:permission="com.android.systemui.permission.SELF" />



        <!-- Alternate Recents -->

        <activity android:name=".recents.RecentsActivity"

                  android:label="@string/accessibility_desc_recent_apps"
@@ -215,17 +220,6 @@ 
            </intent-filter>

        </activity>



        <receiver android:name=".recents.RecentsUserEventProxyReceiver"

                  android:exported="false">

            <intent-filter>

                <action android:name="com.android.systemui.recents.action.SHOW_RECENTS_FOR_USER" />

                <action android:name="com.android.systemui.recents.action.HIDE_RECENTS_FOR_USER" />

                <action android:name="com.android.systemui.recents.action.TOGGLE_RECENTS_FOR_USER" />

                <action android:name="com.android.systemui.recents.action.PRELOAD_RECENTS_FOR_USER" />

                <action android:name="com.android.systemui.recents.action.CONFIG_CHANGED_FOR_USER" />

            </intent-filter>

        </receiver>



        <!-- Callback for dismissing screenshot notification after a share target is picked -->

        <receiver android:name=".screenshot.GlobalScreenshot$TargetChosenReceiver"

                  android:process=":screenshot"

packages/SystemUI/src/com/android/systemui/recents/IRecentsNonSystemUserCallbacks.aidl

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

 * Copyright (C) 2015 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.recents;



/**

 * Due to the fact that RecentsActivity is per-user, we need to establish an

 * interface (this) for the system user to callback to the secondary users in

 * response to UI events coming in from the system user's SystemUI.

 */

oneway interface IRecentsNonSystemUserCallbacks {

    void preloadRecents();

    void cancelPreloadingRecents();

    void showRecents(boolean triggeredFromAltTab);

    void hideRecents(boolean triggeredFromAltTab, boolean triggeredFromHomeKey);

    void toggleRecents();

    void onConfigurationChanged();

}

packages/SystemUI/src/com/android/systemui/recents/IRecentsSystemUserCallbacks.aidl

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

 * Copyright (C) 2015 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.recents;



/**

 * Due to the fact that RecentsActivity is per-user, we need to establish an

 * interface (this) for the non-system user to register itself for callbacks and to

 * callback to the system user to update internal state.

 */

oneway interface IRecentsSystemUserCallbacks {

    void registerNonSystemUserCallbacks(IBinder nonSystemUserCallbacks, int userId);



    void updateRecentsVisibility(boolean visible);

    void startScreenPinning();

}

packages/SystemUI/src/com/android/systemui/recents/Recents.java

+256 −779

File changed.

Preview size limit exceeded, changes collapsed.