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

Commit 9542d3f7 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

fix(androidprv): Fix androidprv attr not accessable through xml 

Remove color from unused digital_wellbeing_toast
parent 7438b1a4

quickstep/res/layout/taskbar_edu.xml

+1 −3
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
-->



<com.android.launcher3.taskbar.TaskbarEduView xmlns:android="http://schemas.android.com/apk/res/android"

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

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

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

    android:layout_width="match_parent"
@@ -73,7 +72,6 @@ 
            app:layout_constraintBottom_toBottomOf="@id/edu_start_button"

            app:layout_constraintEnd_toEndOf="parent"

            android:text="@string/taskbar_edu_next"

            style="@style/TaskbarEdu.Button.Next"

            android:textColor="?androidprv:attr/textColorOnAccent"/>

            style="@style/TaskbarEdu.Button.Next" />

    </androidx.constraintlayout.widget.ConstraintLayout>

</com.android.launcher3.taskbar.TaskbarEduView>
 
 No newline at end of file

quickstep/res/layout/taskbar_edu_features.xml

+0 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
     limitations under the License.

-->

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

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

    xmlns:app="http://schemas.android.com/apk/res-auto">



    <TextView
@@ -111,7 +110,6 @@ 
        android:layout_height="36dp"

        android:layout_marginTop="32dp"

        android:text="@string/taskbar_edu_done"

        android:textColor="?androidprv:attr/textColorOnAccent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toBottomOf="@id/edu_barrier_bottom" />

quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltipController.kt

+9 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.view.View.VISIBLE 
import android.view.ViewGroup

import android.view.accessibility.AccessibilityEvent

import android.view.accessibility.AccessibilityNodeInfo

import android.widget.Button

import androidx.annotation.IntDef

import androidx.annotation.LayoutRes

import com.airbnb.lottie.LottieAnimationView
@@ -36,6 +37,7 @@ import com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOH 
import com.android.launcher3.taskbar.TaskbarControllers.LoggableTaskbarController

import com.android.launcher3.util.DisplayController

import com.android.launcher3.util.OnboardingPrefs.TASKBAR_EDU_TOOLTIP_STEP

import com.android.launcher3.util.Themes

import java.io.PrintWriter



/** First EDU step for swiping up to show transient Taskbar. */
@@ -131,7 +133,13 @@ class TaskbarEduTooltipController(val activityContext: TaskbarActivityContext) : 
                settingsEdu.visibility = VISIBLE

            }



            findViewById<View>(R.id.done_button)?.setOnClickListener { hide() }

            val button: Button? = findViewById(R.id.done_button)

            if (button != null) {

                button.setTextColor(Themes.getAttrColor(context,

                    com.android.internal.R.attr.textColorOnAccent))

                button.setOnClickListener { hide() }

            }



            if (DisplayController.isTransientTaskbar(activityContext)) {

                (layoutParams as ViewGroup.MarginLayoutParams).bottomMargin +=

                    activityContext.deviceProfile.taskbarHeight

quickstep/src/com/android/launcher3/taskbar/TaskbarEduView.java

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.widget.Button; 
import com.android.launcher3.Insettable;

import com.android.launcher3.R;

import com.android.launcher3.taskbar.overlay.TaskbarOverlayContext;

import com.android.launcher3.util.Themes;

import com.android.launcher3.views.AbstractSlideInView;



/** Education view about the Taskbar. */
@@ -82,6 +83,8 @@ public class TaskbarEduView extends AbstractSlideInView<TaskbarOverlayContext> 
        mContent = findViewById(R.id.edu_view);

        mStartButton = findViewById(R.id.edu_start_button);

        mEndButton = findViewById(R.id.edu_end_button);

        mEndButton.setTextColor(Themes.getAttrColor(

                getContext(), com.android.internal.R.attr.textColorOnAccent));

        mPagedView = findViewById(R.id.content);

        mPagedView.setTaskbarEduView(this);

    }

version.properties

+3 −3
Original line number Diff line number Diff line 
#Tue Mar 05 14:40:18 IST 2024

VERSION_CHANGE=4

VERSION_CODE=3000014

#Tue Mar 05 15:32:07 IST 2024

VERSION_CHANGE=15

VERSION_MAJOR=3

VERSION_MINOR=0

VERSION_CODE=3000025

VERSION_PATCH=1