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

Unverified Commit 80a03b39 authored by Ido Ben-Hur's avatar Ido Ben-Hur Committed by Michael Bestas
Browse files

ThemePicker: Use the new material switch to match with settings 

Change-Id: I699d693bc2f16b541cd640b2027dca2c4d95103a
parent effcdd3d

res/layout/dark_mode_section_view.xml

+5 −2
Original line number Diff line number Diff line
@@ -33,14 +33,17 @@ 
        android:text="@string/mode_title"

        style="@style/SectionTitleTextStyle" />



    <Switch

    <com.google.android.material.materialswitch.MaterialSwitch

        android:id="@+id/dark_mode_toggle"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:background="@null"

        android:clickable="false"

        android:focusable="false"

        android:theme="@style/Theme.Material3.DynamicColors.DayNight"

        android:minHeight="0dp"

        style="@style/Switch.SettingsLib" />

        android:text=""

        android:textOn=""

        android:textOff="" />



</com.android.customization.picker.mode.DarkModeSectionView>

res/layout/notification_section.xml

+7 −5
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
  -->

<com.android.customization.picker.notifications.ui.view.NotificationSectionView

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

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="?selectableItemBackground"
@@ -36,14 +35,17 @@ 
        android:paddingEnd="@dimen/notification_section_title_padding"

        style="@style/SectionTitleTextStyle"/>



    <Switch

    <com.google.android.material.materialswitch.MaterialSwitch

        android:id="@+id/switcher"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:background="@null"

        android:focusable="false"

        android:clickable="false"

        android:layout_gravity="center"

        style="@style/Switch.SettingsLib"

        tools:ignore="UseSwitchCompatOrMaterialXml" />

        android:theme="@style/Theme.Material3.DynamicColors.DayNight"

        android:text=""

        android:textOn=""

        android:textOff="" />



</com.android.customization.picker.notifications.ui.view.NotificationSectionView>

res/layout/themed_icon_section_view.xml

+5 −2
Original line number Diff line number Diff line
@@ -39,15 +39,18 @@ 
            android:text="@string/themed_icon_title"

            style="@style/SectionTitleTextStyle" />



        <Switch

        <com.google.android.material.materialswitch.MaterialSwitch

            android:id="@+id/themed_icon_toggle"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:background="@null"

            android:clickable="false"

            android:focusable="false"

            android:theme="@style/Theme.Material3.DynamicColors.DayNight"

            android:minHeight="0dp"

            style="@style/Switch.SettingsLib"/>

            android:text=""

            android:textOn=""

            android:textOff="" />



    </LinearLayout>

</com.android.customization.picker.themedicon.ThemedIconSectionView>

src/com/android/customization/model/mode/DarkModeSectionController.java

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.os.Looper; 
import android.os.PowerManager;

import android.text.TextUtils;

import android.view.LayoutInflater;

import android.widget.Switch;

import android.widget.Toast;



import androidx.annotation.MainThread;
@@ -43,6 +42,7 @@ import com.android.customization.picker.mode.DarkModeSectionView; 
import com.android.themepicker.R;

import com.android.wallpaper.model.CustomizationSectionController;

import com.android.wallpaper.system.UiModeManagerWrapper;

import com.google.android.material.materialswitch.MaterialSwitch;



import java.util.concurrent.ExecutorService;

import java.util.concurrent.Executors;
@@ -130,7 +130,7 @@ public class DarkModeSectionController implements 
        if (context == null) {

            return;

        }

        Switch switchView = mDarkModeSectionView.findViewById(R.id.dark_mode_toggle);

        MaterialSwitch switchView = mDarkModeSectionView.findViewById(R.id.dark_mode_toggle);

        if (!switchView.isEnabled()) {

            Toast disableToast = Toast.makeText(mContext,

                    mContext.getString(R.string.mode_disabled_msg), Toast.LENGTH_SHORT);

src/com/android/customization/picker/mode/DarkModeSectionView.java

+2 −2
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ package com.android.customization.picker.mode; 
import android.content.Context;

import android.content.res.Configuration;

import android.util.AttributeSet;

import android.widget.Switch;



import androidx.annotation.Nullable;



import com.android.themepicker.R;

import com.android.wallpaper.picker.SectionView;

import com.google.android.material.materialswitch.MaterialSwitch;



/** The view of section in the customization picker fragment. */

public final class DarkModeSectionView extends SectionView {
@@ -40,7 +40,7 @@ public final class DarkModeSectionView extends SectionView { 
    @Override

    protected void onFinishInflate() {

        super.onFinishInflate();

        Switch switchView = findViewById(R.id.dark_mode_toggle);

        MaterialSwitch switchView = findViewById(R.id.dark_mode_toggle);

        switchView.setChecked(mIsDarkModeActivated);

        switchView.setOnCheckedChangeListener((buttonView, isChecked) ->

                switchView.setChecked(mIsDarkModeActivated)