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

Commit 0471f7b8 authored by Darrell Shi's avatar Darrell Shi Committed by Android (Google) Code Review
Browse files

Merge changes from topic "dream-complications-relayout" into tm-qpr-dev 

* changes:
  Update complications layout.
  Refactor dream complications.
  Remove clock date complication.
parents 25ab2105 5d44b8fe

packages/SystemUI/src/com/android/systemui/dreams/complication/DreamClockDateComplication.java

deleted100644 → 0
+0 −111
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 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.dreams.complication;



import static com.android.systemui.dreams.complication.dagger.DreamClockDateComplicationModule.DREAM_CLOCK_DATE_COMPLICATION_LAYOUT_PARAMS;

import static com.android.systemui.dreams.complication.dagger.DreamClockDateComplicationModule.DREAM_CLOCK_DATE_COMPLICATION_VIEW;



import android.content.Context;

import android.view.View;



import com.android.systemui.CoreStartable;

import com.android.systemui.dreams.DreamOverlayStateController;



import javax.inject.Inject;

import javax.inject.Named;

import javax.inject.Provider;



/**

 * Clock Date Complication that produce Clock Date view holder.

 */

public class DreamClockDateComplication implements Complication {

    private final Provider<DreamClockDateViewHolder> mDreamClockDateViewHolderProvider;



    /**

     * Default constructor for {@link DreamClockDateComplication}.

     */

    @Inject

    public DreamClockDateComplication(

            Provider<DreamClockDateViewHolder> dreamClockDateViewHolderProvider) {

        mDreamClockDateViewHolderProvider = dreamClockDateViewHolderProvider;

    }



    @Override

    public int getRequiredTypeAvailability() {

        return COMPLICATION_TYPE_DATE;

    }



    /**

     * Create {@link DreamClockDateViewHolder}.

     */

    @Override

    public ViewHolder createView(ComplicationViewModel model) {

        return mDreamClockDateViewHolderProvider.get();

    }



    /**

     * {@link CoreStartable} responsible for registering {@link DreamClockDateComplication} with

     * SystemUI.

     */

    public static class Registrant extends CoreStartable {

        private final DreamOverlayStateController mDreamOverlayStateController;

        private final DreamClockDateComplication mComplication;



        /**

         * Default constructor to register {@link DreamClockDateComplication}.

         */

        @Inject

        public Registrant(Context context,

                DreamOverlayStateController dreamOverlayStateController,

                DreamClockDateComplication dreamClockDateComplication) {

            super(context);

            mDreamOverlayStateController = dreamOverlayStateController;

            mComplication = dreamClockDateComplication;

        }



        @Override

        public void start() {

            mDreamOverlayStateController.addComplication(mComplication);

        }

    }



    /**

     * {@link ViewHolder} to contain value/logic associated with {@link DreamClockDateComplication}.

     */

    public static class DreamClockDateViewHolder implements ViewHolder {

        private final View mView;

        private final ComplicationLayoutParams mLayoutParams;



        @Inject

        DreamClockDateViewHolder(@Named(DREAM_CLOCK_DATE_COMPLICATION_VIEW) View view,

                @Named(DREAM_CLOCK_DATE_COMPLICATION_LAYOUT_PARAMS)

                        ComplicationLayoutParams layoutParams) {

            mView = view;

            mLayoutParams = layoutParams;

        }



        @Override

        public View getView() {

            return mView;

        }



        @Override

        public ComplicationLayoutParams getLayoutParams() {

            return mLayoutParams;

        }

    }

}

packages/SystemUI/src/com/android/systemui/dreams/complication/DreamClockTimeComplication.java

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


package com.android.systemui.dreams.complication;



import static com.android.systemui.dreams.complication.dagger.DreamClockTimeComplicationModule.DREAM_CLOCK_TIME_COMPLICATION_LAYOUT_PARAMS;

import static com.android.systemui.dreams.complication.dagger.DreamClockTimeComplicationModule.DREAM_CLOCK_TIME_COMPLICATION_VIEW;

import static com.android.systemui.dreams.complication.dagger.RegisteredComplicationsModule.DREAM_CLOCK_TIME_COMPLICATION_LAYOUT_PARAMS;



import android.content.Context;

import android.view.View;

packages/SystemUI/src/com/android/systemui/dreams/complication/DreamHomeControlsComplication.java

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package com.android.systemui.dreams.complication; 
import static com.android.systemui.controls.dagger.ControlsComponent.Visibility.AVAILABLE;

import static com.android.systemui.controls.dagger.ControlsComponent.Visibility.AVAILABLE_AFTER_UNLOCK;

import static com.android.systemui.controls.dagger.ControlsComponent.Visibility.UNAVAILABLE;

import static com.android.systemui.dreams.complication.dagger.DreamHomeControlsComplicationComponent.DreamHomeControlsModule.DREAM_HOME_CONTROLS_CHIP_LAYOUT_PARAMS;

import static com.android.systemui.dreams.complication.dagger.DreamHomeControlsComplicationComponent.DreamHomeControlsModule.DREAM_HOME_CONTROLS_CHIP_VIEW;

import static com.android.systemui.dreams.complication.dagger.RegisteredComplicationsModule.DREAM_HOME_CONTROLS_CHIP_LAYOUT_PARAMS;



import android.content.Context;

import android.content.Intent;

packages/SystemUI/src/com/android/systemui/dreams/SmartSpaceComplication.java→packages/SystemUI/src/com/android/systemui/dreams/complication/SmartSpaceComplication.java

+25 −26
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ 
 * limitations under the License.

 */



package com.android.systemui.dreams;

package com.android.systemui.dreams.complication;



import static com.android.systemui.dreams.complication.dagger.RegisteredComplicationsModule.DREAM_SMARTSPACE_LAYOUT_PARAMS;



import android.content.Context;

import android.os.Parcelable;
@@ -23,21 +25,33 @@ import android.view.ViewGroup; 
import android.widget.FrameLayout;



import com.android.systemui.CoreStartable;

import com.android.systemui.dreams.complication.Complication;

import com.android.systemui.dreams.complication.ComplicationLayoutParams;

import com.android.systemui.dreams.complication.ComplicationViewModel;

import com.android.systemui.dreams.DreamOverlayStateController;

import com.android.systemui.dreams.smartspace.DreamSmartspaceController;

import com.android.systemui.plugins.BcSmartspaceDataPlugin;



import java.util.List;



import javax.inject.Inject;

import javax.inject.Named;

import javax.inject.Provider;



/**

 * {@link SmartSpaceComplication} embodies the SmartSpace view found on the lockscreen as a

 * {@link Complication}

 */

public class SmartSpaceComplication implements Complication {

    private final Provider<SmartSpaceComplicationViewHolder> mViewHolderProvider;



    @Inject

    public SmartSpaceComplication(Provider<SmartSpaceComplicationViewHolder> viewHolderProvider) {

        mViewHolderProvider = viewHolderProvider;

    }



    @Override

    public ViewHolder createView(ComplicationViewModel model) {

        return mViewHolderProvider.get();

    }



    /**

     * {@link CoreStartable} responsbile for registering {@link SmartSpaceComplication} with

     * SystemUI.
@@ -89,17 +103,20 @@ public class SmartSpaceComplication implements Complication { 
        }

    }



    private static class SmartSpaceComplicationViewHolder implements ViewHolder {

    static class SmartSpaceComplicationViewHolder implements ViewHolder {

        private View mView = null;

        private static final int SMARTSPACE_COMPLICATION_WEIGHT = 10;

        private final DreamSmartspaceController mSmartSpaceController;

        private final Context mContext;

        private final ComplicationLayoutParams mLayoutParams;



        @Inject

        protected SmartSpaceComplicationViewHolder(

                Context context,

                DreamSmartspaceController smartSpaceController) {

                DreamSmartspaceController smartSpaceController,

                @Named(DREAM_SMARTSPACE_LAYOUT_PARAMS) ComplicationLayoutParams layoutParams) {

            mSmartSpaceController = smartSpaceController;

            mContext = context;

            mLayoutParams = layoutParams;

        }



        @Override
@@ -119,25 +136,7 @@ public class SmartSpaceComplication implements Complication { 


        @Override

        public ComplicationLayoutParams getLayoutParams() {

            return new ComplicationLayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT,

                    ComplicationLayoutParams.POSITION_TOP | ComplicationLayoutParams.POSITION_START,

                    ComplicationLayoutParams.DIRECTION_DOWN,

                    SMARTSPACE_COMPLICATION_WEIGHT, true);

        }

            return mLayoutParams;

        }



    private final DreamSmartspaceController mSmartSpaceController;

    private final Context mContext;



    @Inject

    public SmartSpaceComplication(Context context,

            DreamSmartspaceController smartSpaceController) {

        mContext = context;

        mSmartSpaceController = smartSpaceController;

    }



    @Override

    public ViewHolder createView(ComplicationViewModel model) {

        return new SmartSpaceComplicationViewHolder(mContext, mSmartSpaceController);

    }

}

packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamClockDateComplicationModule.java

deleted100644 → 0
+0 −71
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 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.dreams.complication.dagger;





import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;



import com.android.internal.util.Preconditions;

import com.android.systemui.R;

import com.android.systemui.dreams.complication.ComplicationLayoutParams;

import com.android.systemui.dreams.complication.DreamClockDateComplication;



import javax.inject.Named;



import dagger.Module;

import dagger.Provides;



/**

 * Module for providing {@link DreamClockDateComplication}.

 */

@Module

public interface DreamClockDateComplicationModule {

    String DREAM_CLOCK_DATE_COMPLICATION_VIEW = "clock_date_complication_view";

    String DREAM_CLOCK_DATE_COMPLICATION_LAYOUT_PARAMS =

            "clock_date_complication_layout_params";

    // Order weight of insert into parent container

    //TODO(b/217199227): move to a single location.

    int INSERT_ORDER_WEIGHT = 3;



    /**

     * Provides the complication view.

     */

    @Provides

    @Named(DREAM_CLOCK_DATE_COMPLICATION_VIEW)

    static View provideComplicationView(LayoutInflater layoutInflater) {

        return Preconditions.checkNotNull(

                layoutInflater.inflate(R.layout.dream_overlay_complication_clock_date,

                        null, false),

                "R.layout.dream_overlay_complication_clock_date did not properly inflated");

    }



    /**

     * Provides the layout parameters for the complication view.

     */

    @Provides

    @Named(DREAM_CLOCK_DATE_COMPLICATION_LAYOUT_PARAMS)

    static ComplicationLayoutParams provideLayoutParams() {

        return new ComplicationLayoutParams(0,

                ViewGroup.LayoutParams.WRAP_CONTENT,

                ComplicationLayoutParams.POSITION_BOTTOM

                        | ComplicationLayoutParams.POSITION_START,

                ComplicationLayoutParams.DIRECTION_END,

                INSERT_ORDER_WEIGHT, /* snapToGuide= */ true);

    }

}