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

Commit f049abf8 authored by Bryce Lee's avatar Bryce Lee
Browse files

Add shadow to dream overlay home controls button. 

This changelist utilizes the DoubleShadowIconDrawable to add a shadow to
the home control button in the dream overlay.

Fixes: 277238160
Test: Verified shadow rendering and theming is working on button.
Change-Id: I13943a60b09daf2737168e566057bd40b221ea56
parent 66ca3625

packages/SystemUI/res/drawable/dream_overlay_bottom_affordance_bg.xml

+0 −2
Original line number Diff line number Diff line
@@ -18,9 +18,7 @@ 
-->

<shape

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:shape="rectangle">

  <solid android:color="?androidprv:attr/colorSurface"/>

  <size

      android:width="@dimen/dream_overlay_bottom_affordance_height"

      android:height="@dimen/dream_overlay_bottom_affordance_width"/>

packages/SystemUI/res/layout/dream_overlay_home_controls_chip.xml

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
    android:layout_width="@dimen/dream_overlay_bottom_affordance_width"

    android:layout_gravity="bottom|start"

    android:padding="@dimen/dream_overlay_bottom_affordance_padding"

    android:background="@drawable/dream_overlay_bottom_affordance_bg"

    android:scaleType="fitCenter"

    android:tint="?android:attr/textColorPrimary"

    android:src="@drawable/controls_icon"

    android:contentDescription="@string/quick_controls_title" />

packages/SystemUI/res/values/dimens.xml

+13 −0
Original line number Diff line number Diff line
@@ -1641,6 +1641,19 @@ 
    <dimen name="dream_overlay_bottom_affordance_height">64dp</dimen>

    <dimen name="dream_overlay_bottom_affordance_width">64dp</dimen>

    <dimen name="dream_overlay_bottom_affordance_radius">32dp</dimen>

    <dimen name="dream_overlay_bottom_affordance_key_text_shadow_dx">0.5dp</dimen>

    <dimen name="dream_overlay_bottom_affordance_key_text_shadow_dy">0.5dp</dimen>

    <dimen name="dream_overlay_bottom_affordance_key_text_shadow_radius">1dp</dimen>

    <item name="dream_overlay_bottom_affordance_key_shadow_alpha" format="float" type="dimen">

        0.35

    </item>

    <dimen name="dream_overlay_bottom_affordance_ambient_text_shadow_dx">0.5dp</dimen>

    <dimen name="dream_overlay_bottom_affordance_ambient_text_shadow_dy">0.5dp</dimen>

    <dimen name="dream_overlay_bottom_affordance_ambient_text_shadow_radius">2dp</dimen>

    <item name="dream_overlay_bottom_affordance_ambient_shadow_alpha" format="float" type="dimen">

        0.4

    </item>

    <dimen name="dream_overlay_bottom_affordance_inset">1dp</dimen>

    <dimen name="dream_overlay_bottom_affordance_padding">14dp</dimen>

    <dimen name="dream_overlay_complication_clock_time_text_size">86dp</dimen>

    <dimen name="dream_overlay_complication_clock_subtitle_text_size">24sp</dimen>

packages/SystemUI/shared/src/com/android/systemui/shared/shadow/DoubleShadowIconDrawable.kt

+13 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.systemui.shared.shadow



import android.content.res.ColorStateList

import android.graphics.BlendMode

import android.graphics.Canvas

import android.graphics.Color
@@ -106,6 +107,14 @@ class DoubleShadowIconDrawable( 
        mIconDrawable.draw(canvas)

    }



    override fun getIntrinsicHeight(): Int {

        return mCanvasSize

    }



    override fun getIntrinsicWidth(): Int {

        return mCanvasSize

    }



    override fun getOpacity(): Int {

        return PixelFormat.TRANSPARENT

    }
@@ -121,4 +130,8 @@ class DoubleShadowIconDrawable( 
    override fun setTint(color: Int) {

        mIconDrawable.setTint(color)

    }



    override fun setTintList(tint: ColorStateList?) {

        mIconDrawable.setTintList(tint)

    }

}

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

+6 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static com.android.systemui.controls.dagger.ControlsComponent.Visibility. 


import android.content.Context;

import android.content.Intent;

import android.content.res.Resources;

import android.util.Log;

import android.view.View;

import android.widget.ImageView;
@@ -39,6 +40,7 @@ import com.android.systemui.controls.dagger.ControlsComponent; 
import com.android.systemui.controls.management.ControlsListingController;

import com.android.systemui.controls.ui.ControlsActivity;

import com.android.systemui.controls.ui.ControlsUiController;

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

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

import com.android.systemui.dreams.DreamOverlayStateController;

import com.android.systemui.plugins.ActivityStarter;
@@ -56,17 +58,20 @@ import javax.inject.Named; 
 * devices at home like lights and thermostats).

 */

public class DreamHomeControlsComplication implements Complication {

    private final Resources mResources;

    private final DreamHomeControlsComplicationComponent.Factory mComponentFactory;



    @Inject

    public DreamHomeControlsComplication(

            @Main Resources resources,

            DreamHomeControlsComplicationComponent.Factory componentFactory) {

        mResources = resources;

        mComponentFactory = componentFactory;

    }



    @Override

    public ViewHolder createView(ComplicationViewModel model) {

        return mComponentFactory.create().getViewHolder();

        return mComponentFactory.create(mResources).getViewHolder();

    }



    @Override