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

Commit b029f09a authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12397640 from 4cf02b85 to 24Q4-release 

Change-Id: Ib4a989773917597b8636cd93fbd98c22935cbd33
parents 8ee0654b 4cf02b85

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ package { 
    default_applicable_licenses: ["Android-Apache-2.0"],

}



min_launcher3_sdk_version = "30"

min_launcher3_sdk_version = "31"



// Targets that don't inherit framework aconfig libs (i.e., those that don't set

// `platform_apis: true`) must manually link them.

quickstep/dagger/LauncherAppComponent.java

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.launcher3.dagger; 




import com.android.quickstep.dagger.QuickStepModule;

import com.android.quickstep.dagger.QuickstepBaseAppComponent;



import dagger.Component;
@@ -26,7 +27,7 @@ import dagger.Component; 
 */

@LauncherAppSingleton

@Component(modules = QuickStepModule.class)

public interface LauncherAppComponent extends LauncherBaseAppComponent {

public interface LauncherAppComponent extends QuickstepBaseAppComponent {

    /** Builder for quickstep LauncherAppComponent. */

    @Component.Builder

    interface Builder extends LauncherBaseAppComponent.Builder {

quickstep/res/layout/bubblebar_flyout.xml

+3 −2
Original line number Diff line number Diff line
@@ -20,11 +20,12 @@ 


    <ImageView

        android:id="@+id/bubble_flyout_avatar"

        android:layout_width="36dp"

        android:layout_width="50dp"

        android:layout_height="36dp"

        android:padding="@dimen/bubblebar_flyout_avatar_message_space"

        android:paddingEnd="@dimen/bubblebar_flyout_avatar_message_space"

        android:scaleType="centerInside"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        tools:src="#ff0000"/>

quickstep/res/values-night/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    <color name="all_set_page_background">@android:color/system_neutral1_900</color>



    <!-- Turn on work apps button -->

    <color name="work_turn_on_stroke">?androidprv:attr/colorAccentSecondaryVariant</color>

    <color name="work_turn_on_stroke">?attr/materialColorPrimary</color>

    <color name="work_fab_bg_color">?attr/materialColorPrimaryFixedDim</color>

    <color name="work_fab_icon_color">?attr/materialColorOnPrimaryFixed</color>

</resources>
 
 No newline at end of file

quickstep/res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ 
    <color name="lottie_yellow600">#f9ab00</color>



    <!-- Turn on work apps button -->

    <color name="work_turn_on_stroke">?androidprv:attr/colorAccentPrimaryVariant</color>

    <color name="work_turn_on_stroke">?attr/materialColorPrimary</color>

    <color name="work_fab_bg_color">?attr/materialColorPrimaryFixedDim</color>

    <color name="work_fab_icon_color">?attr/materialColorOnPrimaryFixed</color>

</resources>
 
 No newline at end of file