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

Commit a4fc6da2 authored by Ulyana Trafimovich's avatar Ulyana Trafimovich
Browse files

Revert "Enable smartspace" 

Revert "Enable smartspace"

Revert submission 13984710-smartspace_ls

Reason for revert: Broken test: com.android.devicehealthchecks.SystemAppCheck#system_app_crash on git_master on redfin-userdebug at 7262114

Reverted Changes:
I77a4ef72c:Enable smartspace
I77a4ef72c:Enable smartspace

Bug: 184642387
Change-Id: I299bef5e730c632803c56cf0f1cd858caac4e49f
Test: forrest run for the broken test
parent 37d3636c

packages/SystemUI/AndroidManifest.xml

+0 −2
Original line number Diff line number Diff line
@@ -275,8 +275,6 @@ 
    <!-- Permission to make accessibility service access Bubbles -->

    <uses-permission android:name="android.permission.ADD_TRUSTED_DISPLAY" />



    <!-- Can control and display smartspace content -->

    <uses-permission android:name="android.permission.MANAGE_SMARTSPACE" />



    <protected-broadcast android:name="com.android.settingslib.action.REGISTER_SLICE_RECEIVER" />

    <protected-broadcast android:name="com.android.settingslib.action.UNREGISTER_SLICE_RECEIVER" />

packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java

+0 −16
Original line number Diff line number Diff line
@@ -16,9 +16,7 @@ 


package com.android.systemui.plugins;



import android.app.smartspace.SmartspaceTarget;

import android.os.Parcelable;

import android.view.ViewGroup;



import com.android.systemui.plugins.annotations.ProvidesInterface;
@@ -38,23 +36,9 @@ public interface BcSmartspaceDataPlugin extends Plugin { 
    /** Unregister a listener. */

    void unregisterListener(SmartspaceTargetListener listener);



    /**

     * Create a view to be shown within the parent. Do not add the view, as the parent

     * will be responsible for correctly setting the LayoutParams

     */

    SmartspaceView getView(ViewGroup parent);



    /** Updates Smartspace data and propagates it to any listeners. */

    void onTargetsAvailable(List<SmartspaceTarget> targets);



    /** Provides Smartspace data to registered listeners. */

    interface SmartspaceTargetListener {

        /** Each Parcelable is a SmartspaceTarget that represents a card. */

        void onSmartspaceTargetsUpdated(List<? extends Parcelable> targets);

    }



    /** View to which this plugin can be registered, in order to get updates. */

    interface SmartspaceView {

        void registerDataProvider(BcSmartspaceDataPlugin plugin);

    }

}

packages/SystemUI/res/values/flags.xml

+0 −2
Original line number Diff line number Diff line
@@ -52,6 +52,4 @@ 
    <bool name="flag_charging_ripple">false</bool>



    <bool name="flag_ongoing_call_status_bar_chip">false</bool>



    <bool name="flag_smartspace">false</bool>

</resources>

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

+1 −99
Original line number Diff line number Diff line
@@ -16,15 +16,8 @@ 


package com.android.keyguard;



import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;

import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;



import android.app.WallpaperManager;

import android.app.smartspace.SmartspaceConfig;

import android.app.smartspace.SmartspaceManager;

import android.app.smartspace.SmartspaceSession;

import android.content.ContentResolver;

import android.content.Context;

import android.content.res.Resources;

import android.provider.Settings;

import android.text.TextUtils;
@@ -32,7 +25,6 @@ import android.text.format.DateFormat; 
import android.view.View;

import android.view.ViewGroup;

import android.widget.FrameLayout;

import android.widget.RelativeLayout;



import com.android.internal.colorextraction.ColorExtractor;

import com.android.keyguard.clock.ClockManager;
@@ -40,12 +32,8 @@ import com.android.systemui.R; 
import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.plugins.BcSmartspaceDataPlugin;

import com.android.systemui.plugins.ClockPlugin;

import com.android.systemui.plugins.PluginListener;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.shared.plugins.PluginManager;

import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.statusbar.notification.AnimatableProperty;

import com.android.systemui.statusbar.notification.PropertyAnimator;

import com.android.systemui.statusbar.notification.stack.AnimationProperties;
@@ -55,7 +43,6 @@ import com.android.systemui.util.ViewController; 


import java.util.Locale;

import java.util.TimeZone;

import java.util.concurrent.Executor;



import javax.inject.Inject;
@@ -81,13 +68,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
    private AnimatableClockController mNewLockScreenLargeClockViewController;

    private FrameLayout mNewLockScreenLargeClockFrame;



    private PluginManager mPluginManager;

    private boolean mIsSmartspaceEnabled;

    PluginListener mPluginListener;

    private Executor mUiExecutor;

    private SmartspaceSession mSmartspaceSession;

    private SmartspaceSession.Callback mSmartspaceCallback;



    private int mLockScreenMode = KeyguardUpdateMonitor.LOCK_SCREEN_MODE_NORMAL;



    private final StatusBarStateController.StateListener mStateListener =
@@ -116,9 +96,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
    private ClockManager.ClockChangedListener mClockChangedListener = this::setClockPlugin;

    private String mTimeFormat;



    // If set, will replace keyguard_status_area

    private BcSmartspaceDataPlugin.SmartspaceView mSmartspaceView;



    @Inject

    public KeyguardClockSwitchController(

            KeyguardClockSwitch keyguardClockSwitch,
@@ -128,10 +105,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
            KeyguardSliceViewController keyguardSliceViewController,

            NotificationIconAreaController notificationIconAreaController,

            ContentResolver contentResolver,

            BroadcastDispatcher broadcastDispatcher,

            PluginManager pluginManager,

            FeatureFlags featureFlags,

            @Main Executor uiExecutor) {

            BroadcastDispatcher broadcastDispatcher) {

        super(keyguardClockSwitch);

        mResources = resources;

        mStatusBarStateController = statusBarStateController;
@@ -141,9 +115,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
        mNotificationIconAreaController = notificationIconAreaController;

        mBroadcastDispatcher = broadcastDispatcher;

        mTimeFormat = Settings.System.getString(contentResolver, Settings.System.TIME_12_24);

        mPluginManager = pluginManager;

        mIsSmartspaceEnabled = featureFlags.isSmartspaceEnabled();

        mUiExecutor = uiExecutor;

    }



    /**
@@ -166,63 +137,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
        updateAodIcons();

        mNewLockScreenClockFrame = mView.findViewById(R.id.new_lockscreen_clock_view);

        mNewLockScreenLargeClockFrame = mView.findViewById(R.id.new_lockscreen_clock_view_large);



        // If a smartspace plugin is detected, replace the existing smartspace

        // (keyguard_status_area), and initialize a new session

        mPluginListener = new PluginListener<BcSmartspaceDataPlugin>() {



            @Override

            public void onPluginConnected(BcSmartspaceDataPlugin plugin, Context pluginContext) {

                if (!mIsSmartspaceEnabled) return;



                View ksa = mView.findViewById(R.id.keyguard_status_area);

                int ksaIndex = mView.indexOfChild(ksa);

                ksa.setVisibility(View.GONE);



                mSmartspaceView = plugin.getView(mView);

                mSmartspaceView.registerDataProvider(plugin);



                RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(

                        MATCH_PARENT, WRAP_CONTENT);

                lp.addRule(RelativeLayout.BELOW, R.id.new_lockscreen_clock_view);

                mView.addView((View) mSmartspaceView, ksaIndex, lp);



                View nic = mView.findViewById(

                        com.android.systemui.R.id.left_aligned_notification_icon_container);

                lp = (RelativeLayout.LayoutParams) nic.getLayoutParams();

                lp.addRule(RelativeLayout.BELOW, ((View) mSmartspaceView).getId());

                nic.setLayoutParams(lp);



                createSmartspaceSession(plugin);

            }



            @Override

            public void onPluginDisconnected(BcSmartspaceDataPlugin plugin) {

                if (!mIsSmartspaceEnabled) return;



                mView.removeView((View) mSmartspaceView);

                mView.findViewById(R.id.keyguard_status_area).setVisibility(View.VISIBLE);



                View nic = mView.findViewById(

                        com.android.systemui.R.id.left_aligned_notification_icon_container);

                RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams)

                        nic.getLayoutParams();

                lp.addRule(RelativeLayout.BELOW, R.id.keyguard_status_area);

                nic.setLayoutParams(lp);



                mSmartspaceView = null;

            }



            private void createSmartspaceSession(BcSmartspaceDataPlugin plugin) {

                mSmartspaceSession = getContext().getSystemService(SmartspaceManager.class)

                        .createSmartspaceSession(

                                new SmartspaceConfig.Builder(getContext(), "lockscreen").build());

                mSmartspaceCallback = targets -> plugin.onTargetsAvailable(targets);

                mSmartspaceSession.registerSmartspaceUpdates(mUiExecutor, mSmartspaceCallback);

                mSmartspaceSession.requestSmartspaceUpdate();

            }

        };

        mPluginManager.addPluginListener(mPluginListener, BcSmartspaceDataPlugin.class, false);

    }



    @Override
@@ -233,13 +147,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
        mStatusBarStateController.removeCallback(mStateListener);

        mColorExtractor.removeOnColorsChangedListener(mColorsListener);

        mView.setClockPlugin(null, mStatusBarStateController.getState());



        if (mSmartspaceSession != null) {

            mSmartspaceSession.unregisterSmartspaceUpdates(mSmartspaceCallback);

            mSmartspaceSession.destroy();

            mSmartspaceSession = null;

        }

        mPluginManager.removePluginListener(mPluginListener);

    }



    /**
@@ -315,11 +222,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
            PropertyAnimator.setProperty(mNewLockScreenLargeClockFrame, AnimatableProperty.SCALE_Y,

                    scale, props, animate);

        }



        if (mSmartspaceView != null) {

            PropertyAnimator.setProperty((View) mSmartspaceView, AnimatableProperty.TRANSLATION_X,

                    x, props, animate);

        }

        mKeyguardSliceViewController.updatePosition(x, props, animate);

        mNotificationIconAreaController.updatePosition(x, props, animate);

    }

packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java

+0 −4
Original line number Diff line number Diff line
@@ -102,8 +102,4 @@ public class FeatureFlags { 
    public boolean isOngoingCallStatusBarChipEnabled() {

        return mFlagReader.isEnabled(R.bool.flag_ongoing_call_status_bar_chip);

    }



    public boolean isSmartspaceEnabled() {

        return mFlagReader.isEnabled(R.bool.flag_smartspace);

    }

}